Github messages for voidlinux
 help / color / mirror / Atom feed
From: aryalaadi <aryalaadi@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] opencl2-header rename to opencl-header, also update dependent packages
Date: Fri, 01 Sep 2023 21:40:33 +0200	[thread overview]
Message-ID: <20230901194033.jetZX79UCckKAH0278WJz5aH2X0UBLsmXpUGrn5Sxd4@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-45686@inbox.vuxu.org>

[-- Attachment #1: Type: text/plain, Size: 685 bytes --]

There is an updated pull request by aryalaadi against master on the void-packages repository

https://github.com/aryalaadi/void-packages master
https://github.com/void-linux/void-packages/pull/45686

opencl2-header rename to opencl-header, also update dependent packages
Renaming opencl2-header to opencl-header because its misleading since this ships headers for OpenCL 3.0 specs as well. Unless the 2 in opencl2-header is supposed to signify something else, its better to rename it. Also updated every dependent packages.
#### Testing the changes
- I tested the changes in this PR: **YES**

A patch file from https://github.com/void-linux/void-packages/pull/45686.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-45686.patch --]
[-- Type: text/x-diff, Size: 12190 bytes --]

From 546c50bbf2438b9917afb542886004067d9a3053 Mon Sep 17 00:00:00 2001
From: Aaditya Aryal <aryalaadi123@gmail.com>
Date: Sun, 20 Aug 2023 21:14:25 +0545
Subject: [PATCH 1/3] opencl2-header rename to opencl-header, also update
 depending packages

---
 srcpkgs/hashcat/template                             | 2 +-
 srcpkgs/libgdal/template                             | 2 +-
 srcpkgs/ocl-icd/template                             | 2 +-
 srcpkgs/{opencl2-headers => opencl-headers}/template | 8 ++++----
 srcpkgs/python3-pyopencl/template                    | 2 +-
 srcpkgs/waifu2x-converter-cpp/template               | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)
 rename srcpkgs/{opencl2-headers => opencl-headers}/template (74%)

diff --git a/srcpkgs/hashcat/template b/srcpkgs/hashcat/template
index f2420cd080a38..a577049ce7cf6 100644
--- a/srcpkgs/hashcat/template
+++ b/srcpkgs/hashcat/template
@@ -9,7 +9,7 @@ make_build_args="ENABLE_UNRAR=$(vopt_if unrar 1 0) USE_SYSTEM_OPENCL=1
  SHARED_FOLDER=/usr/lib/hashcat"
 make_use_env=yes
 make_install_args="$make_build_args"
-makedepends="opencl2-headers xxHash-devel minizip-devel zlib-devel"
+makedepends="opencl-headers xxHash-devel minizip-devel zlib-devel"
 checkdepends="perl"
 short_desc="Advanced CPU-based password recovery utility"
 maintainer="Duncaen <duncaen@voidlinux.org>"
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 53425db447461..dafd52a9614c1 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -11,7 +11,7 @@ makedepends="python3-devel freexl-devel c-blosc-devel geos-devel expat-devel
  jasper-devel giflib-devel json-c-devel libcurl-devel libopenexr-devel
  libjpeg-turbo-devel libpng-devel tiff-devel libqhull-devel libwebp-devel
  libxml2-devel liblzma-devel zlib-devel libzstd-devel libdeflate-devel
- netcdf-devel opencl2-headers pcre2-devel proj-devel sqlite-devel
+ netcdf-devel opencl-headers pcre2-devel proj-devel sqlite-devel
  ocl-icd-devel libxerces-c-devel libspatialite-devel
  postgresql-libs-devel"
 checkdepends="python3-pytest"
diff --git a/srcpkgs/ocl-icd/template b/srcpkgs/ocl-icd/template
index 2581cd2999291..2332d2ba6f492 100644
--- a/srcpkgs/ocl-icd/template
+++ b/srcpkgs/ocl-icd/template
@@ -4,7 +4,7 @@ version=2.3.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="ruby xmlto asciidoc automake libtool"
-makedepends="opencl2-headers"
+makedepends="opencl-headers"
 short_desc="Generic OpenCL ICD loader/demultiplexer"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
diff --git a/srcpkgs/opencl2-headers/template b/srcpkgs/opencl-headers/template
similarity index 74%
rename from srcpkgs/opencl2-headers/template
rename to srcpkgs/opencl-headers/template
index ecdc89ae70617..fa2e01ee8f9c3 100644
--- a/srcpkgs/opencl2-headers/template
+++ b/srcpkgs/opencl-headers/template
@@ -1,9 +1,9 @@
-# Template file for 'opencl2-headers'
-pkgname=opencl2-headers
+# Template file for 'opencl-headers'
+pkgname=opencl-headers
 version=2023.04.17
-revision=2
+revision=1
 build_style=cmake
-short_desc="OpenCL 2.2 (Open Computing Language) header files"
+short_desc="OpenCL 3.0.14 (Open Computing Language) header files"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0"
 homepage="https://github.com/KhronosGroup/OpenCL-Headers"
diff --git a/srcpkgs/python3-pyopencl/template b/srcpkgs/python3-pyopencl/template
index 572ea9213bf52..416ba624423ae 100644
--- a/srcpkgs/python3-pyopencl/template
+++ b/srcpkgs/python3-pyopencl/template
@@ -4,7 +4,7 @@ version=2023.1.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pybind11 python3-Cython python3-numpy"
-makedepends="opencl2-headers ocl-icd-devel python3-pybind11"
+makedepends="opencl-headers ocl-icd-devel python3-pybind11"
 depends="python3-numpy python3-pytools python3-platformdirs"
 short_desc="OpenCL bindings for Python 3"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
diff --git a/srcpkgs/waifu2x-converter-cpp/template b/srcpkgs/waifu2x-converter-cpp/template
index 8c095d0d7baba..6232211af3a0d 100644
--- a/srcpkgs/waifu2x-converter-cpp/template
+++ b/srcpkgs/waifu2x-converter-cpp/template
@@ -5,7 +5,7 @@ revision=2
 build_style=cmake
 configure_args="-DINSTALL_MODELS=ON"
 hostmakedepends="pkg-config"
-makedepends="libopencv-devel opencl2-headers"
+makedepends="libopencv-devel opencl-headers"
 short_desc="Image upscaling using deep convolutional neural networks"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"

From f1da8f157dc65629a4ec3c37a4fec943dbc9f3d4 Mon Sep 17 00:00:00 2001
From: Aaditya Aryal <aryalaadi123@gmail.com>
Date: Wed, 30 Aug 2023 13:23:24 +0545
Subject: [PATCH 2/3] rename opencl2-headers to OpenCL-Headers and
 opencl2-headers metapackage

---
 srcpkgs/{opencl-headers => OpenCL-Headers}/template | 10 +++++-----
 srcpkgs/hashcat/template                            |  2 +-
 srcpkgs/libgdal/template                            |  2 +-
 srcpkgs/ocl-icd/template                            |  4 ++--
 srcpkgs/opencl2-headers/template                    | 10 ++++++++++
 srcpkgs/python3-pyopencl/template                   |  2 +-
 srcpkgs/waifu2x-converter-cpp/template              |  2 +-
 7 files changed, 21 insertions(+), 11 deletions(-)
 rename srcpkgs/{opencl-headers => OpenCL-Headers}/template (65%)
 create mode 100644 srcpkgs/opencl2-headers/template

diff --git a/srcpkgs/opencl-headers/template b/srcpkgs/OpenCL-Headers/template
similarity index 65%
rename from srcpkgs/opencl-headers/template
rename to srcpkgs/OpenCL-Headers/template
index fa2e01ee8f9c3..de5ac0c1d67ce 100644
--- a/srcpkgs/opencl-headers/template
+++ b/srcpkgs/OpenCL-Headers/template
@@ -1,13 +1,13 @@
-# Template file for 'opencl-headers'
-pkgname=opencl-headers
+# Template file for 'OpenCL-Headers'
+pkgname=OpenCL-Headers
 version=2023.04.17
 revision=1
 build_style=cmake
 short_desc="OpenCL 3.0.14 (Open Computing Language) header files"
-maintainer="Andrew J. Hesford <ajh@sideband.org>"
+maintainer="Aryal Aaditya <aryalaadi123@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/KhronosGroup/OpenCL-Headers"
 distfiles="https://github.com/KhronosGroup/OpenCL-Headers/archive/v${version}.tar.gz"
 checksum=0ce992f4167f958f68a37918dec6325be18f848dee29a4521c633aae3304915d
-provides="opencl-headers-${version}_${revision}"
-replaces="opencl-headers>=0"
+provides="OpenCL-Headers-${version}_${revision}"
+replaces="OpenCL-Headers>=0"
diff --git a/srcpkgs/hashcat/template b/srcpkgs/hashcat/template
index a577049ce7cf6..3991723e43094 100644
--- a/srcpkgs/hashcat/template
+++ b/srcpkgs/hashcat/template
@@ -9,7 +9,7 @@ make_build_args="ENABLE_UNRAR=$(vopt_if unrar 1 0) USE_SYSTEM_OPENCL=1
  SHARED_FOLDER=/usr/lib/hashcat"
 make_use_env=yes
 make_install_args="$make_build_args"
-makedepends="opencl-headers xxHash-devel minizip-devel zlib-devel"
+makedepends="OpenCL-Headers xxHash-devel minizip-devel zlib-devel"
 checkdepends="perl"
 short_desc="Advanced CPU-based password recovery utility"
 maintainer="Duncaen <duncaen@voidlinux.org>"
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index dafd52a9614c1..dafb57b756ed1 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -11,7 +11,7 @@ makedepends="python3-devel freexl-devel c-blosc-devel geos-devel expat-devel
  jasper-devel giflib-devel json-c-devel libcurl-devel libopenexr-devel
  libjpeg-turbo-devel libpng-devel tiff-devel libqhull-devel libwebp-devel
  libxml2-devel liblzma-devel zlib-devel libzstd-devel libdeflate-devel
- netcdf-devel opencl-headers pcre2-devel proj-devel sqlite-devel
+ netcdf-devel OpenCL-Headers pcre2-devel proj-devel sqlite-devel
  ocl-icd-devel libxerces-c-devel libspatialite-devel
  postgresql-libs-devel"
 checkdepends="python3-pytest"
diff --git a/srcpkgs/ocl-icd/template b/srcpkgs/ocl-icd/template
index 2332d2ba6f492..66171239ae827 100644
--- a/srcpkgs/ocl-icd/template
+++ b/srcpkgs/ocl-icd/template
@@ -4,7 +4,7 @@ version=2.3.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="ruby xmlto asciidoc automake libtool"
-makedepends="opencl-headers"
+makedepends="OpenCL-Headers"
 short_desc="Generic OpenCL ICD loader/demultiplexer"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
@@ -26,7 +26,7 @@ post_install() {
 }
 
 ocl-icd-devel_package() {
-	depends="opencl2-headers ${sourcepkg}>=${version}_${revision}"
+	depends="OpenCL-Headers ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
diff --git a/srcpkgs/opencl2-headers/template b/srcpkgs/opencl2-headers/template
new file mode 100644
index 0000000000000..0e2d3da48dd34
--- /dev/null
+++ b/srcpkgs/opencl2-headers/template
@@ -0,0 +1,10 @@
+# Template file for 'opencl2-headers'
+pkgname=opencl2-headers
+version=2023.04.17
+revision=1
+build_style=meta
+depends="OpenCL-Headers"
+short_desc="OpenCL-Headers - (transitional dummy package)"
+maintainer="Aryal Aaditya <aryalaadi123@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/KhronosGroup/OpenCL-Headers"
diff --git a/srcpkgs/python3-pyopencl/template b/srcpkgs/python3-pyopencl/template
index 416ba624423ae..7aa09a2ab172f 100644
--- a/srcpkgs/python3-pyopencl/template
+++ b/srcpkgs/python3-pyopencl/template
@@ -4,7 +4,7 @@ version=2023.1.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pybind11 python3-Cython python3-numpy"
-makedepends="opencl-headers ocl-icd-devel python3-pybind11"
+makedepends="OpenCL-Headers ocl-icd-devel python3-pybind11"
 depends="python3-numpy python3-pytools python3-platformdirs"
 short_desc="OpenCL bindings for Python 3"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
diff --git a/srcpkgs/waifu2x-converter-cpp/template b/srcpkgs/waifu2x-converter-cpp/template
index 6232211af3a0d..361b8a23b9497 100644
--- a/srcpkgs/waifu2x-converter-cpp/template
+++ b/srcpkgs/waifu2x-converter-cpp/template
@@ -5,7 +5,7 @@ revision=2
 build_style=cmake
 configure_args="-DINSTALL_MODELS=ON"
 hostmakedepends="pkg-config"
-makedepends="libopencv-devel opencl-headers"
+makedepends="libopencv-devel OpenCL-Headers"
 short_desc="Image upscaling using deep convolutional neural networks"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"

From 010c3848e556620a752f486ccba9b34bc95fcc92 Mon Sep 17 00:00:00 2001
From: Aaditya Aryal <aryalaadi123@gmail.com>
Date: Sat, 2 Sep 2023 01:21:08 +0545
Subject: [PATCH 3/3] metapackage

---
 srcpkgs/OpenCL-Headers/template  |  8 +++++++-
 srcpkgs/opencl2-headers/template | 10 ----------
 2 files changed, 7 insertions(+), 11 deletions(-)
 delete mode 100644 srcpkgs/opencl2-headers/template

diff --git a/srcpkgs/OpenCL-Headers/template b/srcpkgs/OpenCL-Headers/template
index de5ac0c1d67ce..379818cbc8062 100644
--- a/srcpkgs/OpenCL-Headers/template
+++ b/srcpkgs/OpenCL-Headers/template
@@ -4,10 +4,16 @@ version=2023.04.17
 revision=1
 build_style=cmake
 short_desc="OpenCL 3.0.14 (Open Computing Language) header files"
-maintainer="Aryal Aaditya <aryalaadi123@gmail.com>"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0"
 homepage="https://github.com/KhronosGroup/OpenCL-Headers"
 distfiles="https://github.com/KhronosGroup/OpenCL-Headers/archive/v${version}.tar.gz"
 checksum=0ce992f4167f958f68a37918dec6325be18f848dee29a4521c633aae3304915d
 provides="OpenCL-Headers-${version}_${revision}"
 replaces="OpenCL-Headers>=0"
+
+opencl2-headers_package() {
+        build_style=meta
+        depends="OpenCL-Headers>=${version}_${revision}"
+        short_desc+=" (transitional dummy package)"
+}
diff --git a/srcpkgs/opencl2-headers/template b/srcpkgs/opencl2-headers/template
deleted file mode 100644
index 0e2d3da48dd34..0000000000000
--- a/srcpkgs/opencl2-headers/template
+++ /dev/null
@@ -1,10 +0,0 @@
-# Template file for 'opencl2-headers'
-pkgname=opencl2-headers
-version=2023.04.17
-revision=1
-build_style=meta
-depends="OpenCL-Headers"
-short_desc="OpenCL-Headers - (transitional dummy package)"
-maintainer="Aryal Aaditya <aryalaadi123@gmail.com>"
-license="Apache-2.0"
-homepage="https://github.com/KhronosGroup/OpenCL-Headers"

  parent reply	other threads:[~2023-09-01 19:40 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-20 15:38 [PR PATCH] " aryalaadi
2023-08-28 20:02 ` [PR REVIEW] " ahesford
2023-08-30  7:40 ` [PR PATCH] [Updated] " aryalaadi
2023-08-30  7:42 ` [PR REVIEW] " aryalaadi
2023-09-01 19:40 ` aryalaadi [this message]
2023-09-01 19:41 ` aryalaadi
2023-09-01 20:04 ` [PR REVIEW] " ahesford
2023-09-01 20:04 ` ahesford
2023-09-01 20:04 ` ahesford
2023-09-01 20:15 ` [PR PATCH] [Updated] " aryalaadi
2023-09-01 21:05 ` [PR PATCH] [Closed]: " ahesford
2023-09-01 21:07 ` ahesford

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230901194033.jetZX79UCckKAH0278WJz5aH2X0UBLsmXpUGrn5Sxd4@z \
    --to=aryalaadi@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).