[PR PATCH] New package: OpenCL-SDK

Github messages for voidlinux
 help / color / mirror / Atom feed

* [PR PATCH] New package: OpenCL-SDK
@ 2024-01-17 23:59 Calandracas606
  2024-01-18  0:50 ` Calandracas606
                   ` (15 more replies)
  0 siblings, 16 replies; 17+ messages in thread
From: Calandracas606 @ 2024-01-17 23:59 UTC (permalink / raw)
  To: ml

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

There is a new pull request by Calandracas606 against master on the void-packages repository

https://github.com/Calandracas606/void-packages OpenCL-SDK
https://github.com/void-linux/void-packages/pull/48261

New package: OpenCL-SDK
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-glibc
  - aarch64-musl (cross)
  - armv7l (cross)
  - armv6l-musl (cross)


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

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

From 3718cd9a075090746308f3a17fb2e419d2d68a30 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:46:50 -0500
Subject: [PATCH 01/14] New package: OpenCL-SDK-2023.12.14

---
 common/shlibs                   |  2 +-
 srcpkgs/OpenCL-Headers          |  1 +
 srcpkgs/OpenCL-Headers/template | 19 ---------
 srcpkgs/OpenCL-ICD-Loader       |  1 +
 srcpkgs/OpenCL-SDK/template     | 70 +++++++++++++++++++++++++++++++++
 srcpkgs/ocl-icd                 |  1 +
 srcpkgs/ocl-icd/template        | 36 -----------------
 7 files changed, 74 insertions(+), 56 deletions(-)
 create mode 120000 srcpkgs/OpenCL-Headers
 delete mode 100644 srcpkgs/OpenCL-Headers/template
 create mode 120000 srcpkgs/OpenCL-ICD-Loader
 create mode 100644 srcpkgs/OpenCL-SDK/template
 create mode 120000 srcpkgs/ocl-icd
 delete mode 100644 srcpkgs/ocl-icd/template

diff --git a/common/shlibs b/common/shlibs
index 9e6d29c73341e..241be3e11ac29 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3469,7 +3469,7 @@ libtepl-6.so.2 tepl-6.4.0_1
 libnomacsCore.so.3 nomacs-3.10.2_4
 libaudit.so.1 libaudit-2.8.4_1
 libauparse.so.0 libauparse-2.8.4_1
-libOpenCL.so.1 ocl-icd-2.2.12_1
+libOpenCL.so.1 OpenCL-ICD-Loader-2023.12.14_1
 liburiparser.so.1 uriparser-0.8.6_1
 libcpptest.so.1 cpptest-2.0.0_1
 libhandy-0.0.so.0 libhandy-0.0.3_1
diff --git a/srcpkgs/OpenCL-Headers b/srcpkgs/OpenCL-Headers
new file mode 120000
index 0000000000000..709890a653340
--- /dev/null
+++ b/srcpkgs/OpenCL-Headers
@@ -0,0 +1 @@
+OpenCL-SDK
\ No newline at end of file
diff --git a/srcpkgs/OpenCL-Headers/template b/srcpkgs/OpenCL-Headers/template
deleted file mode 100644
index 624059f8c1d8d..0000000000000
--- a/srcpkgs/OpenCL-Headers/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'OpenCL-Headers'
-pkgname=OpenCL-Headers
-version=2023.12.14
-revision=1
-build_style=cmake
-short_desc="Khronos OpenCL (Open Computing Language) header files"
-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=407d5e109a70ec1b6cd3380ce357c21e3d3651a91caae6d0d8e1719c69a1791d
-provides="opencl-headers-${version}_${revision}"
-replaces="opencl-headers>=0"
-
-opencl2-headers_package() {
-	build_style=meta
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" (transitional dummy package)"
-}
diff --git a/srcpkgs/OpenCL-ICD-Loader b/srcpkgs/OpenCL-ICD-Loader
new file mode 120000
index 0000000000000..709890a653340
--- /dev/null
+++ b/srcpkgs/OpenCL-ICD-Loader
@@ -0,0 +1 @@
+OpenCL-SDK
\ No newline at end of file
diff --git a/srcpkgs/OpenCL-SDK/template b/srcpkgs/OpenCL-SDK/template
new file mode 100644
index 0000000000000..c96893eea4771
--- /dev/null
+++ b/srcpkgs/OpenCL-SDK/template
@@ -0,0 +1,70 @@
+# Template file for 'OpenCL-SDK'
+pkgname=OpenCL-SDK
+version=2023.12.14
+revision=1
+build_wrksrc=OpenCL-SDK-${version}
+build_style=cmake
+configure_args="
+	-DOPENCL_SDK_BUILD_SAMPLES=OFF
+	-DOPENCL_SDK_BUILD_OPENGL_SAMPLES=OFF
+	-DOPENCL_SDK_TEST_SAMPLES=OFF
+	-DOPENCL_SDK_BUILD_TESTS=OFF
+"
+hostmakedepends="git doxygen"
+depends="OpenCL-Headers-${version}_${revision} OpenCL-ICD-Loader-${version}_${revision}"
+short_desc="OpenCL SDK"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="Apache-2.0"
+homepage="https://github.com/KhronosGroup/OpenCL-SDK"
+distfiles="https://github.com/KhronosGroup/OpenCL-SDK/archive/refs/tags/v${version}.tar.gz>OpenCL-SDK-${version}.tar.gz
+https://github.com/KhronosGroup/OpenCL-CLHPP/archive/refs/tags/v${version}.tar.gz>OpenCL-CLHPP-${version}.tar.gz
+https://github.com/KhronosGroup/OpenCL-Headers/archive/refs/tags/v${version}.tar.gz>OpenCL-Headers-${version}.tar.gz
+https://github.com/KhronosGroup/OpenCL-ICD-Loader/archive/refs/tags/v${version}.tar.gz>OpenCL-ICD-Loader-${version}.tar.gz"
+checksum="9d70ec09aa5d811e6b345ce27fed20fbe0d826ce944b1eaa01af4c3f822adf7b
+ 9106700634e79cfa0935ebd67197f64689ced24c42da702acf18fa8435bd8a82
+ 407d5e109a70ec1b6cd3380ce357c21e3d3651a91caae6d0d8e1719c69a1791d
+ af8df96f1e1030329e8d4892ba3aa761b923838d4c689ef52d97822ab0bd8917"
+
+post_extract() {
+	rmdir OpenCL-SDK-${version}/external/*
+	mv OpenCL-CLHPP-${version}      OpenCL-SDK-${version}/external/OpenCL-CLHPP
+	mv OpenCL-Headers-${version}    OpenCL-SDK-${version}/external/OpenCL-Headers
+	mv OpenCL-ICD-Loader-${version} OpenCL-SDK-${version}/external/OpenCL-ICD-Loader
+}
+
+ocl-icd-devel_package() {
+	build_style=meta
+	depends="OpenCL-SDK>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+}
+
+ocl-icd_package() {
+	build_style=meta
+	depends="OpenCL-ICD-Loader>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+}
+
+opencl2-headers_package() {
+	build_style=meta
+	depends="OpenCL-Headers>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+}
+
+OpenCL-Headers_package() {
+	short_desc="Khronos OpenCL (Open Computing Language) header files"
+	pkg_install() {
+		vmove usr/include/CL/opencl.h
+		vmove usr/include/CL/cl.h
+		vmove "usr/include/CL/cl_*"
+		vmove usr/share/cmake/OpenCLHeaders
+		vmove usr/share/pkgconfig/OpenCL-Headers.pc
+	}
+}
+
+OpenCL-ICD-Loader_package() {
+	short_desc="Khronos OpenCL (Open Computing Language) Loader"
+	pkg_install() {
+		vmove usr/bin/cllayerinfo
+		vmove "usr/lib/libOpenCL.so*"
+	}
+}
diff --git a/srcpkgs/ocl-icd b/srcpkgs/ocl-icd
new file mode 120000
index 0000000000000..709890a653340
--- /dev/null
+++ b/srcpkgs/ocl-icd
@@ -0,0 +1 @@
+OpenCL-SDK
\ No newline at end of file
diff --git a/srcpkgs/ocl-icd/template b/srcpkgs/ocl-icd/template
deleted file mode 100644
index ab3e07a9f762b..0000000000000
--- a/srcpkgs/ocl-icd/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'ocl-icd'
-pkgname=ocl-icd
-version=2.3.2
-revision=2
-build_style=gnu-configure
-hostmakedepends="ruby xmlto asciidoc automake libtool"
-makedepends="OpenCL-Headers"
-short_desc="Generic OpenCL ICD loader/demultiplexer"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-2-Clause"
-homepage="https://github.com/OCL-dev/ocl-icd"
-distfiles="https://github.com/OCL-dev/${pkgname}/archive/v${version}.tar.gz"
-checksum=ec47d7dcd961ea06695b067e8b7edb82e420ddce03e0081a908c62fd0b8535c5
-
-provides="libOpenCL-1.2_1"
-replaces="libOpenCL>=0"
-
-CFLAGS="-fcommon"
-
-pre_configure() {
-	./bootstrap
-}
-
-post_install() {
-	vlicense COPYING
-}
-
-ocl-icd-devel_package() {
-	depends="OpenCL-Headers ${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/share/doc
-	}
-}

From 2f91c70b18ba86e18baaf2f3014d703fddcc5c96 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:53:44 -0500
Subject: [PATCH 02/14] ImageMagick: Rebuild for OpenCL-SDK

---
 srcpkgs/ImageMagick/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index cf7e696d36776..c007bd0ca6fb2 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -2,7 +2,7 @@
 pkgname=ImageMagick
 # Revbump php*-imagick with ImageMagick updates.
 version=7.1.1.18
-revision=2
+revision=3
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 build_style=gnu-configure
 configure_args="--disable-static --enable-opencl --with-modules --with-gslib
@@ -11,7 +11,7 @@ configure_args="--disable-static --enable-opencl --with-modules --with-gslib
 hostmakedepends="automake libtool pkg-config autoconf"
 makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
  libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel libwmf-devel
- ocl-icd-devel pango-devel libopenjpeg2-devel graphviz-devel liblqr-devel
+ OpenCL-SDK pango-devel libopenjpeg2-devel graphviz-devel liblqr-devel
  libraqm-devel libopenexr-devel libheif-devel"
 checkdepends="ttf-opensans"
 short_desc="Create, edit, compose, or convert bitmap images"

From 00618a5ecef677a0859ec606c6c161b739036fe7 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:53:47 -0500
Subject: [PATCH 03/14] clinfo: Rebuild for OpenCL-SDK

---
 srcpkgs/clinfo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/clinfo/template b/srcpkgs/clinfo/template
index cdc3755802ecb..6b6b4f0619c5a 100644
--- a/srcpkgs/clinfo/template
+++ b/srcpkgs/clinfo/template
@@ -1,9 +1,9 @@
 # Template file for 'clinfo'
 pkgname=clinfo
 version=3.0.23.01.25
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="ocl-icd-devel"
+makedepends="OpenCL-SDK"
 short_desc="Prints all information about OpenCL in the system"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="CC0-1.0"

From c2845b765ba5e6e8b409c3ebae4dcde24388e310 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:53:50 -0500
Subject: [PATCH 04/14] ffmpeg: Rebuild for OpenCL-SDK

---
 srcpkgs/ffmpeg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 5968a09b1f12d..35f6d7a0263af 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,7 +2,7 @@
 # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
 pkgname=ffmpeg
 version=4.4.4
-revision=5
+revision=6
 short_desc="Decoding, encoding and streaming software"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -16,7 +16,7 @@ makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-deve
  libXext-devel libXvMC-devel libxcb-devel lame-devel libtheora-devel
  libvorbis-devel x264-devel xvidcore-devel jack-devel SDL2-devel
  libcdio-paranoia-devel librtmp-devel libmodplug-devel gnutls-devel
- speex-devel celt-devel harfbuzz-devel libass-devel opus-devel ocl-icd-devel
+ speex-devel celt-devel harfbuzz-devel libass-devel opus-devel OpenCL-SDK
  libbs2b-devel libvidstab-devel vmaf-devel $(vopt_if pulseaudio pulseaudio-devel)
  $(vopt_if vaapi libva-devel) $(vopt_if vdpau libvdpau-devel)
  $(vopt_if x265 x265-devel) $(vopt_if v4l2 v4l-utils-devel)

From ff408d4b784f40bf7a6a0d5fd596d7046bc45951 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:53:54 -0500
Subject: [PATCH 05/14] lc0: Rebuild for OpenCL-SDK

---
 srcpkgs/lc0/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lc0/template b/srcpkgs/lc0/template
index 61ff6e5744303..0814298a73c8b 100644
--- a/srcpkgs/lc0/template
+++ b/srcpkgs/lc0/template
@@ -1,7 +1,7 @@
 # Template file for 'lc0'
 pkgname=lc0
 version=0.30.0
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv[67]l* ppc64le*"
 create_wrksrc=yes
 build_style=meson
@@ -9,7 +9,7 @@ configure_args="-Dgtest=false"
 _lczero_commit=fafda0f59c8511b5d933ef758c1e4b10a62da1e0
 hostmakedepends="pkg-config"
 makedepends="protobuf-devel zlib-devel eigen $(vopt_if openblas openblas-devel)
- $(vopt_if opencl ocl-icd-devel)"
+ $(vopt_if opencl OpenCL-SDK)"
 short_desc="UCI chess engine designed to play via neural network"
 maintainer="shtayerc <david.murko@mailbox.org>"
 license="GPL-3.0-only"

From 5d9091bd8badcc932217a0826f7e9a3cb0b61efb Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:53:57 -0500
Subject: [PATCH 06/14] libgdal: Rebuild for OpenCL-SDK

---
 srcpkgs/libgdal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index d5850fb768f66..1346f07d22c14 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.5.3
-revision=12
+revision=13
 build_style=cmake
 build_helper=python3
 configure_args="-DGDAL_USE_OPENCL=ON
@@ -12,7 +12,7 @@ makedepends="python3-devel freexl-devel c-blosc-devel geos-devel expat-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
- ocl-icd-devel libxerces-c-devel libspatialite-devel
+ OpenCL-SDK libxerces-c-devel libspatialite-devel
  postgresql-libs-devel"
 checkdepends="python3-pytest"
 short_desc="Geospatial Data Abstraction Library"

From 522811544d4517db72693aa69f50aea9f49ade3e Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:54:00 -0500
Subject: [PATCH 07/14] nvidia: Rebuild for OpenCL-SDK

---
 srcpkgs/nvidia/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 64fb7dcec8e0e..7910f39e529ea 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -4,7 +4,7 @@ _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
 version=535.146.02
-revision=1
+revision=2
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com/en-us/drivers/unix/"
@@ -322,7 +322,7 @@ nvidia-dkms_package() {
 
 nvidia-opencl_package() {
 	short_desc="${_desc} - OpenCL implementation"
-	depends="ocl-icd"
+	depends="OpenCL-ICD-Loader"
 	conflicts="nvidia470-opencl>=0 nvidia390-opencl>=0"
 	pkg_install() {
 		vmove "usr/lib/libnvidia-opencl*"

From d70c56abd6e9e90d51d3a55fd3bb35c426868781 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:54:03 -0500
Subject: [PATCH 08/14] nvidia390: Rebuild for OpenCL-SDK

---
 srcpkgs/nvidia390/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nvidia390/template b/srcpkgs/nvidia390/template
index 48492ca7d8028..506ab3be767b9 100644
--- a/srcpkgs/nvidia390/template
+++ b/srcpkgs/nvidia390/template
@@ -4,7 +4,7 @@ _desc="NVIDIA drivers (GeForce 400, 500 series)"
 
 pkgname=nvidia390
 version=390.157
-revision=6
+revision=7
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com/en-us/drivers/unix/"
@@ -249,7 +249,7 @@ nvidia390-dkms_package() {
 }
 nvidia390-opencl_package() {
 	short_desc="${_desc} - OpenCL implementation"
-	depends="ocl-icd"
+	depends="OpenCL-ICD-Loader"
 	pkg_install() {
 		vmove "usr/lib/libnvidia-compiler*"
 		vmove "usr/lib/libnvidia-opencl*"

From 9e1432b930106f810184fcd36f3960a002aa84ad Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:54:07 -0500
Subject: [PATCH 09/14] nvidia470: Rebuild for OpenCL-SDK

---
 srcpkgs/nvidia470/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nvidia470/template b/srcpkgs/nvidia470/template
index 39f53ede8212f..aecf844bf4e6a 100644
--- a/srcpkgs/nvidia470/template
+++ b/srcpkgs/nvidia470/template
@@ -4,7 +4,7 @@ _desc="NVIDIA drivers (GKxxx “Kepler”)"
 
 pkgname=nvidia470
 version=470.223.02
-revision=1
+revision=2
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com/en-us/drivers/unix/"
@@ -307,7 +307,7 @@ nvidia470-dkms_package() {
 
 nvidia470-opencl_package() {
 	short_desc="${_desc} - OpenCL implementation"
-	depends="ocl-icd"
+	depends="OpenCL-ICD-Loader"
 	conflicts="nvidia390-opencl>=0"
 	pkg_install() {
 		vmove "usr/lib/libnvidia-compiler*"

From 706791324a5005cb011ab930d02e268cd157175b Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:54:10 -0500
Subject: [PATCH 10/14] opencv: Rebuild for OpenCL-SDK

---
 srcpkgs/opencv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index aea4bfc3a265c..4d79b6f00540d 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=6
+revision=7
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake
@@ -14,7 +14,7 @@ configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON
  -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF"
 hostmakedepends="pkg-config eigen python3-numpy python3-setuptools"
 makedepends="ffmpeg-devel libpng-devel libjpeg-turbo-devel tiff-devel
- jasper-devel ocl-icd-devel libgomp-devel libopenexr-devel gtk+3-devel
+ jasper-devel OpenCL-SDK libgomp-devel libopenexr-devel gtk+3-devel
  libgphoto2-devel gst-plugins-base1-devel openblas-devel
  python3-numpy python3-devel"
 short_desc="Computer vision and machine learning software library"

From 28471de96fa0b2b7ab839854dfd8cba12e294608 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:54:13 -0500
Subject: [PATCH 11/14] python3-pyopencl: Rebuild for OpenCL-SDK

---
 srcpkgs/python3-pyopencl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pyopencl/template b/srcpkgs/python3-pyopencl/template
index 7f3ed48a8f6af..6ac9f92f5cc78 100644
--- a/srcpkgs/python3-pyopencl/template
+++ b/srcpkgs/python3-pyopencl/template
@@ -1,10 +1,10 @@
 # Template file for 'python3-pyopencl'
 pkgname=python3-pyopencl
 version=2023.1.4
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pybind11 python3-Cython python3-numpy"
-makedepends="OpenCL-Headers ocl-icd-devel python3-pybind11"
+makedepends="OpenCL-Headers OpenCL-SDK python3-pybind11"
 depends="python3-numpy python3-pytools python3-platformdirs"
 short_desc="OpenCL bindings for Python 3"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 43c01f4c887ae470e694113aba20307ef52c9e45 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:54:17 -0500
Subject: [PATCH 12/14] qgis: Rebuild for OpenCL-SDK

---
 srcpkgs/qgis/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
index 6d6175b2427b5..9bc3697713871 100644
--- a/srcpkgs/qgis/template
+++ b/srcpkgs/qgis/template
@@ -1,7 +1,7 @@
 # Template file for 'qgis'
 pkgname=qgis
 version=3.34.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF -DWITH_3D=True -DWITH_PDAL=True
  -DGRASS_PREFIX8=${XBPS_CROSS_BASE}/usr/lib/grass"
@@ -9,7 +9,7 @@ hostmakedepends="bison flex pkg-config protobuf python3 python3-sip-PyQt5 sip"
 makedepends="exiv2-devel draco-devel expat-devel freexl-devel geos-devel
  gsl-devel grass-devel hdf5-devel libgdal-devel libpdal-devel librttopo-devel
  libspatialindex-devel libspatialite-devel libxml2-devel libzip-devel
- minizip-devel netcdf-devel ocl-icd-devel postgresql-libs-devel
+ minizip-devel netcdf-devel OpenCL-SDK postgresql-libs-devel
  proj-devel protobuf-devel python3-devel python3-PyQt-builder
  python3-PyQt5-devel python3-PyQt5-devel-tools python3-PyQt5-multimedia
  python3-pyqt5-qsci-devel python3-PyQt5-webkit python3-sip-PyQt5 qca-qt5-devel

From 0516f9719e4cb32ffe798fa0f64ce00867b73ae9 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:54:20 -0500
Subject: [PATCH 13/14] wine: Rebuild for OpenCL-SDK

---
 srcpkgs/wine/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 717260c94c4c4..8c7a59122b36c 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,7 +1,7 @@
 # Template file for 'wine'
 pkgname=wine
 version=8.21
-revision=1
+revision=2
 _pkgver=${version/r/-r}
 create_wrksrc=yes
 build_wrksrc=wine-${_pkgver}
@@ -48,7 +48,7 @@ makedepends="gettext-devel ncurses-devel glu-devel libSM-devel
  alsa-lib-devel libgphoto2-devel glib-devel
  freetype-devel pulseaudio-devel giflib-devel
  v4l-utils-devel fontconfig-devel gnutls-devel dbus-devel sane-devel
- libpcap-devel cups-devel ocl-icd-devel vulkan-loader gst-plugins-base1-devel
+ libpcap-devel cups-devel OpenCL-SDK vulkan-loader gst-plugins-base1-devel
  SDL2-devel"
 depends="libXi libXinerama libXcomposite libXcursor libOSMesa
  desktop-file-utils hicolor-icon-theme liberation-fonts-ttf

From 505d24b4960d9ef04cd2b8822ef712528d605aa3 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:54:59 -0500
Subject: [PATCH 14/14] CPU-X: Rebuild for OpenCL-SDK

---
 srcpkgs/CPU-X/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/CPU-X/template b/srcpkgs/CPU-X/template
index 6c89acb658517..bf17494012e8b 100644
--- a/srcpkgs/CPU-X/template
+++ b/srcpkgs/CPU-X/template
@@ -1,12 +1,12 @@
 # Template file for 'CPU-X'
 pkgname=CPU-X
 version=4.5.3
-revision=1
+revision=2
 archs="x86_64* i686*"
 build_style=cmake
 hostmakedepends="pkg-config nasm"
 makedepends="ncurses-devel gettext-devel libcpuid-devel pciutils-devel
- glfw-devel ocl-icd-devel procps-ng-devel libstatgrab gtk+3-devel
+ glfw-devel OpenCL-SDK procps-ng-devel libstatgrab gtk+3-devel
  vulkan-loader Vulkan-Headers"
 #checkdepends="mawk nawk grep"
 short_desc="Free software that gathers information on CPU, motherboard and more"

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: New package: OpenCL-SDK
  2024-01-17 23:59 [PR PATCH] New package: OpenCL-SDK Calandracas606
@ 2024-01-18  0:50 ` Calandracas606
  2024-01-18  0:59 ` [PR PATCH] [Updated] " Calandracas606
                   ` (14 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Calandracas606 @ 2024-01-18  0:50 UTC (permalink / raw)
  To: ml

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

New comment by Calandracas606 on void-packages repository

https://github.com/void-linux/void-packages/pull/48261#issuecomment-1897570176

Comment:
python3-pyopencl is failing in CI and in local builds

I've tried building it from master (without the changes in this PR) and it is still failing. Perhaps the package is broken? 

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Updated] New package: OpenCL-SDK
  2024-01-17 23:59 [PR PATCH] New package: OpenCL-SDK Calandracas606
  2024-01-18  0:50 ` Calandracas606
@ 2024-01-18  0:59 ` Calandracas606
  2024-01-18  1:00 ` Calandracas606
                   ` (13 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Calandracas606 @ 2024-01-18  0:59 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Calandracas606/void-packages OpenCL-SDK
https://github.com/void-linux/void-packages/pull/48261

New package: OpenCL-SDK
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-glibc
  - aarch64-musl (cross)
  - armv7l (cross)
  - armv6l-musl (cross)


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

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

From 3718cd9a075090746308f3a17fb2e419d2d68a30 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:46:50 -0500
Subject: [PATCH 01/14] New package: OpenCL-SDK-2023.12.14

---
 common/shlibs                   |  2 +-
 srcpkgs/OpenCL-Headers          |  1 +
 srcpkgs/OpenCL-Headers/template | 19 ---------
 srcpkgs/OpenCL-ICD-Loader       |  1 +
 srcpkgs/OpenCL-SDK/template     | 70 +++++++++++++++++++++++++++++++++
 srcpkgs/ocl-icd                 |  1 +
 srcpkgs/ocl-icd/template        | 36 -----------------
 7 files changed, 74 insertions(+), 56 deletions(-)
 create mode 120000 srcpkgs/OpenCL-Headers
 delete mode 100644 srcpkgs/OpenCL-Headers/template
 create mode 120000 srcpkgs/OpenCL-ICD-Loader
 create mode 100644 srcpkgs/OpenCL-SDK/template
 create mode 120000 srcpkgs/ocl-icd
 delete mode 100644 srcpkgs/ocl-icd/template

diff --git a/common/shlibs b/common/shlibs
index 9e6d29c73341e..241be3e11ac29 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3469,7 +3469,7 @@ libtepl-6.so.2 tepl-6.4.0_1
 libnomacsCore.so.3 nomacs-3.10.2_4
 libaudit.so.1 libaudit-2.8.4_1
 libauparse.so.0 libauparse-2.8.4_1
-libOpenCL.so.1 ocl-icd-2.2.12_1
+libOpenCL.so.1 OpenCL-ICD-Loader-2023.12.14_1
 liburiparser.so.1 uriparser-0.8.6_1
 libcpptest.so.1 cpptest-2.0.0_1
 libhandy-0.0.so.0 libhandy-0.0.3_1
diff --git a/srcpkgs/OpenCL-Headers b/srcpkgs/OpenCL-Headers
new file mode 120000
index 0000000000000..709890a653340
--- /dev/null
+++ b/srcpkgs/OpenCL-Headers
@@ -0,0 +1 @@
+OpenCL-SDK
\ No newline at end of file
diff --git a/srcpkgs/OpenCL-Headers/template b/srcpkgs/OpenCL-Headers/template
deleted file mode 100644
index 624059f8c1d8d..0000000000000
--- a/srcpkgs/OpenCL-Headers/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'OpenCL-Headers'
-pkgname=OpenCL-Headers
-version=2023.12.14
-revision=1
-build_style=cmake
-short_desc="Khronos OpenCL (Open Computing Language) header files"
-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=407d5e109a70ec1b6cd3380ce357c21e3d3651a91caae6d0d8e1719c69a1791d
-provides="opencl-headers-${version}_${revision}"
-replaces="opencl-headers>=0"
-
-opencl2-headers_package() {
-	build_style=meta
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" (transitional dummy package)"
-}
diff --git a/srcpkgs/OpenCL-ICD-Loader b/srcpkgs/OpenCL-ICD-Loader
new file mode 120000
index 0000000000000..709890a653340
--- /dev/null
+++ b/srcpkgs/OpenCL-ICD-Loader
@@ -0,0 +1 @@
+OpenCL-SDK
\ No newline at end of file
diff --git a/srcpkgs/OpenCL-SDK/template b/srcpkgs/OpenCL-SDK/template
new file mode 100644
index 0000000000000..c96893eea4771
--- /dev/null
+++ b/srcpkgs/OpenCL-SDK/template
@@ -0,0 +1,70 @@
+# Template file for 'OpenCL-SDK'
+pkgname=OpenCL-SDK
+version=2023.12.14
+revision=1
+build_wrksrc=OpenCL-SDK-${version}
+build_style=cmake
+configure_args="
+	-DOPENCL_SDK_BUILD_SAMPLES=OFF
+	-DOPENCL_SDK_BUILD_OPENGL_SAMPLES=OFF
+	-DOPENCL_SDK_TEST_SAMPLES=OFF
+	-DOPENCL_SDK_BUILD_TESTS=OFF
+"
+hostmakedepends="git doxygen"
+depends="OpenCL-Headers-${version}_${revision} OpenCL-ICD-Loader-${version}_${revision}"
+short_desc="OpenCL SDK"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="Apache-2.0"
+homepage="https://github.com/KhronosGroup/OpenCL-SDK"
+distfiles="https://github.com/KhronosGroup/OpenCL-SDK/archive/refs/tags/v${version}.tar.gz>OpenCL-SDK-${version}.tar.gz
+https://github.com/KhronosGroup/OpenCL-CLHPP/archive/refs/tags/v${version}.tar.gz>OpenCL-CLHPP-${version}.tar.gz
+https://github.com/KhronosGroup/OpenCL-Headers/archive/refs/tags/v${version}.tar.gz>OpenCL-Headers-${version}.tar.gz
+https://github.com/KhronosGroup/OpenCL-ICD-Loader/archive/refs/tags/v${version}.tar.gz>OpenCL-ICD-Loader-${version}.tar.gz"
+checksum="9d70ec09aa5d811e6b345ce27fed20fbe0d826ce944b1eaa01af4c3f822adf7b
+ 9106700634e79cfa0935ebd67197f64689ced24c42da702acf18fa8435bd8a82
+ 407d5e109a70ec1b6cd3380ce357c21e3d3651a91caae6d0d8e1719c69a1791d
+ af8df96f1e1030329e8d4892ba3aa761b923838d4c689ef52d97822ab0bd8917"
+
+post_extract() {
+	rmdir OpenCL-SDK-${version}/external/*
+	mv OpenCL-CLHPP-${version}      OpenCL-SDK-${version}/external/OpenCL-CLHPP
+	mv OpenCL-Headers-${version}    OpenCL-SDK-${version}/external/OpenCL-Headers
+	mv OpenCL-ICD-Loader-${version} OpenCL-SDK-${version}/external/OpenCL-ICD-Loader
+}
+
+ocl-icd-devel_package() {
+	build_style=meta
+	depends="OpenCL-SDK>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+}
+
+ocl-icd_package() {
+	build_style=meta
+	depends="OpenCL-ICD-Loader>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+}
+
+opencl2-headers_package() {
+	build_style=meta
+	depends="OpenCL-Headers>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+}
+
+OpenCL-Headers_package() {
+	short_desc="Khronos OpenCL (Open Computing Language) header files"
+	pkg_install() {
+		vmove usr/include/CL/opencl.h
+		vmove usr/include/CL/cl.h
+		vmove "usr/include/CL/cl_*"
+		vmove usr/share/cmake/OpenCLHeaders
+		vmove usr/share/pkgconfig/OpenCL-Headers.pc
+	}
+}
+
+OpenCL-ICD-Loader_package() {
+	short_desc="Khronos OpenCL (Open Computing Language) Loader"
+	pkg_install() {
+		vmove usr/bin/cllayerinfo
+		vmove "usr/lib/libOpenCL.so*"
+	}
+}
diff --git a/srcpkgs/ocl-icd b/srcpkgs/ocl-icd
new file mode 120000
index 0000000000000..709890a653340
--- /dev/null
+++ b/srcpkgs/ocl-icd
@@ -0,0 +1 @@
+OpenCL-SDK
\ No newline at end of file
diff --git a/srcpkgs/ocl-icd/template b/srcpkgs/ocl-icd/template
deleted file mode 100644
index ab3e07a9f762b..0000000000000
--- a/srcpkgs/ocl-icd/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'ocl-icd'
-pkgname=ocl-icd
-version=2.3.2
-revision=2
-build_style=gnu-configure
-hostmakedepends="ruby xmlto asciidoc automake libtool"
-makedepends="OpenCL-Headers"
-short_desc="Generic OpenCL ICD loader/demultiplexer"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-2-Clause"
-homepage="https://github.com/OCL-dev/ocl-icd"
-distfiles="https://github.com/OCL-dev/${pkgname}/archive/v${version}.tar.gz"
-checksum=ec47d7dcd961ea06695b067e8b7edb82e420ddce03e0081a908c62fd0b8535c5
-
-provides="libOpenCL-1.2_1"
-replaces="libOpenCL>=0"
-
-CFLAGS="-fcommon"
-
-pre_configure() {
-	./bootstrap
-}
-
-post_install() {
-	vlicense COPYING
-}
-
-ocl-icd-devel_package() {
-	depends="OpenCL-Headers ${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/share/doc
-	}
-}

From 2f91c70b18ba86e18baaf2f3014d703fddcc5c96 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:53:44 -0500
Subject: [PATCH 02/14] ImageMagick: Rebuild for OpenCL-SDK

---
 srcpkgs/ImageMagick/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index cf7e696d36776..c007bd0ca6fb2 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -2,7 +2,7 @@
 pkgname=ImageMagick
 # Revbump php*-imagick with ImageMagick updates.
 version=7.1.1.18
-revision=2
+revision=3
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 build_style=gnu-configure
 configure_args="--disable-static --enable-opencl --with-modules --with-gslib
@@ -11,7 +11,7 @@ configure_args="--disable-static --enable-opencl --with-modules --with-gslib
 hostmakedepends="automake libtool pkg-config autoconf"
 makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
  libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel libwmf-devel
- ocl-icd-devel pango-devel libopenjpeg2-devel graphviz-devel liblqr-devel
+ OpenCL-SDK pango-devel libopenjpeg2-devel graphviz-devel liblqr-devel
  libraqm-devel libopenexr-devel libheif-devel"
 checkdepends="ttf-opensans"
 short_desc="Create, edit, compose, or convert bitmap images"

From 00618a5ecef677a0859ec606c6c161b739036fe7 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:53:47 -0500
Subject: [PATCH 03/14] clinfo: Rebuild for OpenCL-SDK

---
 srcpkgs/clinfo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/clinfo/template b/srcpkgs/clinfo/template
index cdc3755802ecb..6b6b4f0619c5a 100644
--- a/srcpkgs/clinfo/template
+++ b/srcpkgs/clinfo/template
@@ -1,9 +1,9 @@
 # Template file for 'clinfo'
 pkgname=clinfo
 version=3.0.23.01.25
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="ocl-icd-devel"
+makedepends="OpenCL-SDK"
 short_desc="Prints all information about OpenCL in the system"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="CC0-1.0"

From c2845b765ba5e6e8b409c3ebae4dcde24388e310 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:53:50 -0500
Subject: [PATCH 04/14] ffmpeg: Rebuild for OpenCL-SDK

---
 srcpkgs/ffmpeg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 5968a09b1f12d..35f6d7a0263af 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,7 +2,7 @@
 # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
 pkgname=ffmpeg
 version=4.4.4
-revision=5
+revision=6
 short_desc="Decoding, encoding and streaming software"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -16,7 +16,7 @@ makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-deve
  libXext-devel libXvMC-devel libxcb-devel lame-devel libtheora-devel
  libvorbis-devel x264-devel xvidcore-devel jack-devel SDL2-devel
  libcdio-paranoia-devel librtmp-devel libmodplug-devel gnutls-devel
- speex-devel celt-devel harfbuzz-devel libass-devel opus-devel ocl-icd-devel
+ speex-devel celt-devel harfbuzz-devel libass-devel opus-devel OpenCL-SDK
  libbs2b-devel libvidstab-devel vmaf-devel $(vopt_if pulseaudio pulseaudio-devel)
  $(vopt_if vaapi libva-devel) $(vopt_if vdpau libvdpau-devel)
  $(vopt_if x265 x265-devel) $(vopt_if v4l2 v4l-utils-devel)

From ff408d4b784f40bf7a6a0d5fd596d7046bc45951 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:53:54 -0500
Subject: [PATCH 05/14] lc0: Rebuild for OpenCL-SDK

---
 srcpkgs/lc0/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lc0/template b/srcpkgs/lc0/template
index 61ff6e5744303..0814298a73c8b 100644
--- a/srcpkgs/lc0/template
+++ b/srcpkgs/lc0/template
@@ -1,7 +1,7 @@
 # Template file for 'lc0'
 pkgname=lc0
 version=0.30.0
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv[67]l* ppc64le*"
 create_wrksrc=yes
 build_style=meson
@@ -9,7 +9,7 @@ configure_args="-Dgtest=false"
 _lczero_commit=fafda0f59c8511b5d933ef758c1e4b10a62da1e0
 hostmakedepends="pkg-config"
 makedepends="protobuf-devel zlib-devel eigen $(vopt_if openblas openblas-devel)
- $(vopt_if opencl ocl-icd-devel)"
+ $(vopt_if opencl OpenCL-SDK)"
 short_desc="UCI chess engine designed to play via neural network"
 maintainer="shtayerc <david.murko@mailbox.org>"
 license="GPL-3.0-only"

From 5d9091bd8badcc932217a0826f7e9a3cb0b61efb Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:53:57 -0500
Subject: [PATCH 06/14] libgdal: Rebuild for OpenCL-SDK

---
 srcpkgs/libgdal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index d5850fb768f66..1346f07d22c14 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.5.3
-revision=12
+revision=13
 build_style=cmake
 build_helper=python3
 configure_args="-DGDAL_USE_OPENCL=ON
@@ -12,7 +12,7 @@ makedepends="python3-devel freexl-devel c-blosc-devel geos-devel expat-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
- ocl-icd-devel libxerces-c-devel libspatialite-devel
+ OpenCL-SDK libxerces-c-devel libspatialite-devel
  postgresql-libs-devel"
 checkdepends="python3-pytest"
 short_desc="Geospatial Data Abstraction Library"

From 522811544d4517db72693aa69f50aea9f49ade3e Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:54:00 -0500
Subject: [PATCH 07/14] nvidia: Rebuild for OpenCL-SDK

---
 srcpkgs/nvidia/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 64fb7dcec8e0e..7910f39e529ea 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -4,7 +4,7 @@ _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
 version=535.146.02
-revision=1
+revision=2
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com/en-us/drivers/unix/"
@@ -322,7 +322,7 @@ nvidia-dkms_package() {
 
 nvidia-opencl_package() {
 	short_desc="${_desc} - OpenCL implementation"
-	depends="ocl-icd"
+	depends="OpenCL-ICD-Loader"
 	conflicts="nvidia470-opencl>=0 nvidia390-opencl>=0"
 	pkg_install() {
 		vmove "usr/lib/libnvidia-opencl*"

From d70c56abd6e9e90d51d3a55fd3bb35c426868781 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:54:03 -0500
Subject: [PATCH 08/14] nvidia390: Rebuild for OpenCL-SDK

---
 srcpkgs/nvidia390/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nvidia390/template b/srcpkgs/nvidia390/template
index 48492ca7d8028..506ab3be767b9 100644
--- a/srcpkgs/nvidia390/template
+++ b/srcpkgs/nvidia390/template
@@ -4,7 +4,7 @@ _desc="NVIDIA drivers (GeForce 400, 500 series)"
 
 pkgname=nvidia390
 version=390.157
-revision=6
+revision=7
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com/en-us/drivers/unix/"
@@ -249,7 +249,7 @@ nvidia390-dkms_package() {
 }
 nvidia390-opencl_package() {
 	short_desc="${_desc} - OpenCL implementation"
-	depends="ocl-icd"
+	depends="OpenCL-ICD-Loader"
 	pkg_install() {
 		vmove "usr/lib/libnvidia-compiler*"
 		vmove "usr/lib/libnvidia-opencl*"

From 9e1432b930106f810184fcd36f3960a002aa84ad Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:54:07 -0500
Subject: [PATCH 09/14] nvidia470: Rebuild for OpenCL-SDK

---
 srcpkgs/nvidia470/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nvidia470/template b/srcpkgs/nvidia470/template
index 39f53ede8212f..aecf844bf4e6a 100644
--- a/srcpkgs/nvidia470/template
+++ b/srcpkgs/nvidia470/template
@@ -4,7 +4,7 @@ _desc="NVIDIA drivers (GKxxx “Kepler”)"
 
 pkgname=nvidia470
 version=470.223.02
-revision=1
+revision=2
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com/en-us/drivers/unix/"
@@ -307,7 +307,7 @@ nvidia470-dkms_package() {
 
 nvidia470-opencl_package() {
 	short_desc="${_desc} - OpenCL implementation"
-	depends="ocl-icd"
+	depends="OpenCL-ICD-Loader"
 	conflicts="nvidia390-opencl>=0"
 	pkg_install() {
 		vmove "usr/lib/libnvidia-compiler*"

From 706791324a5005cb011ab930d02e268cd157175b Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:54:10 -0500
Subject: [PATCH 10/14] opencv: Rebuild for OpenCL-SDK

---
 srcpkgs/opencv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index aea4bfc3a265c..4d79b6f00540d 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=6
+revision=7
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake
@@ -14,7 +14,7 @@ configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON
  -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF"
 hostmakedepends="pkg-config eigen python3-numpy python3-setuptools"
 makedepends="ffmpeg-devel libpng-devel libjpeg-turbo-devel tiff-devel
- jasper-devel ocl-icd-devel libgomp-devel libopenexr-devel gtk+3-devel
+ jasper-devel OpenCL-SDK libgomp-devel libopenexr-devel gtk+3-devel
  libgphoto2-devel gst-plugins-base1-devel openblas-devel
  python3-numpy python3-devel"
 short_desc="Computer vision and machine learning software library"

From 39fa7e980748ac84efa2ce8e8273e35ae6cf910a Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:54:13 -0500
Subject: [PATCH 11/14] python3-pyopencl: Rebuild for OpenCL-SDK

---
 .../patches/CL_UNORM_INT24.patch              | 23 +++++++++++++++++++
 srcpkgs/python3-pyopencl/template             |  4 ++--
 2 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/python3-pyopencl/patches/CL_UNORM_INT24.patch

diff --git a/srcpkgs/python3-pyopencl/patches/CL_UNORM_INT24.patch b/srcpkgs/python3-pyopencl/patches/CL_UNORM_INT24.patch
new file mode 100644
index 0000000000000..a046e8246a083
--- /dev/null
+++ b/srcpkgs/python3-pyopencl/patches/CL_UNORM_INT24.patch
@@ -0,0 +1,23 @@
+From 21f336f2be73b784e6fa9410a0a8dab6050a1240 Mon Sep 17 00:00:00 2001
+From: Andreas Kloeckner <inform@tiker.net>
+Date: Wed, 18 Oct 2023 10:29:35 -0500
+Subject: [PATCH] Fix conditions for CL_UNORM_INT24 availability
+
+Closes gh-705
+---
+ src/wrap_constants.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/wrap_constants.cpp b/src/wrap_constants.cpp
+index 2c06f2f5e..d7a27b467 100644
+--- a/src/wrap_constants.cpp
++++ b/src/wrap_constants.cpp
+@@ -750,7 +750,7 @@ void pyopencl_expose_constants(py::module_ &m)
+     ADD_ATTR( , UNSIGNED_INT32);
+     ADD_ATTR( , HALF_FLOAT);
+     ADD_ATTR( , FLOAT);
+-#if PYOPENCL_CL_VERSION >= 0x1020
++#if PYOPENCL_CL_VERSION >= 0x1020 && defined(cl_khr_gl_sharing)
+     ADD_ATTR( , UNORM_INT24);
+ #endif
+ #if PYOPENCL_CL_VERSION >= 0x2010
diff --git a/srcpkgs/python3-pyopencl/template b/srcpkgs/python3-pyopencl/template
index 7f3ed48a8f6af..1e6baefe5102c 100644
--- a/srcpkgs/python3-pyopencl/template
+++ b/srcpkgs/python3-pyopencl/template
@@ -1,10 +1,10 @@
 # Template file for 'python3-pyopencl'
 pkgname=python3-pyopencl
 version=2023.1.4
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pybind11 python3-Cython python3-numpy"
-makedepends="OpenCL-Headers ocl-icd-devel python3-pybind11"
+makedepends="OpenCL-SDK python3-pybind11"
 depends="python3-numpy python3-pytools python3-platformdirs"
 short_desc="OpenCL bindings for Python 3"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 5ef87122e795b7d902c4143c7db1a80afe664682 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:54:17 -0500
Subject: [PATCH 12/14] qgis: Rebuild for OpenCL-SDK

---
 srcpkgs/qgis/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
index 6d6175b2427b5..9bc3697713871 100644
--- a/srcpkgs/qgis/template
+++ b/srcpkgs/qgis/template
@@ -1,7 +1,7 @@
 # Template file for 'qgis'
 pkgname=qgis
 version=3.34.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF -DWITH_3D=True -DWITH_PDAL=True
  -DGRASS_PREFIX8=${XBPS_CROSS_BASE}/usr/lib/grass"
@@ -9,7 +9,7 @@ hostmakedepends="bison flex pkg-config protobuf python3 python3-sip-PyQt5 sip"
 makedepends="exiv2-devel draco-devel expat-devel freexl-devel geos-devel
  gsl-devel grass-devel hdf5-devel libgdal-devel libpdal-devel librttopo-devel
  libspatialindex-devel libspatialite-devel libxml2-devel libzip-devel
- minizip-devel netcdf-devel ocl-icd-devel postgresql-libs-devel
+ minizip-devel netcdf-devel OpenCL-SDK postgresql-libs-devel
  proj-devel protobuf-devel python3-devel python3-PyQt-builder
  python3-PyQt5-devel python3-PyQt5-devel-tools python3-PyQt5-multimedia
  python3-pyqt5-qsci-devel python3-PyQt5-webkit python3-sip-PyQt5 qca-qt5-devel

From c5a5b580582f740e2a3f51838471d19a00f2f8a7 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:54:20 -0500
Subject: [PATCH 13/14] wine: Rebuild for OpenCL-SDK

---
 srcpkgs/wine/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 717260c94c4c4..8c7a59122b36c 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,7 +1,7 @@
 # Template file for 'wine'
 pkgname=wine
 version=8.21
-revision=1
+revision=2
 _pkgver=${version/r/-r}
 create_wrksrc=yes
 build_wrksrc=wine-${_pkgver}
@@ -48,7 +48,7 @@ makedepends="gettext-devel ncurses-devel glu-devel libSM-devel
  alsa-lib-devel libgphoto2-devel glib-devel
  freetype-devel pulseaudio-devel giflib-devel
  v4l-utils-devel fontconfig-devel gnutls-devel dbus-devel sane-devel
- libpcap-devel cups-devel ocl-icd-devel vulkan-loader gst-plugins-base1-devel
+ libpcap-devel cups-devel OpenCL-SDK vulkan-loader gst-plugins-base1-devel
  SDL2-devel"
 depends="libXi libXinerama libXcomposite libXcursor libOSMesa
  desktop-file-utils hicolor-icon-theme liberation-fonts-ttf

From 95053b43217c54d6e490a1d202d1c3fadc7e7db2 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:54:59 -0500
Subject: [PATCH 14/14] CPU-X: Rebuild for OpenCL-SDK

---
 srcpkgs/CPU-X/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/CPU-X/template b/srcpkgs/CPU-X/template
index 6c89acb658517..bf17494012e8b 100644
--- a/srcpkgs/CPU-X/template
+++ b/srcpkgs/CPU-X/template
@@ -1,12 +1,12 @@
 # Template file for 'CPU-X'
 pkgname=CPU-X
 version=4.5.3
-revision=1
+revision=2
 archs="x86_64* i686*"
 build_style=cmake
 hostmakedepends="pkg-config nasm"
 makedepends="ncurses-devel gettext-devel libcpuid-devel pciutils-devel
- glfw-devel ocl-icd-devel procps-ng-devel libstatgrab gtk+3-devel
+ glfw-devel OpenCL-SDK procps-ng-devel libstatgrab gtk+3-devel
  vulkan-loader Vulkan-Headers"
 #checkdepends="mawk nawk grep"
 short_desc="Free software that gathers information on CPU, motherboard and more"

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: New package: OpenCL-SDK
  2024-01-17 23:59 [PR PATCH] New package: OpenCL-SDK Calandracas606
  2024-01-18  0:50 ` Calandracas606
  2024-01-18  0:59 ` [PR PATCH] [Updated] " Calandracas606
@ 2024-01-18  1:00 ` Calandracas606
  2024-01-18  1:07 ` [PR PATCH] [Updated] " Calandracas606
                   ` (12 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Calandracas606 @ 2024-01-18  1:00 UTC (permalink / raw)
  To: ml

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

New comment by Calandracas606 on void-packages repository

https://github.com/void-linux/void-packages/pull/48261#issuecomment-1897570176

Comment:
python3-pyopencl is failing in CI and in local builds

I've tried building it from master (without the changes in this PR) and it is still failing. Perhaps the package is broken? 

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Updated] New package: OpenCL-SDK
  2024-01-17 23:59 [PR PATCH] New package: OpenCL-SDK Calandracas606
                   ` (2 preceding siblings ...)
  2024-01-18  1:00 ` Calandracas606
@ 2024-01-18  1:07 ` Calandracas606
  2024-01-18  3:56 ` Calandracas606
                   ` (11 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Calandracas606 @ 2024-01-18  1:07 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Calandracas606/void-packages OpenCL-SDK
https://github.com/void-linux/void-packages/pull/48261

New package: OpenCL-SDK
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-glibc
  - aarch64-musl (cross)
  - armv7l (cross)
  - armv6l-musl (cross)


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

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

From 3718cd9a075090746308f3a17fb2e419d2d68a30 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:46:50 -0500
Subject: [PATCH 01/14] New package: OpenCL-SDK-2023.12.14

---
 common/shlibs                   |  2 +-
 srcpkgs/OpenCL-Headers          |  1 +
 srcpkgs/OpenCL-Headers/template | 19 ---------
 srcpkgs/OpenCL-ICD-Loader       |  1 +
 srcpkgs/OpenCL-SDK/template     | 70 +++++++++++++++++++++++++++++++++
 srcpkgs/ocl-icd                 |  1 +
 srcpkgs/ocl-icd/template        | 36 -----------------
 7 files changed, 74 insertions(+), 56 deletions(-)
 create mode 120000 srcpkgs/OpenCL-Headers
 delete mode 100644 srcpkgs/OpenCL-Headers/template
 create mode 120000 srcpkgs/OpenCL-ICD-Loader
 create mode 100644 srcpkgs/OpenCL-SDK/template
 create mode 120000 srcpkgs/ocl-icd
 delete mode 100644 srcpkgs/ocl-icd/template

diff --git a/common/shlibs b/common/shlibs
index 9e6d29c73341e..241be3e11ac29 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3469,7 +3469,7 @@ libtepl-6.so.2 tepl-6.4.0_1
 libnomacsCore.so.3 nomacs-3.10.2_4
 libaudit.so.1 libaudit-2.8.4_1
 libauparse.so.0 libauparse-2.8.4_1
-libOpenCL.so.1 ocl-icd-2.2.12_1
+libOpenCL.so.1 OpenCL-ICD-Loader-2023.12.14_1
 liburiparser.so.1 uriparser-0.8.6_1
 libcpptest.so.1 cpptest-2.0.0_1
 libhandy-0.0.so.0 libhandy-0.0.3_1
diff --git a/srcpkgs/OpenCL-Headers b/srcpkgs/OpenCL-Headers
new file mode 120000
index 0000000000000..709890a653340
--- /dev/null
+++ b/srcpkgs/OpenCL-Headers
@@ -0,0 +1 @@
+OpenCL-SDK
\ No newline at end of file
diff --git a/srcpkgs/OpenCL-Headers/template b/srcpkgs/OpenCL-Headers/template
deleted file mode 100644
index 624059f8c1d8d..0000000000000
--- a/srcpkgs/OpenCL-Headers/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'OpenCL-Headers'
-pkgname=OpenCL-Headers
-version=2023.12.14
-revision=1
-build_style=cmake
-short_desc="Khronos OpenCL (Open Computing Language) header files"
-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=407d5e109a70ec1b6cd3380ce357c21e3d3651a91caae6d0d8e1719c69a1791d
-provides="opencl-headers-${version}_${revision}"
-replaces="opencl-headers>=0"
-
-opencl2-headers_package() {
-	build_style=meta
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" (transitional dummy package)"
-}
diff --git a/srcpkgs/OpenCL-ICD-Loader b/srcpkgs/OpenCL-ICD-Loader
new file mode 120000
index 0000000000000..709890a653340
--- /dev/null
+++ b/srcpkgs/OpenCL-ICD-Loader
@@ -0,0 +1 @@
+OpenCL-SDK
\ No newline at end of file
diff --git a/srcpkgs/OpenCL-SDK/template b/srcpkgs/OpenCL-SDK/template
new file mode 100644
index 0000000000000..c96893eea4771
--- /dev/null
+++ b/srcpkgs/OpenCL-SDK/template
@@ -0,0 +1,70 @@
+# Template file for 'OpenCL-SDK'
+pkgname=OpenCL-SDK
+version=2023.12.14
+revision=1
+build_wrksrc=OpenCL-SDK-${version}
+build_style=cmake
+configure_args="
+	-DOPENCL_SDK_BUILD_SAMPLES=OFF
+	-DOPENCL_SDK_BUILD_OPENGL_SAMPLES=OFF
+	-DOPENCL_SDK_TEST_SAMPLES=OFF
+	-DOPENCL_SDK_BUILD_TESTS=OFF
+"
+hostmakedepends="git doxygen"
+depends="OpenCL-Headers-${version}_${revision} OpenCL-ICD-Loader-${version}_${revision}"
+short_desc="OpenCL SDK"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="Apache-2.0"
+homepage="https://github.com/KhronosGroup/OpenCL-SDK"
+distfiles="https://github.com/KhronosGroup/OpenCL-SDK/archive/refs/tags/v${version}.tar.gz>OpenCL-SDK-${version}.tar.gz
+https://github.com/KhronosGroup/OpenCL-CLHPP/archive/refs/tags/v${version}.tar.gz>OpenCL-CLHPP-${version}.tar.gz
+https://github.com/KhronosGroup/OpenCL-Headers/archive/refs/tags/v${version}.tar.gz>OpenCL-Headers-${version}.tar.gz
+https://github.com/KhronosGroup/OpenCL-ICD-Loader/archive/refs/tags/v${version}.tar.gz>OpenCL-ICD-Loader-${version}.tar.gz"
+checksum="9d70ec09aa5d811e6b345ce27fed20fbe0d826ce944b1eaa01af4c3f822adf7b
+ 9106700634e79cfa0935ebd67197f64689ced24c42da702acf18fa8435bd8a82
+ 407d5e109a70ec1b6cd3380ce357c21e3d3651a91caae6d0d8e1719c69a1791d
+ af8df96f1e1030329e8d4892ba3aa761b923838d4c689ef52d97822ab0bd8917"
+
+post_extract() {
+	rmdir OpenCL-SDK-${version}/external/*
+	mv OpenCL-CLHPP-${version}      OpenCL-SDK-${version}/external/OpenCL-CLHPP
+	mv OpenCL-Headers-${version}    OpenCL-SDK-${version}/external/OpenCL-Headers
+	mv OpenCL-ICD-Loader-${version} OpenCL-SDK-${version}/external/OpenCL-ICD-Loader
+}
+
+ocl-icd-devel_package() {
+	build_style=meta
+	depends="OpenCL-SDK>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+}
+
+ocl-icd_package() {
+	build_style=meta
+	depends="OpenCL-ICD-Loader>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+}
+
+opencl2-headers_package() {
+	build_style=meta
+	depends="OpenCL-Headers>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+}
+
+OpenCL-Headers_package() {
+	short_desc="Khronos OpenCL (Open Computing Language) header files"
+	pkg_install() {
+		vmove usr/include/CL/opencl.h
+		vmove usr/include/CL/cl.h
+		vmove "usr/include/CL/cl_*"
+		vmove usr/share/cmake/OpenCLHeaders
+		vmove usr/share/pkgconfig/OpenCL-Headers.pc
+	}
+}
+
+OpenCL-ICD-Loader_package() {
+	short_desc="Khronos OpenCL (Open Computing Language) Loader"
+	pkg_install() {
+		vmove usr/bin/cllayerinfo
+		vmove "usr/lib/libOpenCL.so*"
+	}
+}
diff --git a/srcpkgs/ocl-icd b/srcpkgs/ocl-icd
new file mode 120000
index 0000000000000..709890a653340
--- /dev/null
+++ b/srcpkgs/ocl-icd
@@ -0,0 +1 @@
+OpenCL-SDK
\ No newline at end of file
diff --git a/srcpkgs/ocl-icd/template b/srcpkgs/ocl-icd/template
deleted file mode 100644
index ab3e07a9f762b..0000000000000
--- a/srcpkgs/ocl-icd/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'ocl-icd'
-pkgname=ocl-icd
-version=2.3.2
-revision=2
-build_style=gnu-configure
-hostmakedepends="ruby xmlto asciidoc automake libtool"
-makedepends="OpenCL-Headers"
-short_desc="Generic OpenCL ICD loader/demultiplexer"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-2-Clause"
-homepage="https://github.com/OCL-dev/ocl-icd"
-distfiles="https://github.com/OCL-dev/${pkgname}/archive/v${version}.tar.gz"
-checksum=ec47d7dcd961ea06695b067e8b7edb82e420ddce03e0081a908c62fd0b8535c5
-
-provides="libOpenCL-1.2_1"
-replaces="libOpenCL>=0"
-
-CFLAGS="-fcommon"
-
-pre_configure() {
-	./bootstrap
-}
-
-post_install() {
-	vlicense COPYING
-}
-
-ocl-icd-devel_package() {
-	depends="OpenCL-Headers ${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/share/doc
-	}
-}

From 2f91c70b18ba86e18baaf2f3014d703fddcc5c96 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:53:44 -0500
Subject: [PATCH 02/14] ImageMagick: Rebuild for OpenCL-SDK

---
 srcpkgs/ImageMagick/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index cf7e696d36776..c007bd0ca6fb2 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -2,7 +2,7 @@
 pkgname=ImageMagick
 # Revbump php*-imagick with ImageMagick updates.
 version=7.1.1.18
-revision=2
+revision=3
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 build_style=gnu-configure
 configure_args="--disable-static --enable-opencl --with-modules --with-gslib
@@ -11,7 +11,7 @@ configure_args="--disable-static --enable-opencl --with-modules --with-gslib
 hostmakedepends="automake libtool pkg-config autoconf"
 makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
  libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel libwmf-devel
- ocl-icd-devel pango-devel libopenjpeg2-devel graphviz-devel liblqr-devel
+ OpenCL-SDK pango-devel libopenjpeg2-devel graphviz-devel liblqr-devel
  libraqm-devel libopenexr-devel libheif-devel"
 checkdepends="ttf-opensans"
 short_desc="Create, edit, compose, or convert bitmap images"

From 00618a5ecef677a0859ec606c6c161b739036fe7 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:53:47 -0500
Subject: [PATCH 03/14] clinfo: Rebuild for OpenCL-SDK

---
 srcpkgs/clinfo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/clinfo/template b/srcpkgs/clinfo/template
index cdc3755802ecb..6b6b4f0619c5a 100644
--- a/srcpkgs/clinfo/template
+++ b/srcpkgs/clinfo/template
@@ -1,9 +1,9 @@
 # Template file for 'clinfo'
 pkgname=clinfo
 version=3.0.23.01.25
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="ocl-icd-devel"
+makedepends="OpenCL-SDK"
 short_desc="Prints all information about OpenCL in the system"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="CC0-1.0"

From c2845b765ba5e6e8b409c3ebae4dcde24388e310 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:53:50 -0500
Subject: [PATCH 04/14] ffmpeg: Rebuild for OpenCL-SDK

---
 srcpkgs/ffmpeg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 5968a09b1f12d..35f6d7a0263af 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,7 +2,7 @@
 # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
 pkgname=ffmpeg
 version=4.4.4
-revision=5
+revision=6
 short_desc="Decoding, encoding and streaming software"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -16,7 +16,7 @@ makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-deve
  libXext-devel libXvMC-devel libxcb-devel lame-devel libtheora-devel
  libvorbis-devel x264-devel xvidcore-devel jack-devel SDL2-devel
  libcdio-paranoia-devel librtmp-devel libmodplug-devel gnutls-devel
- speex-devel celt-devel harfbuzz-devel libass-devel opus-devel ocl-icd-devel
+ speex-devel celt-devel harfbuzz-devel libass-devel opus-devel OpenCL-SDK
  libbs2b-devel libvidstab-devel vmaf-devel $(vopt_if pulseaudio pulseaudio-devel)
  $(vopt_if vaapi libva-devel) $(vopt_if vdpau libvdpau-devel)
  $(vopt_if x265 x265-devel) $(vopt_if v4l2 v4l-utils-devel)

From ff408d4b784f40bf7a6a0d5fd596d7046bc45951 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:53:54 -0500
Subject: [PATCH 05/14] lc0: Rebuild for OpenCL-SDK

---
 srcpkgs/lc0/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lc0/template b/srcpkgs/lc0/template
index 61ff6e5744303..0814298a73c8b 100644
--- a/srcpkgs/lc0/template
+++ b/srcpkgs/lc0/template
@@ -1,7 +1,7 @@
 # Template file for 'lc0'
 pkgname=lc0
 version=0.30.0
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv[67]l* ppc64le*"
 create_wrksrc=yes
 build_style=meson
@@ -9,7 +9,7 @@ configure_args="-Dgtest=false"
 _lczero_commit=fafda0f59c8511b5d933ef758c1e4b10a62da1e0
 hostmakedepends="pkg-config"
 makedepends="protobuf-devel zlib-devel eigen $(vopt_if openblas openblas-devel)
- $(vopt_if opencl ocl-icd-devel)"
+ $(vopt_if opencl OpenCL-SDK)"
 short_desc="UCI chess engine designed to play via neural network"
 maintainer="shtayerc <david.murko@mailbox.org>"
 license="GPL-3.0-only"

From 5d9091bd8badcc932217a0826f7e9a3cb0b61efb Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:53:57 -0500
Subject: [PATCH 06/14] libgdal: Rebuild for OpenCL-SDK

---
 srcpkgs/libgdal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index d5850fb768f66..1346f07d22c14 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.5.3
-revision=12
+revision=13
 build_style=cmake
 build_helper=python3
 configure_args="-DGDAL_USE_OPENCL=ON
@@ -12,7 +12,7 @@ makedepends="python3-devel freexl-devel c-blosc-devel geos-devel expat-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
- ocl-icd-devel libxerces-c-devel libspatialite-devel
+ OpenCL-SDK libxerces-c-devel libspatialite-devel
  postgresql-libs-devel"
 checkdepends="python3-pytest"
 short_desc="Geospatial Data Abstraction Library"

From 522811544d4517db72693aa69f50aea9f49ade3e Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:54:00 -0500
Subject: [PATCH 07/14] nvidia: Rebuild for OpenCL-SDK

---
 srcpkgs/nvidia/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 64fb7dcec8e0e..7910f39e529ea 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -4,7 +4,7 @@ _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
 version=535.146.02
-revision=1
+revision=2
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com/en-us/drivers/unix/"
@@ -322,7 +322,7 @@ nvidia-dkms_package() {
 
 nvidia-opencl_package() {
 	short_desc="${_desc} - OpenCL implementation"
-	depends="ocl-icd"
+	depends="OpenCL-ICD-Loader"
 	conflicts="nvidia470-opencl>=0 nvidia390-opencl>=0"
 	pkg_install() {
 		vmove "usr/lib/libnvidia-opencl*"

From d70c56abd6e9e90d51d3a55fd3bb35c426868781 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:54:03 -0500
Subject: [PATCH 08/14] nvidia390: Rebuild for OpenCL-SDK

---
 srcpkgs/nvidia390/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nvidia390/template b/srcpkgs/nvidia390/template
index 48492ca7d8028..506ab3be767b9 100644
--- a/srcpkgs/nvidia390/template
+++ b/srcpkgs/nvidia390/template
@@ -4,7 +4,7 @@ _desc="NVIDIA drivers (GeForce 400, 500 series)"
 
 pkgname=nvidia390
 version=390.157
-revision=6
+revision=7
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com/en-us/drivers/unix/"
@@ -249,7 +249,7 @@ nvidia390-dkms_package() {
 }
 nvidia390-opencl_package() {
 	short_desc="${_desc} - OpenCL implementation"
-	depends="ocl-icd"
+	depends="OpenCL-ICD-Loader"
 	pkg_install() {
 		vmove "usr/lib/libnvidia-compiler*"
 		vmove "usr/lib/libnvidia-opencl*"

From 9e1432b930106f810184fcd36f3960a002aa84ad Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:54:07 -0500
Subject: [PATCH 09/14] nvidia470: Rebuild for OpenCL-SDK

---
 srcpkgs/nvidia470/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nvidia470/template b/srcpkgs/nvidia470/template
index 39f53ede8212f..aecf844bf4e6a 100644
--- a/srcpkgs/nvidia470/template
+++ b/srcpkgs/nvidia470/template
@@ -4,7 +4,7 @@ _desc="NVIDIA drivers (GKxxx “Kepler”)"
 
 pkgname=nvidia470
 version=470.223.02
-revision=1
+revision=2
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com/en-us/drivers/unix/"
@@ -307,7 +307,7 @@ nvidia470-dkms_package() {
 
 nvidia470-opencl_package() {
 	short_desc="${_desc} - OpenCL implementation"
-	depends="ocl-icd"
+	depends="OpenCL-ICD-Loader"
 	conflicts="nvidia390-opencl>=0"
 	pkg_install() {
 		vmove "usr/lib/libnvidia-compiler*"

From 706791324a5005cb011ab930d02e268cd157175b Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:54:10 -0500
Subject: [PATCH 10/14] opencv: Rebuild for OpenCL-SDK

---
 srcpkgs/opencv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index aea4bfc3a265c..4d79b6f00540d 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=6
+revision=7
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake
@@ -14,7 +14,7 @@ configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON
  -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF"
 hostmakedepends="pkg-config eigen python3-numpy python3-setuptools"
 makedepends="ffmpeg-devel libpng-devel libjpeg-turbo-devel tiff-devel
- jasper-devel ocl-icd-devel libgomp-devel libopenexr-devel gtk+3-devel
+ jasper-devel OpenCL-SDK libgomp-devel libopenexr-devel gtk+3-devel
  libgphoto2-devel gst-plugins-base1-devel openblas-devel
  python3-numpy python3-devel"
 short_desc="Computer vision and machine learning software library"

From 39fa7e980748ac84efa2ce8e8273e35ae6cf910a Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:54:13 -0500
Subject: [PATCH 11/14] python3-pyopencl: Rebuild for OpenCL-SDK

---
 .../patches/CL_UNORM_INT24.patch              | 23 +++++++++++++++++++
 srcpkgs/python3-pyopencl/template             |  4 ++--
 2 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/python3-pyopencl/patches/CL_UNORM_INT24.patch

diff --git a/srcpkgs/python3-pyopencl/patches/CL_UNORM_INT24.patch b/srcpkgs/python3-pyopencl/patches/CL_UNORM_INT24.patch
new file mode 100644
index 0000000000000..a046e8246a083
--- /dev/null
+++ b/srcpkgs/python3-pyopencl/patches/CL_UNORM_INT24.patch
@@ -0,0 +1,23 @@
+From 21f336f2be73b784e6fa9410a0a8dab6050a1240 Mon Sep 17 00:00:00 2001
+From: Andreas Kloeckner <inform@tiker.net>
+Date: Wed, 18 Oct 2023 10:29:35 -0500
+Subject: [PATCH] Fix conditions for CL_UNORM_INT24 availability
+
+Closes gh-705
+---
+ src/wrap_constants.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/wrap_constants.cpp b/src/wrap_constants.cpp
+index 2c06f2f5e..d7a27b467 100644
+--- a/src/wrap_constants.cpp
++++ b/src/wrap_constants.cpp
+@@ -750,7 +750,7 @@ void pyopencl_expose_constants(py::module_ &m)
+     ADD_ATTR( , UNSIGNED_INT32);
+     ADD_ATTR( , HALF_FLOAT);
+     ADD_ATTR( , FLOAT);
+-#if PYOPENCL_CL_VERSION >= 0x1020
++#if PYOPENCL_CL_VERSION >= 0x1020 && defined(cl_khr_gl_sharing)
+     ADD_ATTR( , UNORM_INT24);
+ #endif
+ #if PYOPENCL_CL_VERSION >= 0x2010
diff --git a/srcpkgs/python3-pyopencl/template b/srcpkgs/python3-pyopencl/template
index 7f3ed48a8f6af..1e6baefe5102c 100644
--- a/srcpkgs/python3-pyopencl/template
+++ b/srcpkgs/python3-pyopencl/template
@@ -1,10 +1,10 @@
 # Template file for 'python3-pyopencl'
 pkgname=python3-pyopencl
 version=2023.1.4
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pybind11 python3-Cython python3-numpy"
-makedepends="OpenCL-Headers ocl-icd-devel python3-pybind11"
+makedepends="OpenCL-SDK python3-pybind11"
 depends="python3-numpy python3-pytools python3-platformdirs"
 short_desc="OpenCL bindings for Python 3"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 5ef87122e795b7d902c4143c7db1a80afe664682 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:54:17 -0500
Subject: [PATCH 12/14] qgis: Rebuild for OpenCL-SDK

---
 srcpkgs/qgis/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
index 6d6175b2427b5..9bc3697713871 100644
--- a/srcpkgs/qgis/template
+++ b/srcpkgs/qgis/template
@@ -1,7 +1,7 @@
 # Template file for 'qgis'
 pkgname=qgis
 version=3.34.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF -DWITH_3D=True -DWITH_PDAL=True
  -DGRASS_PREFIX8=${XBPS_CROSS_BASE}/usr/lib/grass"
@@ -9,7 +9,7 @@ hostmakedepends="bison flex pkg-config protobuf python3 python3-sip-PyQt5 sip"
 makedepends="exiv2-devel draco-devel expat-devel freexl-devel geos-devel
  gsl-devel grass-devel hdf5-devel libgdal-devel libpdal-devel librttopo-devel
  libspatialindex-devel libspatialite-devel libxml2-devel libzip-devel
- minizip-devel netcdf-devel ocl-icd-devel postgresql-libs-devel
+ minizip-devel netcdf-devel OpenCL-SDK postgresql-libs-devel
  proj-devel protobuf-devel python3-devel python3-PyQt-builder
  python3-PyQt5-devel python3-PyQt5-devel-tools python3-PyQt5-multimedia
  python3-pyqt5-qsci-devel python3-PyQt5-webkit python3-sip-PyQt5 qca-qt5-devel

From c5a5b580582f740e2a3f51838471d19a00f2f8a7 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:54:20 -0500
Subject: [PATCH 13/14] wine: Rebuild for OpenCL-SDK

---
 srcpkgs/wine/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 717260c94c4c4..8c7a59122b36c 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,7 +1,7 @@
 # Template file for 'wine'
 pkgname=wine
 version=8.21
-revision=1
+revision=2
 _pkgver=${version/r/-r}
 create_wrksrc=yes
 build_wrksrc=wine-${_pkgver}
@@ -48,7 +48,7 @@ makedepends="gettext-devel ncurses-devel glu-devel libSM-devel
  alsa-lib-devel libgphoto2-devel glib-devel
  freetype-devel pulseaudio-devel giflib-devel
  v4l-utils-devel fontconfig-devel gnutls-devel dbus-devel sane-devel
- libpcap-devel cups-devel ocl-icd-devel vulkan-loader gst-plugins-base1-devel
+ libpcap-devel cups-devel OpenCL-SDK vulkan-loader gst-plugins-base1-devel
  SDL2-devel"
 depends="libXi libXinerama libXcomposite libXcursor libOSMesa
  desktop-file-utils hicolor-icon-theme liberation-fonts-ttf

From 29d30ac3f647baceff3260ac9368ef6a82a1d892 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:54:59 -0500
Subject: [PATCH 14/14] CPU-X: Rebuild for OpenCL-SDK

---
 srcpkgs/CPU-X/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/CPU-X/template b/srcpkgs/CPU-X/template
index 6c89acb658517..8084f63580a83 100644
--- a/srcpkgs/CPU-X/template
+++ b/srcpkgs/CPU-X/template
@@ -1,12 +1,12 @@
 # Template file for 'CPU-X'
 pkgname=CPU-X
 version=4.5.3
-revision=1
+revision=2
 archs="x86_64* i686*"
 build_style=cmake
 hostmakedepends="pkg-config nasm"
 makedepends="ncurses-devel gettext-devel libcpuid-devel pciutils-devel
- glfw-devel ocl-icd-devel procps-ng-devel libstatgrab gtk+3-devel
+ glfw-devel OpenCL-SDK procps-ng-devel libstatgrab gtk+3-devel
  vulkan-loader Vulkan-Headers"
 #checkdepends="mawk nawk grep"
 short_desc="Free software that gathers information on CPU, motherboard and more"
@@ -17,7 +17,7 @@ changelog="https://github.com/TheTumultuousUnicornOfDarkness/CPU-X/blob/master/C
 distfiles="https://github.com/thetumultuousunicornofdarkness/CPU-X/archive/v${version}.tar.gz"
 checksum=aeef04fb5c2da85f8790ab74bd66e2e72c9595579d5f64d2d08f093ef69d81f9
 
-# xbps-src will still install checkdepends even if the template says `make_check=no`.
+# xbps-src will still install checkdepends even if the template says `make_check=no`.#
 # And breaking the build environment on the CI is also bad, if CPU-X would be part
 # of revbumps due to shared libraries it would destroy the CI.
 # if [ "$XBPS_BUILD_ENVIRONMENT" != void-packages-ci ]; then

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Updated] New package: OpenCL-SDK
  2024-01-17 23:59 [PR PATCH] New package: OpenCL-SDK Calandracas606
                   ` (3 preceding siblings ...)
  2024-01-18  1:07 ` [PR PATCH] [Updated] " Calandracas606
@ 2024-01-18  3:56 ` Calandracas606
  2024-01-18  6:41 ` ahesford
                   ` (10 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Calandracas606 @ 2024-01-18  3:56 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Calandracas606/void-packages OpenCL-SDK
https://github.com/void-linux/void-packages/pull/48261

New package: OpenCL-SDK
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-glibc
  - aarch64-musl (cross)
  - armv7l (cross)
  - armv6l-musl (cross)


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

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

From 3718cd9a075090746308f3a17fb2e419d2d68a30 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:46:50 -0500
Subject: [PATCH 01/14] New package: OpenCL-SDK-2023.12.14

---
 common/shlibs                   |  2 +-
 srcpkgs/OpenCL-Headers          |  1 +
 srcpkgs/OpenCL-Headers/template | 19 ---------
 srcpkgs/OpenCL-ICD-Loader       |  1 +
 srcpkgs/OpenCL-SDK/template     | 70 +++++++++++++++++++++++++++++++++
 srcpkgs/ocl-icd                 |  1 +
 srcpkgs/ocl-icd/template        | 36 -----------------
 7 files changed, 74 insertions(+), 56 deletions(-)
 create mode 120000 srcpkgs/OpenCL-Headers
 delete mode 100644 srcpkgs/OpenCL-Headers/template
 create mode 120000 srcpkgs/OpenCL-ICD-Loader
 create mode 100644 srcpkgs/OpenCL-SDK/template
 create mode 120000 srcpkgs/ocl-icd
 delete mode 100644 srcpkgs/ocl-icd/template

diff --git a/common/shlibs b/common/shlibs
index 9e6d29c73341e..241be3e11ac29 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3469,7 +3469,7 @@ libtepl-6.so.2 tepl-6.4.0_1
 libnomacsCore.so.3 nomacs-3.10.2_4
 libaudit.so.1 libaudit-2.8.4_1
 libauparse.so.0 libauparse-2.8.4_1
-libOpenCL.so.1 ocl-icd-2.2.12_1
+libOpenCL.so.1 OpenCL-ICD-Loader-2023.12.14_1
 liburiparser.so.1 uriparser-0.8.6_1
 libcpptest.so.1 cpptest-2.0.0_1
 libhandy-0.0.so.0 libhandy-0.0.3_1
diff --git a/srcpkgs/OpenCL-Headers b/srcpkgs/OpenCL-Headers
new file mode 120000
index 0000000000000..709890a653340
--- /dev/null
+++ b/srcpkgs/OpenCL-Headers
@@ -0,0 +1 @@
+OpenCL-SDK
\ No newline at end of file
diff --git a/srcpkgs/OpenCL-Headers/template b/srcpkgs/OpenCL-Headers/template
deleted file mode 100644
index 624059f8c1d8d..0000000000000
--- a/srcpkgs/OpenCL-Headers/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'OpenCL-Headers'
-pkgname=OpenCL-Headers
-version=2023.12.14
-revision=1
-build_style=cmake
-short_desc="Khronos OpenCL (Open Computing Language) header files"
-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=407d5e109a70ec1b6cd3380ce357c21e3d3651a91caae6d0d8e1719c69a1791d
-provides="opencl-headers-${version}_${revision}"
-replaces="opencl-headers>=0"
-
-opencl2-headers_package() {
-	build_style=meta
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" (transitional dummy package)"
-}
diff --git a/srcpkgs/OpenCL-ICD-Loader b/srcpkgs/OpenCL-ICD-Loader
new file mode 120000
index 0000000000000..709890a653340
--- /dev/null
+++ b/srcpkgs/OpenCL-ICD-Loader
@@ -0,0 +1 @@
+OpenCL-SDK
\ No newline at end of file
diff --git a/srcpkgs/OpenCL-SDK/template b/srcpkgs/OpenCL-SDK/template
new file mode 100644
index 0000000000000..c96893eea4771
--- /dev/null
+++ b/srcpkgs/OpenCL-SDK/template
@@ -0,0 +1,70 @@
+# Template file for 'OpenCL-SDK'
+pkgname=OpenCL-SDK
+version=2023.12.14
+revision=1
+build_wrksrc=OpenCL-SDK-${version}
+build_style=cmake
+configure_args="
+	-DOPENCL_SDK_BUILD_SAMPLES=OFF
+	-DOPENCL_SDK_BUILD_OPENGL_SAMPLES=OFF
+	-DOPENCL_SDK_TEST_SAMPLES=OFF
+	-DOPENCL_SDK_BUILD_TESTS=OFF
+"
+hostmakedepends="git doxygen"
+depends="OpenCL-Headers-${version}_${revision} OpenCL-ICD-Loader-${version}_${revision}"
+short_desc="OpenCL SDK"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="Apache-2.0"
+homepage="https://github.com/KhronosGroup/OpenCL-SDK"
+distfiles="https://github.com/KhronosGroup/OpenCL-SDK/archive/refs/tags/v${version}.tar.gz>OpenCL-SDK-${version}.tar.gz
+https://github.com/KhronosGroup/OpenCL-CLHPP/archive/refs/tags/v${version}.tar.gz>OpenCL-CLHPP-${version}.tar.gz
+https://github.com/KhronosGroup/OpenCL-Headers/archive/refs/tags/v${version}.tar.gz>OpenCL-Headers-${version}.tar.gz
+https://github.com/KhronosGroup/OpenCL-ICD-Loader/archive/refs/tags/v${version}.tar.gz>OpenCL-ICD-Loader-${version}.tar.gz"
+checksum="9d70ec09aa5d811e6b345ce27fed20fbe0d826ce944b1eaa01af4c3f822adf7b
+ 9106700634e79cfa0935ebd67197f64689ced24c42da702acf18fa8435bd8a82
+ 407d5e109a70ec1b6cd3380ce357c21e3d3651a91caae6d0d8e1719c69a1791d
+ af8df96f1e1030329e8d4892ba3aa761b923838d4c689ef52d97822ab0bd8917"
+
+post_extract() {
+	rmdir OpenCL-SDK-${version}/external/*
+	mv OpenCL-CLHPP-${version}      OpenCL-SDK-${version}/external/OpenCL-CLHPP
+	mv OpenCL-Headers-${version}    OpenCL-SDK-${version}/external/OpenCL-Headers
+	mv OpenCL-ICD-Loader-${version} OpenCL-SDK-${version}/external/OpenCL-ICD-Loader
+}
+
+ocl-icd-devel_package() {
+	build_style=meta
+	depends="OpenCL-SDK>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+}
+
+ocl-icd_package() {
+	build_style=meta
+	depends="OpenCL-ICD-Loader>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+}
+
+opencl2-headers_package() {
+	build_style=meta
+	depends="OpenCL-Headers>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+}
+
+OpenCL-Headers_package() {
+	short_desc="Khronos OpenCL (Open Computing Language) header files"
+	pkg_install() {
+		vmove usr/include/CL/opencl.h
+		vmove usr/include/CL/cl.h
+		vmove "usr/include/CL/cl_*"
+		vmove usr/share/cmake/OpenCLHeaders
+		vmove usr/share/pkgconfig/OpenCL-Headers.pc
+	}
+}
+
+OpenCL-ICD-Loader_package() {
+	short_desc="Khronos OpenCL (Open Computing Language) Loader"
+	pkg_install() {
+		vmove usr/bin/cllayerinfo
+		vmove "usr/lib/libOpenCL.so*"
+	}
+}
diff --git a/srcpkgs/ocl-icd b/srcpkgs/ocl-icd
new file mode 120000
index 0000000000000..709890a653340
--- /dev/null
+++ b/srcpkgs/ocl-icd
@@ -0,0 +1 @@
+OpenCL-SDK
\ No newline at end of file
diff --git a/srcpkgs/ocl-icd/template b/srcpkgs/ocl-icd/template
deleted file mode 100644
index ab3e07a9f762b..0000000000000
--- a/srcpkgs/ocl-icd/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'ocl-icd'
-pkgname=ocl-icd
-version=2.3.2
-revision=2
-build_style=gnu-configure
-hostmakedepends="ruby xmlto asciidoc automake libtool"
-makedepends="OpenCL-Headers"
-short_desc="Generic OpenCL ICD loader/demultiplexer"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-2-Clause"
-homepage="https://github.com/OCL-dev/ocl-icd"
-distfiles="https://github.com/OCL-dev/${pkgname}/archive/v${version}.tar.gz"
-checksum=ec47d7dcd961ea06695b067e8b7edb82e420ddce03e0081a908c62fd0b8535c5
-
-provides="libOpenCL-1.2_1"
-replaces="libOpenCL>=0"
-
-CFLAGS="-fcommon"
-
-pre_configure() {
-	./bootstrap
-}
-
-post_install() {
-	vlicense COPYING
-}
-
-ocl-icd-devel_package() {
-	depends="OpenCL-Headers ${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/share/doc
-	}
-}

From 2f91c70b18ba86e18baaf2f3014d703fddcc5c96 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:53:44 -0500
Subject: [PATCH 02/14] ImageMagick: Rebuild for OpenCL-SDK

---
 srcpkgs/ImageMagick/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index cf7e696d36776..c007bd0ca6fb2 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -2,7 +2,7 @@
 pkgname=ImageMagick
 # Revbump php*-imagick with ImageMagick updates.
 version=7.1.1.18
-revision=2
+revision=3
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 build_style=gnu-configure
 configure_args="--disable-static --enable-opencl --with-modules --with-gslib
@@ -11,7 +11,7 @@ configure_args="--disable-static --enable-opencl --with-modules --with-gslib
 hostmakedepends="automake libtool pkg-config autoconf"
 makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
  libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel libwmf-devel
- ocl-icd-devel pango-devel libopenjpeg2-devel graphviz-devel liblqr-devel
+ OpenCL-SDK pango-devel libopenjpeg2-devel graphviz-devel liblqr-devel
  libraqm-devel libopenexr-devel libheif-devel"
 checkdepends="ttf-opensans"
 short_desc="Create, edit, compose, or convert bitmap images"

From 00618a5ecef677a0859ec606c6c161b739036fe7 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:53:47 -0500
Subject: [PATCH 03/14] clinfo: Rebuild for OpenCL-SDK

---
 srcpkgs/clinfo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/clinfo/template b/srcpkgs/clinfo/template
index cdc3755802ecb..6b6b4f0619c5a 100644
--- a/srcpkgs/clinfo/template
+++ b/srcpkgs/clinfo/template
@@ -1,9 +1,9 @@
 # Template file for 'clinfo'
 pkgname=clinfo
 version=3.0.23.01.25
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="ocl-icd-devel"
+makedepends="OpenCL-SDK"
 short_desc="Prints all information about OpenCL in the system"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="CC0-1.0"

From c2845b765ba5e6e8b409c3ebae4dcde24388e310 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:53:50 -0500
Subject: [PATCH 04/14] ffmpeg: Rebuild for OpenCL-SDK

---
 srcpkgs/ffmpeg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 5968a09b1f12d..35f6d7a0263af 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,7 +2,7 @@
 # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
 pkgname=ffmpeg
 version=4.4.4
-revision=5
+revision=6
 short_desc="Decoding, encoding and streaming software"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -16,7 +16,7 @@ makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-deve
  libXext-devel libXvMC-devel libxcb-devel lame-devel libtheora-devel
  libvorbis-devel x264-devel xvidcore-devel jack-devel SDL2-devel
  libcdio-paranoia-devel librtmp-devel libmodplug-devel gnutls-devel
- speex-devel celt-devel harfbuzz-devel libass-devel opus-devel ocl-icd-devel
+ speex-devel celt-devel harfbuzz-devel libass-devel opus-devel OpenCL-SDK
  libbs2b-devel libvidstab-devel vmaf-devel $(vopt_if pulseaudio pulseaudio-devel)
  $(vopt_if vaapi libva-devel) $(vopt_if vdpau libvdpau-devel)
  $(vopt_if x265 x265-devel) $(vopt_if v4l2 v4l-utils-devel)

From ff408d4b784f40bf7a6a0d5fd596d7046bc45951 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:53:54 -0500
Subject: [PATCH 05/14] lc0: Rebuild for OpenCL-SDK

---
 srcpkgs/lc0/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lc0/template b/srcpkgs/lc0/template
index 61ff6e5744303..0814298a73c8b 100644
--- a/srcpkgs/lc0/template
+++ b/srcpkgs/lc0/template
@@ -1,7 +1,7 @@
 # Template file for 'lc0'
 pkgname=lc0
 version=0.30.0
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv[67]l* ppc64le*"
 create_wrksrc=yes
 build_style=meson
@@ -9,7 +9,7 @@ configure_args="-Dgtest=false"
 _lczero_commit=fafda0f59c8511b5d933ef758c1e4b10a62da1e0
 hostmakedepends="pkg-config"
 makedepends="protobuf-devel zlib-devel eigen $(vopt_if openblas openblas-devel)
- $(vopt_if opencl ocl-icd-devel)"
+ $(vopt_if opencl OpenCL-SDK)"
 short_desc="UCI chess engine designed to play via neural network"
 maintainer="shtayerc <david.murko@mailbox.org>"
 license="GPL-3.0-only"

From 5d9091bd8badcc932217a0826f7e9a3cb0b61efb Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:53:57 -0500
Subject: [PATCH 06/14] libgdal: Rebuild for OpenCL-SDK

---
 srcpkgs/libgdal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index d5850fb768f66..1346f07d22c14 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.5.3
-revision=12
+revision=13
 build_style=cmake
 build_helper=python3
 configure_args="-DGDAL_USE_OPENCL=ON
@@ -12,7 +12,7 @@ makedepends="python3-devel freexl-devel c-blosc-devel geos-devel expat-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
- ocl-icd-devel libxerces-c-devel libspatialite-devel
+ OpenCL-SDK libxerces-c-devel libspatialite-devel
  postgresql-libs-devel"
 checkdepends="python3-pytest"
 short_desc="Geospatial Data Abstraction Library"

From 522811544d4517db72693aa69f50aea9f49ade3e Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:54:00 -0500
Subject: [PATCH 07/14] nvidia: Rebuild for OpenCL-SDK

---
 srcpkgs/nvidia/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 64fb7dcec8e0e..7910f39e529ea 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -4,7 +4,7 @@ _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
 version=535.146.02
-revision=1
+revision=2
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com/en-us/drivers/unix/"
@@ -322,7 +322,7 @@ nvidia-dkms_package() {
 
 nvidia-opencl_package() {
 	short_desc="${_desc} - OpenCL implementation"
-	depends="ocl-icd"
+	depends="OpenCL-ICD-Loader"
 	conflicts="nvidia470-opencl>=0 nvidia390-opencl>=0"
 	pkg_install() {
 		vmove "usr/lib/libnvidia-opencl*"

From d70c56abd6e9e90d51d3a55fd3bb35c426868781 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:54:03 -0500
Subject: [PATCH 08/14] nvidia390: Rebuild for OpenCL-SDK

---
 srcpkgs/nvidia390/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nvidia390/template b/srcpkgs/nvidia390/template
index 48492ca7d8028..506ab3be767b9 100644
--- a/srcpkgs/nvidia390/template
+++ b/srcpkgs/nvidia390/template
@@ -4,7 +4,7 @@ _desc="NVIDIA drivers (GeForce 400, 500 series)"
 
 pkgname=nvidia390
 version=390.157
-revision=6
+revision=7
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com/en-us/drivers/unix/"
@@ -249,7 +249,7 @@ nvidia390-dkms_package() {
 }
 nvidia390-opencl_package() {
 	short_desc="${_desc} - OpenCL implementation"
-	depends="ocl-icd"
+	depends="OpenCL-ICD-Loader"
 	pkg_install() {
 		vmove "usr/lib/libnvidia-compiler*"
 		vmove "usr/lib/libnvidia-opencl*"

From 9e1432b930106f810184fcd36f3960a002aa84ad Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:54:07 -0500
Subject: [PATCH 09/14] nvidia470: Rebuild for OpenCL-SDK

---
 srcpkgs/nvidia470/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nvidia470/template b/srcpkgs/nvidia470/template
index 39f53ede8212f..aecf844bf4e6a 100644
--- a/srcpkgs/nvidia470/template
+++ b/srcpkgs/nvidia470/template
@@ -4,7 +4,7 @@ _desc="NVIDIA drivers (GKxxx “Kepler”)"
 
 pkgname=nvidia470
 version=470.223.02
-revision=1
+revision=2
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com/en-us/drivers/unix/"
@@ -307,7 +307,7 @@ nvidia470-dkms_package() {
 
 nvidia470-opencl_package() {
 	short_desc="${_desc} - OpenCL implementation"
-	depends="ocl-icd"
+	depends="OpenCL-ICD-Loader"
 	conflicts="nvidia390-opencl>=0"
 	pkg_install() {
 		vmove "usr/lib/libnvidia-compiler*"

From 706791324a5005cb011ab930d02e268cd157175b Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:54:10 -0500
Subject: [PATCH 10/14] opencv: Rebuild for OpenCL-SDK

---
 srcpkgs/opencv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index aea4bfc3a265c..4d79b6f00540d 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=6
+revision=7
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake
@@ -14,7 +14,7 @@ configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON
  -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF"
 hostmakedepends="pkg-config eigen python3-numpy python3-setuptools"
 makedepends="ffmpeg-devel libpng-devel libjpeg-turbo-devel tiff-devel
- jasper-devel ocl-icd-devel libgomp-devel libopenexr-devel gtk+3-devel
+ jasper-devel OpenCL-SDK libgomp-devel libopenexr-devel gtk+3-devel
  libgphoto2-devel gst-plugins-base1-devel openblas-devel
  python3-numpy python3-devel"
 short_desc="Computer vision and machine learning software library"

From 39fa7e980748ac84efa2ce8e8273e35ae6cf910a Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:54:13 -0500
Subject: [PATCH 11/14] python3-pyopencl: Rebuild for OpenCL-SDK

---
 .../patches/CL_UNORM_INT24.patch              | 23 +++++++++++++++++++
 srcpkgs/python3-pyopencl/template             |  4 ++--
 2 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/python3-pyopencl/patches/CL_UNORM_INT24.patch

diff --git a/srcpkgs/python3-pyopencl/patches/CL_UNORM_INT24.patch b/srcpkgs/python3-pyopencl/patches/CL_UNORM_INT24.patch
new file mode 100644
index 0000000000000..a046e8246a083
--- /dev/null
+++ b/srcpkgs/python3-pyopencl/patches/CL_UNORM_INT24.patch
@@ -0,0 +1,23 @@
+From 21f336f2be73b784e6fa9410a0a8dab6050a1240 Mon Sep 17 00:00:00 2001
+From: Andreas Kloeckner <inform@tiker.net>
+Date: Wed, 18 Oct 2023 10:29:35 -0500
+Subject: [PATCH] Fix conditions for CL_UNORM_INT24 availability
+
+Closes gh-705
+---
+ src/wrap_constants.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/wrap_constants.cpp b/src/wrap_constants.cpp
+index 2c06f2f5e..d7a27b467 100644
+--- a/src/wrap_constants.cpp
++++ b/src/wrap_constants.cpp
+@@ -750,7 +750,7 @@ void pyopencl_expose_constants(py::module_ &m)
+     ADD_ATTR( , UNSIGNED_INT32);
+     ADD_ATTR( , HALF_FLOAT);
+     ADD_ATTR( , FLOAT);
+-#if PYOPENCL_CL_VERSION >= 0x1020
++#if PYOPENCL_CL_VERSION >= 0x1020 && defined(cl_khr_gl_sharing)
+     ADD_ATTR( , UNORM_INT24);
+ #endif
+ #if PYOPENCL_CL_VERSION >= 0x2010
diff --git a/srcpkgs/python3-pyopencl/template b/srcpkgs/python3-pyopencl/template
index 7f3ed48a8f6af..1e6baefe5102c 100644
--- a/srcpkgs/python3-pyopencl/template
+++ b/srcpkgs/python3-pyopencl/template
@@ -1,10 +1,10 @@
 # Template file for 'python3-pyopencl'
 pkgname=python3-pyopencl
 version=2023.1.4
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pybind11 python3-Cython python3-numpy"
-makedepends="OpenCL-Headers ocl-icd-devel python3-pybind11"
+makedepends="OpenCL-SDK python3-pybind11"
 depends="python3-numpy python3-pytools python3-platformdirs"
 short_desc="OpenCL bindings for Python 3"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 5ef87122e795b7d902c4143c7db1a80afe664682 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:54:17 -0500
Subject: [PATCH 12/14] qgis: Rebuild for OpenCL-SDK

---
 srcpkgs/qgis/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
index 6d6175b2427b5..9bc3697713871 100644
--- a/srcpkgs/qgis/template
+++ b/srcpkgs/qgis/template
@@ -1,7 +1,7 @@
 # Template file for 'qgis'
 pkgname=qgis
 version=3.34.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF -DWITH_3D=True -DWITH_PDAL=True
  -DGRASS_PREFIX8=${XBPS_CROSS_BASE}/usr/lib/grass"
@@ -9,7 +9,7 @@ hostmakedepends="bison flex pkg-config protobuf python3 python3-sip-PyQt5 sip"
 makedepends="exiv2-devel draco-devel expat-devel freexl-devel geos-devel
  gsl-devel grass-devel hdf5-devel libgdal-devel libpdal-devel librttopo-devel
  libspatialindex-devel libspatialite-devel libxml2-devel libzip-devel
- minizip-devel netcdf-devel ocl-icd-devel postgresql-libs-devel
+ minizip-devel netcdf-devel OpenCL-SDK postgresql-libs-devel
  proj-devel protobuf-devel python3-devel python3-PyQt-builder
  python3-PyQt5-devel python3-PyQt5-devel-tools python3-PyQt5-multimedia
  python3-pyqt5-qsci-devel python3-PyQt5-webkit python3-sip-PyQt5 qca-qt5-devel

From c5a5b580582f740e2a3f51838471d19a00f2f8a7 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:54:20 -0500
Subject: [PATCH 13/14] wine: Rebuild for OpenCL-SDK

---
 srcpkgs/wine/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 717260c94c4c4..8c7a59122b36c 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,7 +1,7 @@
 # Template file for 'wine'
 pkgname=wine
 version=8.21
-revision=1
+revision=2
 _pkgver=${version/r/-r}
 create_wrksrc=yes
 build_wrksrc=wine-${_pkgver}
@@ -48,7 +48,7 @@ makedepends="gettext-devel ncurses-devel glu-devel libSM-devel
  alsa-lib-devel libgphoto2-devel glib-devel
  freetype-devel pulseaudio-devel giflib-devel
  v4l-utils-devel fontconfig-devel gnutls-devel dbus-devel sane-devel
- libpcap-devel cups-devel ocl-icd-devel vulkan-loader gst-plugins-base1-devel
+ libpcap-devel cups-devel OpenCL-SDK vulkan-loader gst-plugins-base1-devel
  SDL2-devel"
 depends="libXi libXinerama libXcomposite libXcursor libOSMesa
  desktop-file-utils hicolor-icon-theme liberation-fonts-ttf

From c05955c29a92589c10d8971f2d6bc06fdc9dc75d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 17 Jan 2024 18:54:59 -0500
Subject: [PATCH 14/14] CPU-X: Rebuild for OpenCL-SDK

---
 srcpkgs/CPU-X/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/CPU-X/template b/srcpkgs/CPU-X/template
index 6c89acb658517..1efc2e4e548ce 100644
--- a/srcpkgs/CPU-X/template
+++ b/srcpkgs/CPU-X/template
@@ -1,12 +1,12 @@
 # Template file for 'CPU-X'
 pkgname=CPU-X
 version=4.5.3
-revision=1
+revision=2
 archs="x86_64* i686*"
 build_style=cmake
 hostmakedepends="pkg-config nasm"
 makedepends="ncurses-devel gettext-devel libcpuid-devel pciutils-devel
- glfw-devel ocl-icd-devel procps-ng-devel libstatgrab gtk+3-devel
+ glfw-devel OpenCL-SDK procps-ng-devel libstatgrab gtk+3-devel
  vulkan-loader Vulkan-Headers"
 #checkdepends="mawk nawk grep"
 short_desc="Free software that gathers information on CPU, motherboard and more"
@@ -17,7 +17,8 @@ changelog="https://github.com/TheTumultuousUnicornOfDarkness/CPU-X/blob/master/C
 distfiles="https://github.com/thetumultuousunicornofdarkness/CPU-X/archive/v${version}.tar.gz"
 checksum=aeef04fb5c2da85f8790ab74bd66e2e72c9595579d5f64d2d08f093ef69d81f9
 
-# xbps-src will still install checkdepends even if the template says `make_check=no`.
+make_check=no # See below
+# xbps-src will still install checkdepends even if the template says `make_check=no`. #xlint
 # And breaking the build environment on the CI is also bad, if CPU-X would be part
 # of revbumps due to shared libraries it would destroy the CI.
 # if [ "$XBPS_BUILD_ENVIRONMENT" != void-packages-ci ]; then

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: New package: OpenCL-SDK
  2024-01-17 23:59 [PR PATCH] New package: OpenCL-SDK Calandracas606
                   ` (4 preceding siblings ...)
  2024-01-18  3:56 ` Calandracas606
@ 2024-01-18  6:41 ` ahesford
  2024-01-18 12:32 ` [PR PATCH] [Closed]: " Calandracas606
                   ` (9 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: ahesford @ 2024-01-18  6:41 UTC (permalink / raw)
  To: ml

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/48261#issuecomment-1897892218

Comment:
Please tag maintainers when you propose to restructure their packages, especially if "restructure" means "kidnap".

What benefit accrues from the SDK as packaged? The major bits are available as standalone packages and could be built separately as independent packages. The SDK itself just makes for an awkward template and adds a utility library that doesn't seem to be used anywhere. It's usually desired to wait until some "end-user" application to be packaged for Void requires libraries (including header-only libraries) before packaging the libraries themselves, so CLHPP and the utility library could just as well wait until they are needed.

The ICD loader may have some value, but what is the argument for replacing the existing loader with this? Yes, it comes from Khronos, but yanking an existing package out from users and replacing it with another may not be the right choice.

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Closed]: New package: OpenCL-SDK
  2024-01-17 23:59 [PR PATCH] New package: OpenCL-SDK Calandracas606
                   ` (5 preceding siblings ...)
  2024-01-18  6:41 ` ahesford
@ 2024-01-18 12:32 ` Calandracas606
  2024-01-18 12:32 ` Calandracas606
                   ` (8 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Calandracas606 @ 2024-01-18 12:32 UTC (permalink / raw)
  To: ml

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

There's a closed pull request on the void-packages repository

New package: OpenCL-SDK
https://github.com/void-linux/void-packages/pull/48261

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-glibc
  - aarch64-musl (cross)
  - armv7l (cross)
  - armv6l-musl (cross)


^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: New package: OpenCL-SDK
  2024-01-17 23:59 [PR PATCH] New package: OpenCL-SDK Calandracas606
                   ` (6 preceding siblings ...)
  2024-01-18 12:32 ` [PR PATCH] [Closed]: " Calandracas606
@ 2024-01-18 12:32 ` Calandracas606
  2024-01-18 12:48 ` ahesford
                   ` (7 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Calandracas606 @ 2024-01-18 12:32 UTC (permalink / raw)
  To: ml

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

New comment by Calandracas606 on void-packages repository

https://github.com/void-linux/void-packages/pull/48261#issuecomment-1898394976

Comment:
> Please tag maintainers when you propose to restructure their packages, especially if "restructure" means "kidnap".

My apologies, I should have contacted you prior to submitting this PR

> What benefit accrues from the SDK as packaged? The major bits are available as standalone packages and could be built separately as independent packages. The SDK itself just makes for an awkward template and adds a utility library that doesn't seem to be used anywhere. It's usually desired to wait until some "end-user" application to be packaged for Void requires libraries (including header-only libraries) before packaging the libraries themselves, so CLHPP and the utility library could just as well wait until they are needed.

You're right, it isn't currently needed by any packages. Existing void packages only use OpenCL-Headers, so CLHPP and utility libraries are only useful as a development tool.

> The ICD loader may have some value, but what is the argument for replacing the existing loader with this? Yes, it comes from Khronos, but yanking an existing package out from users and replacing it with another may not be the right choice.

 There is nothing wrong with the existing ICD loader. I only changed it because this one comes from Khronos


Closing because It is clear that this PR is overzealous, and isn't currently a good fit for inclusion in void.

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: New package: OpenCL-SDK
  2024-01-17 23:59 [PR PATCH] New package: OpenCL-SDK Calandracas606
                   ` (7 preceding siblings ...)
  2024-01-18 12:32 ` Calandracas606
@ 2024-01-18 12:48 ` ahesford
  2024-01-18 12:48 ` ahesford
                   ` (6 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: ahesford @ 2024-01-18 12:48 UTC (permalink / raw)
  To: ml

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/48261#issuecomment-1898418994

Comment:
I wouldn't go that far. The Khronos ICD loader might be superior to ocl-icd (or at least a desirable alternative and we might still want to package it, but we should consider consider whether 1) if ocl-icd will live on in its own right, 2) if so, whether we want to continue support it, and 3) if so, whether we should move all of its dependents to the new option at this point.

If we offer both ICD loaders, they would either need to conflict or present alternatives. If they conflict, we should build all of our packages with whatever the preferred loader is (otherwise, some combination of consumers would be uninstallable). If they offer alternatives, we will need to alter build process.

As for the utilities offered by the SDK repo, my preference for ease of packaging would be to convince upstream to allow building of the extras against "system" versions of its git submodules, allowing us to build the SDK as an add-on. Submodules are kind of a pain in xbps-src, and hard-requiring them as most of the substance of a project seems like strange project management.

If upstream is recalcitrant but we still find a need or desire for the SDK utilities, then I suppose we bite the bullet and subsume the headers and ICD loader into one template as you've proposed.

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: New package: OpenCL-SDK
  2024-01-17 23:59 [PR PATCH] New package: OpenCL-SDK Calandracas606
                   ` (8 preceding siblings ...)
  2024-01-18 12:48 ` ahesford
@ 2024-01-18 12:48 ` ahesford
  2024-01-18 13:41 ` Calandracas606
                   ` (5 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: ahesford @ 2024-01-18 12:48 UTC (permalink / raw)
  To: ml

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/48261#issuecomment-1898418994

Comment:
I wouldn't go that far.

The Khronos ICD loader might be superior to ocl-icd (or at least a desirable alternative and we might still want to package it, but we should consider consider whether 1) if ocl-icd will live on in its own right, 2) if so, whether we want to continue support it, and 3) if so, whether we should move all of its dependents to the new option at this point.

If we offer both ICD loaders, they would either need to conflict or present alternatives. If they conflict, we should build all of our packages with whatever the preferred loader is (otherwise, some combination of consumers would be uninstallable). If they offer alternatives, we will need to alter build process.

As for the utilities offered by the SDK repo, my preference for ease of packaging would be to convince upstream to allow building of the extras against "system" versions of its git submodules, allowing us to build the SDK as an add-on. Submodules are kind of a pain in xbps-src, and hard-requiring them as most of the substance of a project seems like strange project management.

If upstream is recalcitrant but we still find a need or desire for the SDK utilities, then I suppose we bite the bullet and subsume the headers and ICD loader into one template as you've proposed.

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: New package: OpenCL-SDK
  2024-01-17 23:59 [PR PATCH] New package: OpenCL-SDK Calandracas606
                   ` (9 preceding siblings ...)
  2024-01-18 12:48 ` ahesford
@ 2024-01-18 13:41 ` Calandracas606
  2024-01-18 15:09 ` [PR PATCH] [Updated] " Calandracas606
                   ` (4 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Calandracas606 @ 2024-01-18 13:41 UTC (permalink / raw)
  To: ml

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

New comment by Calandracas606 on void-packages repository

https://github.com/void-linux/void-packages/pull/48261#issuecomment-1898503074

Comment:
Reopening to allow to further discussion. 

I'll update this PR later to address some of the concerns with the build system. A quick glance suggests it should be straightforwards to patch CMakelists to use system libraries, even with a vsed

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Updated] New package: OpenCL-SDK
  2024-01-17 23:59 [PR PATCH] New package: OpenCL-SDK Calandracas606
                   ` (10 preceding siblings ...)
  2024-01-18 13:41 ` Calandracas606
@ 2024-01-18 15:09 ` Calandracas606
  2024-01-18 15:17 ` Calandracas606
                   ` (3 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Calandracas606 @ 2024-01-18 15:09 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Calandracas606/void-packages OpenCL-SDK
https://github.com/void-linux/void-packages/pull/48261

New package: OpenCL-SDK
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-glibc
  - aarch64-musl (cross)
  - armv7l (cross)
  - armv6l-musl (cross)

[ci skip]


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

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

From f3d5db849a5174e83246d5094c34f6ae1bbfee01 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Thu, 18 Jan 2024 10:03:57 -0500
Subject: [PATCH 1/3] New package: OpenCL-ICD-Loader-2023.12.14

---
 common/shlibs                      |  2 +-
 srcpkgs/OpenCL-ICD-Loader-devel    |  1 +
 srcpkgs/OpenCL-ICD-Loader/template | 33 +++++++++++++++++++++++++++
 srcpkgs/ocl-icd                    |  1 +
 srcpkgs/ocl-icd-devel              |  2 +-
 srcpkgs/ocl-icd/template           | 36 ------------------------------
 6 files changed, 37 insertions(+), 38 deletions(-)
 create mode 120000 srcpkgs/OpenCL-ICD-Loader-devel
 create mode 100644 srcpkgs/OpenCL-ICD-Loader/template
 create mode 120000 srcpkgs/ocl-icd
 delete mode 100644 srcpkgs/ocl-icd/template

diff --git a/common/shlibs b/common/shlibs
index 9e6d29c73341e..241be3e11ac29 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3469,7 +3469,7 @@ libtepl-6.so.2 tepl-6.4.0_1
 libnomacsCore.so.3 nomacs-3.10.2_4
 libaudit.so.1 libaudit-2.8.4_1
 libauparse.so.0 libauparse-2.8.4_1
-libOpenCL.so.1 ocl-icd-2.2.12_1
+libOpenCL.so.1 OpenCL-ICD-Loader-2023.12.14_1
 liburiparser.so.1 uriparser-0.8.6_1
 libcpptest.so.1 cpptest-2.0.0_1
 libhandy-0.0.so.0 libhandy-0.0.3_1
diff --git a/srcpkgs/OpenCL-ICD-Loader-devel b/srcpkgs/OpenCL-ICD-Loader-devel
new file mode 120000
index 0000000000000..ccd0f91d6e804
--- /dev/null
+++ b/srcpkgs/OpenCL-ICD-Loader-devel
@@ -0,0 +1 @@
+OpenCL-ICD-Loader
\ No newline at end of file
diff --git a/srcpkgs/OpenCL-ICD-Loader/template b/srcpkgs/OpenCL-ICD-Loader/template
new file mode 100644
index 0000000000000..1ec3a60a23344
--- /dev/null
+++ b/srcpkgs/OpenCL-ICD-Loader/template
@@ -0,0 +1,33 @@
+# Template file for 'OpenCL-ICD-Loader'
+pkgname=OpenCL-ICD-Loader
+version=2023.12.14
+revision=1
+build_style=cmake
+makedepends="OpenCL-Headers"
+short_desc="Khronos OpenCL ICD Loader"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="Apache-2.0"
+homepage="https://github.com/KhronosGroup/OpenCL-ICD-Loader"
+distfiles="https://github.com/KhronosGroup/OpenCL-ICD-Loader/archive/refs/tags/v${version}.tar.gz"
+checksum=af8df96f1e1030329e8d4892ba3aa761b923838d4c689ef52d97822ab0bd8917
+
+ocl-icd-devel_package() {
+	build_style=meta
+	depends="OpenCL-ICD-Loader-devel>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+}
+
+ocl-icd_package() {
+	build_style=meta
+	depends="OpenCL-ICD-Loader>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+}
+
+OpenCL-ICD-Loader-devel_package() {
+	depends="OpenCL-ICD-Loader-${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/lib/pkgconfig/OpenCL.pc
+		vmove usr/share/cmake/OpenCLICDLoader
+	}
+}
diff --git a/srcpkgs/ocl-icd b/srcpkgs/ocl-icd
new file mode 120000
index 0000000000000..ccd0f91d6e804
--- /dev/null
+++ b/srcpkgs/ocl-icd
@@ -0,0 +1 @@
+OpenCL-ICD-Loader
\ No newline at end of file
diff --git a/srcpkgs/ocl-icd-devel b/srcpkgs/ocl-icd-devel
index bcd9e7f625181..ccd0f91d6e804 120000
--- a/srcpkgs/ocl-icd-devel
+++ b/srcpkgs/ocl-icd-devel
@@ -1 +1 @@
-ocl-icd
\ No newline at end of file
+OpenCL-ICD-Loader
\ No newline at end of file
diff --git a/srcpkgs/ocl-icd/template b/srcpkgs/ocl-icd/template
deleted file mode 100644
index ab3e07a9f762b..0000000000000
--- a/srcpkgs/ocl-icd/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'ocl-icd'
-pkgname=ocl-icd
-version=2.3.2
-revision=2
-build_style=gnu-configure
-hostmakedepends="ruby xmlto asciidoc automake libtool"
-makedepends="OpenCL-Headers"
-short_desc="Generic OpenCL ICD loader/demultiplexer"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-2-Clause"
-homepage="https://github.com/OCL-dev/ocl-icd"
-distfiles="https://github.com/OCL-dev/${pkgname}/archive/v${version}.tar.gz"
-checksum=ec47d7dcd961ea06695b067e8b7edb82e420ddce03e0081a908c62fd0b8535c5
-
-provides="libOpenCL-1.2_1"
-replaces="libOpenCL>=0"
-
-CFLAGS="-fcommon"
-
-pre_configure() {
-	./bootstrap
-}
-
-post_install() {
-	vlicense COPYING
-}
-
-ocl-icd-devel_package() {
-	depends="OpenCL-Headers ${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/share/doc
-	}
-}

From 9f104c82f8d66b2ffb804e4c7c348779b0bb01eb Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Thu, 18 Jan 2024 10:06:38 -0500
Subject: [PATCH 2/3] New package: OpenCL-CLHPP-2023.12.14

---
 srcpkgs/OpenCL-CLHPP/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/OpenCL-CLHPP/template

diff --git a/srcpkgs/OpenCL-CLHPP/template b/srcpkgs/OpenCL-CLHPP/template
new file mode 100644
index 0000000000000..b2fe70a57637c
--- /dev/null
+++ b/srcpkgs/OpenCL-CLHPP/template
@@ -0,0 +1,17 @@
+# Template file for 'OpenCL-CLHPP'
+pkgname=OpenCL-CLHPP
+version=2023.12.14
+revision=1
+build_style=cmake
+configure_args="
+	-DBUILD_EXAMPLES=OFF
+	-DBUILD_TESTING=OFF
+"
+makedepends="OpenCL-Headers OpenCL-ICD-Loader-devel"
+depends="OpenCL-Headers"
+short_desc="OpenCL API C++ bindings"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="Apache-2.0"
+homepage="https://github.com/KhronosGroup/OpenCL-CLHPP"
+distfiles="https://github.com/KhronosGroup/OpenCL-CLHPP/archive/refs/tags/v${version}.tar.gz"
+checksum="9106700634e79cfa0935ebd67197f64689ced24c42da702acf18fa8435bd8a82"

From 5ef95f71264241f0420aa72366cd6e5d65099527 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Thu, 18 Jan 2024 10:07:17 -0500
Subject: [PATCH 3/3] New package: OpenCL-SDK-2023.12.14

---
 srcpkgs/OpenCL-SDK/patches/submodules.patch | 17 +++++++++++++++++
 srcpkgs/OpenCL-SDK/template                 | 21 +++++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 srcpkgs/OpenCL-SDK/patches/submodules.patch
 create mode 100644 srcpkgs/OpenCL-SDK/template

diff --git a/srcpkgs/OpenCL-SDK/patches/submodules.patch b/srcpkgs/OpenCL-SDK/patches/submodules.patch
new file mode 100644
index 0000000000000..35c6bacf518e1
--- /dev/null
+++ b/srcpkgs/OpenCL-SDK/patches/submodules.patch
@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 333b529..aa508e5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -39,9 +39,9 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+     set(CMAKE_INSTALL_PREFIX "${PROJECT_SOURCE_DIR}/install" CACHE PATH "Install Path" FORCE)
+ endif()
+ 
+-add_subdirectory(external/OpenCL-Headers)
+-add_subdirectory(external/OpenCL-ICD-Loader)
+-add_subdirectory(external/OpenCL-CLHPP)
++find_package (OpenCLHeaders REQUIRED)
++find_package (OpenCL REQUIRED)
++find_package (OpenCLHeadersCpp REQUIRED)
+ 
+ list(APPEND CMAKE_MODULE_PATH
+   ${PROJECT_SOURCE_DIR}/cmake
diff --git a/srcpkgs/OpenCL-SDK/template b/srcpkgs/OpenCL-SDK/template
new file mode 100644
index 0000000000000..5b176bbdcbebe
--- /dev/null
+++ b/srcpkgs/OpenCL-SDK/template
@@ -0,0 +1,21 @@
+# Template file for 'OpenCL-SDK'
+pkgname=OpenCL-SDK
+version=2023.12.14
+revision=1
+#build_wrksrc=OpenCL-SDK-${version}
+build_style=cmake
+configure_args="
+	-DOPENCL_SDK_BUILD_SAMPLES=OFF
+	-DOPENCL_SDK_BUILD_OPENGL_SAMPLES=OFF
+	-DOPENCL_SDK_TEST_SAMPLES=OFF
+	-DOPENCL_SDK_BUILD_TESTS=OFF
+"
+hostmakedepends="git"
+makedepends="OpenCL-Headers OpenCL-ICD-Loader-devel OpenCL-CLHPP"
+depends="${makedepends}"
+short_desc="OpenCL SDK"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="Apache-2.0"
+homepage="https://github.com/KhronosGroup/OpenCL-SDK"
+distfiles="https://github.com/KhronosGroup/OpenCL-SDK/archive/refs/tags/v${version}.tar.gz"
+checksum="9d70ec09aa5d811e6b345ce27fed20fbe0d826ce944b1eaa01af4c3f822adf7b"

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: New package: OpenCL-SDK
  2024-01-17 23:59 [PR PATCH] New package: OpenCL-SDK Calandracas606
                   ` (11 preceding siblings ...)
  2024-01-18 15:09 ` [PR PATCH] [Updated] " Calandracas606
@ 2024-01-18 15:17 ` Calandracas606
  2024-01-18 15:41 ` [PR PATCH] [Updated] " Calandracas606
                   ` (2 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Calandracas606 @ 2024-01-18 15:17 UTC (permalink / raw)
  To: ml

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

New comment by Calandracas606 on void-packages repository

https://github.com/void-linux/void-packages/pull/48261#issuecomment-1898677967

Comment:
I've restructured the packages into separate templates. This required a small patch for OpenCL-SDK to use the system dependencies rather than the submodules.

I will need to work on a more thorough patch if I am to submit upstream

The question remains, what to do with ocl-icd? My assumption is that it predates the Khronos OpenCL ICD Loader

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Updated] New package: OpenCL-SDK
  2024-01-17 23:59 [PR PATCH] New package: OpenCL-SDK Calandracas606
                   ` (12 preceding siblings ...)
  2024-01-18 15:17 ` Calandracas606
@ 2024-01-18 15:41 ` Calandracas606
  2024-02-13 23:28 ` Calandracas606
  2024-02-13 23:28 ` [PR PATCH] [Closed]: " Calandracas606
  15 siblings, 0 replies; 17+ messages in thread
From: Calandracas606 @ 2024-01-18 15:41 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Calandracas606/void-packages OpenCL-SDK
https://github.com/void-linux/void-packages/pull/48261

New package: OpenCL-SDK
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-glibc
  - aarch64-musl (cross)
  - armv7l (cross)
  - armv6l-musl (cross)
 

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

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

From f3d5db849a5174e83246d5094c34f6ae1bbfee01 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Thu, 18 Jan 2024 10:03:57 -0500
Subject: [PATCH 1/3] New package: OpenCL-ICD-Loader-2023.12.14

---
 common/shlibs                      |  2 +-
 srcpkgs/OpenCL-ICD-Loader-devel    |  1 +
 srcpkgs/OpenCL-ICD-Loader/template | 33 +++++++++++++++++++++++++++
 srcpkgs/ocl-icd                    |  1 +
 srcpkgs/ocl-icd-devel              |  2 +-
 srcpkgs/ocl-icd/template           | 36 ------------------------------
 6 files changed, 37 insertions(+), 38 deletions(-)
 create mode 120000 srcpkgs/OpenCL-ICD-Loader-devel
 create mode 100644 srcpkgs/OpenCL-ICD-Loader/template
 create mode 120000 srcpkgs/ocl-icd
 delete mode 100644 srcpkgs/ocl-icd/template

diff --git a/common/shlibs b/common/shlibs
index 9e6d29c73341e..241be3e11ac29 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3469,7 +3469,7 @@ libtepl-6.so.2 tepl-6.4.0_1
 libnomacsCore.so.3 nomacs-3.10.2_4
 libaudit.so.1 libaudit-2.8.4_1
 libauparse.so.0 libauparse-2.8.4_1
-libOpenCL.so.1 ocl-icd-2.2.12_1
+libOpenCL.so.1 OpenCL-ICD-Loader-2023.12.14_1
 liburiparser.so.1 uriparser-0.8.6_1
 libcpptest.so.1 cpptest-2.0.0_1
 libhandy-0.0.so.0 libhandy-0.0.3_1
diff --git a/srcpkgs/OpenCL-ICD-Loader-devel b/srcpkgs/OpenCL-ICD-Loader-devel
new file mode 120000
index 0000000000000..ccd0f91d6e804
--- /dev/null
+++ b/srcpkgs/OpenCL-ICD-Loader-devel
@@ -0,0 +1 @@
+OpenCL-ICD-Loader
\ No newline at end of file
diff --git a/srcpkgs/OpenCL-ICD-Loader/template b/srcpkgs/OpenCL-ICD-Loader/template
new file mode 100644
index 0000000000000..1ec3a60a23344
--- /dev/null
+++ b/srcpkgs/OpenCL-ICD-Loader/template
@@ -0,0 +1,33 @@
+# Template file for 'OpenCL-ICD-Loader'
+pkgname=OpenCL-ICD-Loader
+version=2023.12.14
+revision=1
+build_style=cmake
+makedepends="OpenCL-Headers"
+short_desc="Khronos OpenCL ICD Loader"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="Apache-2.0"
+homepage="https://github.com/KhronosGroup/OpenCL-ICD-Loader"
+distfiles="https://github.com/KhronosGroup/OpenCL-ICD-Loader/archive/refs/tags/v${version}.tar.gz"
+checksum=af8df96f1e1030329e8d4892ba3aa761b923838d4c689ef52d97822ab0bd8917
+
+ocl-icd-devel_package() {
+	build_style=meta
+	depends="OpenCL-ICD-Loader-devel>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+}
+
+ocl-icd_package() {
+	build_style=meta
+	depends="OpenCL-ICD-Loader>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+}
+
+OpenCL-ICD-Loader-devel_package() {
+	depends="OpenCL-ICD-Loader-${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/lib/pkgconfig/OpenCL.pc
+		vmove usr/share/cmake/OpenCLICDLoader
+	}
+}
diff --git a/srcpkgs/ocl-icd b/srcpkgs/ocl-icd
new file mode 120000
index 0000000000000..ccd0f91d6e804
--- /dev/null
+++ b/srcpkgs/ocl-icd
@@ -0,0 +1 @@
+OpenCL-ICD-Loader
\ No newline at end of file
diff --git a/srcpkgs/ocl-icd-devel b/srcpkgs/ocl-icd-devel
index bcd9e7f625181..ccd0f91d6e804 120000
--- a/srcpkgs/ocl-icd-devel
+++ b/srcpkgs/ocl-icd-devel
@@ -1 +1 @@
-ocl-icd
\ No newline at end of file
+OpenCL-ICD-Loader
\ No newline at end of file
diff --git a/srcpkgs/ocl-icd/template b/srcpkgs/ocl-icd/template
deleted file mode 100644
index ab3e07a9f762b..0000000000000
--- a/srcpkgs/ocl-icd/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'ocl-icd'
-pkgname=ocl-icd
-version=2.3.2
-revision=2
-build_style=gnu-configure
-hostmakedepends="ruby xmlto asciidoc automake libtool"
-makedepends="OpenCL-Headers"
-short_desc="Generic OpenCL ICD loader/demultiplexer"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-2-Clause"
-homepage="https://github.com/OCL-dev/ocl-icd"
-distfiles="https://github.com/OCL-dev/${pkgname}/archive/v${version}.tar.gz"
-checksum=ec47d7dcd961ea06695b067e8b7edb82e420ddce03e0081a908c62fd0b8535c5
-
-provides="libOpenCL-1.2_1"
-replaces="libOpenCL>=0"
-
-CFLAGS="-fcommon"
-
-pre_configure() {
-	./bootstrap
-}
-
-post_install() {
-	vlicense COPYING
-}
-
-ocl-icd-devel_package() {
-	depends="OpenCL-Headers ${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/share/doc
-	}
-}

From 9f104c82f8d66b2ffb804e4c7c348779b0bb01eb Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Thu, 18 Jan 2024 10:06:38 -0500
Subject: [PATCH 2/3] New package: OpenCL-CLHPP-2023.12.14

---
 srcpkgs/OpenCL-CLHPP/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/OpenCL-CLHPP/template

diff --git a/srcpkgs/OpenCL-CLHPP/template b/srcpkgs/OpenCL-CLHPP/template
new file mode 100644
index 0000000000000..b2fe70a57637c
--- /dev/null
+++ b/srcpkgs/OpenCL-CLHPP/template
@@ -0,0 +1,17 @@
+# Template file for 'OpenCL-CLHPP'
+pkgname=OpenCL-CLHPP
+version=2023.12.14
+revision=1
+build_style=cmake
+configure_args="
+	-DBUILD_EXAMPLES=OFF
+	-DBUILD_TESTING=OFF
+"
+makedepends="OpenCL-Headers OpenCL-ICD-Loader-devel"
+depends="OpenCL-Headers"
+short_desc="OpenCL API C++ bindings"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="Apache-2.0"
+homepage="https://github.com/KhronosGroup/OpenCL-CLHPP"
+distfiles="https://github.com/KhronosGroup/OpenCL-CLHPP/archive/refs/tags/v${version}.tar.gz"
+checksum="9106700634e79cfa0935ebd67197f64689ced24c42da702acf18fa8435bd8a82"

From 7436aecab55b362c06d63705fff435daa96b3ff7 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Thu, 18 Jan 2024 10:07:17 -0500
Subject: [PATCH 3/3] New package: OpenCL-SDK-2023.12.14

---
 srcpkgs/OpenCL-SDK/patches/submodules.patch | 17 +++++++++++++++++
 srcpkgs/OpenCL-SDK/template                 | 21 +++++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 srcpkgs/OpenCL-SDK/patches/submodules.patch
 create mode 100644 srcpkgs/OpenCL-SDK/template

diff --git a/srcpkgs/OpenCL-SDK/patches/submodules.patch b/srcpkgs/OpenCL-SDK/patches/submodules.patch
new file mode 100644
index 0000000000000..35c6bacf518e1
--- /dev/null
+++ b/srcpkgs/OpenCL-SDK/patches/submodules.patch
@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 333b529..aa508e5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -39,9 +39,9 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+     set(CMAKE_INSTALL_PREFIX "${PROJECT_SOURCE_DIR}/install" CACHE PATH "Install Path" FORCE)
+ endif()
+ 
+-add_subdirectory(external/OpenCL-Headers)
+-add_subdirectory(external/OpenCL-ICD-Loader)
+-add_subdirectory(external/OpenCL-CLHPP)
++find_package (OpenCLHeaders REQUIRED)
++find_package (OpenCL REQUIRED)
++find_package (OpenCLHeadersCpp REQUIRED)
+ 
+ list(APPEND CMAKE_MODULE_PATH
+   ${PROJECT_SOURCE_DIR}/cmake
diff --git a/srcpkgs/OpenCL-SDK/template b/srcpkgs/OpenCL-SDK/template
new file mode 100644
index 0000000000000..5b176bbdcbebe
--- /dev/null
+++ b/srcpkgs/OpenCL-SDK/template
@@ -0,0 +1,21 @@
+# Template file for 'OpenCL-SDK'
+pkgname=OpenCL-SDK
+version=2023.12.14
+revision=1
+#build_wrksrc=OpenCL-SDK-${version}
+build_style=cmake
+configure_args="
+	-DOPENCL_SDK_BUILD_SAMPLES=OFF
+	-DOPENCL_SDK_BUILD_OPENGL_SAMPLES=OFF
+	-DOPENCL_SDK_TEST_SAMPLES=OFF
+	-DOPENCL_SDK_BUILD_TESTS=OFF
+"
+hostmakedepends="git"
+makedepends="OpenCL-Headers OpenCL-ICD-Loader-devel OpenCL-CLHPP"
+depends="${makedepends}"
+short_desc="OpenCL SDK"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="Apache-2.0"
+homepage="https://github.com/KhronosGroup/OpenCL-SDK"
+distfiles="https://github.com/KhronosGroup/OpenCL-SDK/archive/refs/tags/v${version}.tar.gz"
+checksum="9d70ec09aa5d811e6b345ce27fed20fbe0d826ce944b1eaa01af4c3f822adf7b"

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Closed]: New package: OpenCL-SDK
  2024-01-17 23:59 [PR PATCH] New package: OpenCL-SDK Calandracas606
                   ` (14 preceding siblings ...)
  2024-02-13 23:28 ` Calandracas606
@ 2024-02-13 23:28 ` Calandracas606
  15 siblings, 0 replies; 17+ messages in thread
From: Calandracas606 @ 2024-02-13 23:28 UTC (permalink / raw)
  To: ml

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

There's a closed pull request on the void-packages repository

New package: OpenCL-SDK
https://github.com/void-linux/void-packages/pull/48261

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-glibc
  - aarch64-musl (cross)
  - armv7l (cross)
  - armv6l-musl (cross)
 

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: New package: OpenCL-SDK
  2024-01-17 23:59 [PR PATCH] New package: OpenCL-SDK Calandracas606
                   ` (13 preceding siblings ...)
  2024-01-18 15:41 ` [PR PATCH] [Updated] " Calandracas606
@ 2024-02-13 23:28 ` Calandracas606
  2024-02-13 23:28 ` [PR PATCH] [Closed]: " Calandracas606
  15 siblings, 0 replies; 17+ messages in thread
From: Calandracas606 @ 2024-02-13 23:28 UTC (permalink / raw)
  To: ml

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

New comment by Calandracas606 on void-packages repository

https://github.com/void-linux/void-packages/pull/48261#issuecomment-1942848127

Comment:
Closing in favor of just adding OpenCL-CLHPP https://github.com/void-linux/void-packages/pull/48710

^ permalink raw reply	[flat|nested] 17+ messages in thread

end of thread, other threads:[~2024-02-13 23:28 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-01-17 23:59 [PR PATCH] New package: OpenCL-SDK Calandracas606
2024-01-18  0:50 ` Calandracas606
2024-01-18  0:59 ` [PR PATCH] [Updated] " Calandracas606
2024-01-18  1:00 ` Calandracas606
2024-01-18  1:07 ` [PR PATCH] [Updated] " Calandracas606
2024-01-18  3:56 ` Calandracas606
2024-01-18  6:41 ` ahesford
2024-01-18 12:32 ` [PR PATCH] [Closed]: " Calandracas606
2024-01-18 12:32 ` Calandracas606
2024-01-18 12:48 ` ahesford
2024-01-18 12:48 ` ahesford
2024-01-18 13:41 ` Calandracas606
2024-01-18 15:09 ` [PR PATCH] [Updated] " Calandracas606
2024-01-18 15:17 ` Calandracas606
2024-01-18 15:41 ` [PR PATCH] [Updated] " Calandracas606
2024-02-13 23:28 ` Calandracas606
2024-02-13 23:28 ` [PR PATCH] [Closed]: " Calandracas606

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).