[PR PATCH] opencl2-headers update, opencl-headers removal

[PR PATCH] opencl2-headers update, opencl-headers removal

[ahesford]

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

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

https://github.com/ahesford/void-packages opencl
https://github.com/void-linux/void-packages/pull/21094

opencl2-headers update, opencl-headers removal
The `opencl-headers` package and `opencl2-headers` packages were both four years old. Also, `opencl2-headers` can be loaded in compatibility mode by defining a compiler macro prior to include. There is no need to maintain both packages.

This bumps the `opencl2-headers` package to a recent release version, replaces `opencl-headers` with a meta-package marking its removal, and updates the dependents of `opencl-headers` to use the new `opencl2-headers` package. There are no compilation problems.

As a bonus, I noticed that `libgdal` pulled in the headers, but did not pull in `ocl-icd-devel` to actually build with OpenCL support. This is now fixed.

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

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

From c89ec3b24ef18545953ab4be4cf5637532a0858e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 14 Apr 2020 08:15:27 -0400
Subject: [PATCH 1/5] opencl2-headers: update to 2.2.20200313.

---
 .../patches/altivec-vector.patch              | 36 -------------------
 srcpkgs/opencl2-headers/template              | 25 +++++++------
 2 files changed, 12 insertions(+), 49 deletions(-)
 delete mode 100644 srcpkgs/opencl2-headers/patches/altivec-vector.patch

diff --git a/srcpkgs/opencl2-headers/patches/altivec-vector.patch b/srcpkgs/opencl2-headers/patches/altivec-vector.patch
deleted file mode 100644
index 95f53ad5d5e..00000000000
--- a/srcpkgs/opencl2-headers/patches/altivec-vector.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 1da98fd0ced4cb50f859725d5a8dc5e2633f9343 Mon Sep 17 00:00:00 2001
-From: James Price <j.price@bristol.ac.uk>
-Date: Wed, 12 Dec 2018 19:59:32 +0000
-Subject: [PATCH] Use __vector instead of vector to fix altivec builds
-
-Patch taken from Debian khronos-opencl-headers package:
-https://sources.debian.org/patches/khronos-opencl-headers/1.2-svn26009-1/use__vector.patch/
----
- CL/cl_platform.h | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/CL/cl_platform.h b/CL/cl_platform.h
-index 0c817dd..184db25 100644
---- cl_platform.h
-+++ cl_platform.h
-@@ -401,13 +401,13 @@ typedef unsigned int cl_GLenum;
- /* Define basic vector types */
- #if defined( __VEC__ )
-    #include <altivec.h>   /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */
--   typedef vector unsigned char     __cl_uchar16;
--   typedef vector signed char       __cl_char16;
--   typedef vector unsigned short    __cl_ushort8;
--   typedef vector signed short      __cl_short8;
--   typedef vector unsigned int      __cl_uint4;
--   typedef vector signed int        __cl_int4;
--   typedef vector float             __cl_float4;
-+   typedef __vector unsigned char     __cl_uchar16;
-+   typedef __vector signed char       __cl_char16;
-+   typedef __vector unsigned short    __cl_ushort8;
-+   typedef __vector signed short      __cl_short8;
-+   typedef __vector unsigned int      __cl_uint4;
-+   typedef __vector signed int        __cl_int4;
-+   typedef __vector float             __cl_float4;
-    #define  __CL_UCHAR16__  1
-    #define  __CL_CHAR16__   1
-    #define  __CL_USHORT8__  1
diff --git a/srcpkgs/opencl2-headers/template b/srcpkgs/opencl2-headers/template
index 9dc8f7a9456..e345e9862f0 100644
--- a/srcpkgs/opencl2-headers/template
+++ b/srcpkgs/opencl2-headers/template
@@ -1,22 +1,21 @@
 # Template file for 'opencl2-headers'
 pkgname=opencl2-headers
-_openclver=2.0
-_distver=20160105
-_githash=ad68ab31a430c033868574fb49c769ac09d6b6d8
-version="${_openclver}.${_distver}"
-revision=2
+_openclver=2.2
+_distver=2020.03.13
+version="${_openclver}.20200313"
+revision=1
 archs=noarch
-wrksrc="OpenCL-Headers-${_githash}"
-short_desc="OpenCL 2.0 (Open Computing Language) header files"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="http://www.khronos.org/registry/cl/"
+wrksrc="OpenCL-Headers-${_distver}"
+short_desc="OpenCL 2.2 (Open Computing Language) header files"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="Apache-2.0"
+homepage="https://github.com/KhronosGroup/OpenCL-Headers"
+distfiles="${homepage}/archive/v${_distver}.tar.gz"
+checksum=664bbe587e5a0a00aac267f645b7c413586e7bc56dca9ff3b00037050d06f476
 provides="opencl-headers-${version}_${revision}"
 replaces="opencl-headers>=0"
-distfiles="https://github.com/KhronosGroup/OpenCL-Headers/archive/${_githash}.tar.gz"
-checksum=841b33da523ed095cc95cbf1de081e798636c037b45e9f57541e49911f13e85f
 
 do_install() {
 	vmkdir usr/include/CL
-	install -m644 *.h ${DESTDIR}/usr/include/CL
+	install -m644 CL/*.h ${DESTDIR}/usr/include/CL
 }

From e7a66fb34a68326be1b6cc633e20e3ee07550e22 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 14 Apr 2020 08:16:22 -0400
Subject: [PATCH 2/5] opencl-headers: remove package (obsolete)

---
 srcpkgs/opencl-headers/INSTALL.msg            |  1 +
 .../patches/altivec-vector.patch              | 36 -------------------
 srcpkgs/opencl-headers/template               | 15 ++------
 3 files changed, 4 insertions(+), 48 deletions(-)
 create mode 100644 srcpkgs/opencl-headers/INSTALL.msg
 delete mode 100644 srcpkgs/opencl-headers/patches/altivec-vector.patch

diff --git a/srcpkgs/opencl-headers/INSTALL.msg b/srcpkgs/opencl-headers/INSTALL.msg
new file mode 100644
index 00000000000..92bb4e71919
--- /dev/null
+++ b/srcpkgs/opencl-headers/INSTALL.msg
@@ -0,0 +1 @@
+opencl-headers is superseded by opencl2-headers
diff --git a/srcpkgs/opencl-headers/patches/altivec-vector.patch b/srcpkgs/opencl-headers/patches/altivec-vector.patch
deleted file mode 100644
index 95f53ad5d5e..00000000000
--- a/srcpkgs/opencl-headers/patches/altivec-vector.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 1da98fd0ced4cb50f859725d5a8dc5e2633f9343 Mon Sep 17 00:00:00 2001
-From: James Price <j.price@bristol.ac.uk>
-Date: Wed, 12 Dec 2018 19:59:32 +0000
-Subject: [PATCH] Use __vector instead of vector to fix altivec builds
-
-Patch taken from Debian khronos-opencl-headers package:
-https://sources.debian.org/patches/khronos-opencl-headers/1.2-svn26009-1/use__vector.patch/
----
- CL/cl_platform.h | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/CL/cl_platform.h b/CL/cl_platform.h
-index 0c817dd..184db25 100644
---- cl_platform.h
-+++ cl_platform.h
-@@ -401,13 +401,13 @@ typedef unsigned int cl_GLenum;
- /* Define basic vector types */
- #if defined( __VEC__ )
-    #include <altivec.h>   /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */
--   typedef vector unsigned char     __cl_uchar16;
--   typedef vector signed char       __cl_char16;
--   typedef vector unsigned short    __cl_ushort8;
--   typedef vector signed short      __cl_short8;
--   typedef vector unsigned int      __cl_uint4;
--   typedef vector signed int        __cl_int4;
--   typedef vector float             __cl_float4;
-+   typedef __vector unsigned char     __cl_uchar16;
-+   typedef __vector signed char       __cl_char16;
-+   typedef __vector unsigned short    __cl_ushort8;
-+   typedef __vector signed short      __cl_short8;
-+   typedef __vector unsigned int      __cl_uint4;
-+   typedef __vector signed int        __cl_int4;
-+   typedef __vector float             __cl_float4;
-    #define  __CL_UCHAR16__  1
-    #define  __CL_CHAR16__   1
-    #define  __CL_USHORT8__  1
diff --git a/srcpkgs/opencl-headers/template b/srcpkgs/opencl-headers/template
index 517b721dcd5..140403bd1c4 100644
--- a/srcpkgs/opencl-headers/template
+++ b/srcpkgs/opencl-headers/template
@@ -2,20 +2,11 @@
 pkgname=opencl-headers
 _openclver=1.2
 _distver=20160105
-_githash=47be6196cb09f2718990f9537ac69fc5ec43aed5
 version="${_openclver}.${_distver}"
-revision=2
+revision=3
 archs=noarch
-wrksrc="OpenCL-Headers-${_githash}"
-short_desc="OpenCL (Open Computing Language) header files"
+build_style=meta
+short_desc="OpenCL (Open Computing Language) header files (removed package)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.khronos.org/registry/cl/"
-distfiles="https://github.com/KhronosGroup/OpenCL-Headers/archive/${_githash}.tar.gz"
-checksum=76d9e8af99f05a23713499a1794b0f6b721cfc79366daa9104ac0b2ed73812c1
-replaces="opencl2-headers>=0"
-
-do_install() {
-	vmkdir usr/include/CL
-	install -m644 *.h ${DESTDIR}/usr/include/CL
-}

From a4f52e8f573a8ce61b871a4e198f67660706d61c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 17 Apr 2020 13:44:58 -0400
Subject: [PATCH 3/5] libgdal: switch to opencl2-headers, enable OpenCL

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

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index c6987b8aac7..cd8b06c0684 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,15 +1,15 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.0.4
-revision=2
+revision=3
 wrksrc="gdal-${version}"
 build_style=gnu-configure
-configure_args="--with-liblzma --with-webp --with-zstd --with-podofo"
+configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
 hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
 makedepends="freexl-devel geos-devel jasper-devel json-c-devel
  libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
- libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl-headers pcre2-devel
- proj-devel sqlite-devel"
+ libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl2-headers pcre2-devel
+ proj-devel sqlite-devel ocl-icd-devel"
 short_desc="Geospatial Data Abstraction Library"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="MIT"

From a3f4aad4ac6bd28a78fa0392cab2a105e5335d52 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 17 Apr 2020 13:45:11 -0400
Subject: [PATCH 4/5] luxmark: switch to opencl2-headers

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

diff --git a/srcpkgs/luxmark/template b/srcpkgs/luxmark/template
index f25873d4e45..68a7a7ab86c 100644
--- a/srcpkgs/luxmark/template
+++ b/srcpkgs/luxmark/template
@@ -1,10 +1,10 @@
 # Template file for 'luxmark'
 pkgname=luxmark
 version=3.1
-revision=8
+revision=9
 build_style=cmake
 makedepends="openimageio-devel tiff-devel libpng-devel libgomp-devel
- libopenexr-devel MesaLib-devel ocl-icd-devel opencl-headers boost-devel
+ libopenexr-devel MesaLib-devel ocl-icd-devel opencl2-headers boost-devel
  python-devel luxrays-devel glew-devel libfreeglut-devel qt-devel opencl-clhpp"
 short_desc="OpenCL benchmark based on LuxCore"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"

From c116a7437cbc810ffe40c93c0e6a4058dca0594c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 17 Apr 2020 13:45:20 -0400
Subject: [PATCH 5/5] luxrays: switch to opencl2-headers

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

diff --git a/srcpkgs/luxrays/template b/srcpkgs/luxrays/template
index c67b59ac906..c750c684100 100644
--- a/srcpkgs/luxrays/template
+++ b/srcpkgs/luxrays/template
@@ -1,12 +1,12 @@
 # Template file for 'luxrays'
 pkgname=luxrays
 version=3.1
-revision=16
+revision=17
 build_style=cmake
 configure_args="-DLUXRAYS_DISABLE_OPENCL=OFF -DCMAKE_SKIP_RPATH=ON"
 hostmakedepends="flex bison boost-devel"
 makedepends="openimageio-devel tiff-devel libpng-devel libgomp-devel
- boost-devel glew-devel opencl-headers opencl-clhpp libopenexr-devel
+ boost-devel glew-devel opencl2-headers opencl-clhpp libopenexr-devel
  python-devel libfreeglut-devel embree-devel"
 short_desc="LuxMark renderer engine"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"

Re: [PR PATCH] [Updated] opencl2-headers update, opencl-headers removal

[ahesford]

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

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

https://github.com/ahesford/void-packages opencl
https://github.com/void-linux/void-packages/pull/21094

opencl2-headers update, opencl-headers removal
The `opencl-headers` package and `opencl2-headers` packages were both four years old. Also, `opencl2-headers` can be loaded in compatibility mode by defining a compiler macro prior to include. There is no need to maintain both packages.

This bumps the `opencl2-headers` package to a recent release version, replaces `opencl-headers` with a meta-package marking its removal, and updates the dependents of `opencl-headers` to use the new `opencl2-headers` package. There are no compilation problems.

As a bonus, I noticed that `libgdal` pulled in the headers, but did not pull in `ocl-icd-devel` to actually build with OpenCL support. This is now fixed.

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

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

From c89ec3b24ef18545953ab4be4cf5637532a0858e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 14 Apr 2020 08:15:27 -0400
Subject: [PATCH 1/5] opencl2-headers: update to 2.2.20200313.

---
 .../patches/altivec-vector.patch              | 36 -------------------
 srcpkgs/opencl2-headers/template              | 25 +++++++------
 2 files changed, 12 insertions(+), 49 deletions(-)
 delete mode 100644 srcpkgs/opencl2-headers/patches/altivec-vector.patch

diff --git a/srcpkgs/opencl2-headers/patches/altivec-vector.patch b/srcpkgs/opencl2-headers/patches/altivec-vector.patch
deleted file mode 100644
index 95f53ad5d5e..00000000000
--- a/srcpkgs/opencl2-headers/patches/altivec-vector.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 1da98fd0ced4cb50f859725d5a8dc5e2633f9343 Mon Sep 17 00:00:00 2001
-From: James Price <j.price@bristol.ac.uk>
-Date: Wed, 12 Dec 2018 19:59:32 +0000
-Subject: [PATCH] Use __vector instead of vector to fix altivec builds
-
-Patch taken from Debian khronos-opencl-headers package:
-https://sources.debian.org/patches/khronos-opencl-headers/1.2-svn26009-1/use__vector.patch/
----
- CL/cl_platform.h | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/CL/cl_platform.h b/CL/cl_platform.h
-index 0c817dd..184db25 100644
---- cl_platform.h
-+++ cl_platform.h
-@@ -401,13 +401,13 @@ typedef unsigned int cl_GLenum;
- /* Define basic vector types */
- #if defined( __VEC__ )
-    #include <altivec.h>   /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */
--   typedef vector unsigned char     __cl_uchar16;
--   typedef vector signed char       __cl_char16;
--   typedef vector unsigned short    __cl_ushort8;
--   typedef vector signed short      __cl_short8;
--   typedef vector unsigned int      __cl_uint4;
--   typedef vector signed int        __cl_int4;
--   typedef vector float             __cl_float4;
-+   typedef __vector unsigned char     __cl_uchar16;
-+   typedef __vector signed char       __cl_char16;
-+   typedef __vector unsigned short    __cl_ushort8;
-+   typedef __vector signed short      __cl_short8;
-+   typedef __vector unsigned int      __cl_uint4;
-+   typedef __vector signed int        __cl_int4;
-+   typedef __vector float             __cl_float4;
-    #define  __CL_UCHAR16__  1
-    #define  __CL_CHAR16__   1
-    #define  __CL_USHORT8__  1
diff --git a/srcpkgs/opencl2-headers/template b/srcpkgs/opencl2-headers/template
index 9dc8f7a9456..e345e9862f0 100644
--- a/srcpkgs/opencl2-headers/template
+++ b/srcpkgs/opencl2-headers/template
@@ -1,22 +1,21 @@
 # Template file for 'opencl2-headers'
 pkgname=opencl2-headers
-_openclver=2.0
-_distver=20160105
-_githash=ad68ab31a430c033868574fb49c769ac09d6b6d8
-version="${_openclver}.${_distver}"
-revision=2
+_openclver=2.2
+_distver=2020.03.13
+version="${_openclver}.20200313"
+revision=1
 archs=noarch
-wrksrc="OpenCL-Headers-${_githash}"
-short_desc="OpenCL 2.0 (Open Computing Language) header files"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="http://www.khronos.org/registry/cl/"
+wrksrc="OpenCL-Headers-${_distver}"
+short_desc="OpenCL 2.2 (Open Computing Language) header files"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="Apache-2.0"
+homepage="https://github.com/KhronosGroup/OpenCL-Headers"
+distfiles="${homepage}/archive/v${_distver}.tar.gz"
+checksum=664bbe587e5a0a00aac267f645b7c413586e7bc56dca9ff3b00037050d06f476
 provides="opencl-headers-${version}_${revision}"
 replaces="opencl-headers>=0"
-distfiles="https://github.com/KhronosGroup/OpenCL-Headers/archive/${_githash}.tar.gz"
-checksum=841b33da523ed095cc95cbf1de081e798636c037b45e9f57541e49911f13e85f
 
 do_install() {
 	vmkdir usr/include/CL
-	install -m644 *.h ${DESTDIR}/usr/include/CL
+	install -m644 CL/*.h ${DESTDIR}/usr/include/CL
 }

From 41138dabce8b78b2a0d189684c9ae0dc3be25d5d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 14 Apr 2020 08:16:22 -0400
Subject: [PATCH 2/5] opencl-headers: remove package (obsolete)

---
 srcpkgs/opencl-headers/INSTALL.msg            |  1 +
 .../patches/altivec-vector.patch              | 36 -------------------
 srcpkgs/opencl-headers/template               | 17 +++------
 3 files changed, 5 insertions(+), 49 deletions(-)
 create mode 100644 srcpkgs/opencl-headers/INSTALL.msg
 delete mode 100644 srcpkgs/opencl-headers/patches/altivec-vector.patch

diff --git a/srcpkgs/opencl-headers/INSTALL.msg b/srcpkgs/opencl-headers/INSTALL.msg
new file mode 100644
index 00000000000..92bb4e71919
--- /dev/null
+++ b/srcpkgs/opencl-headers/INSTALL.msg
@@ -0,0 +1 @@
+opencl-headers is superseded by opencl2-headers
diff --git a/srcpkgs/opencl-headers/patches/altivec-vector.patch b/srcpkgs/opencl-headers/patches/altivec-vector.patch
deleted file mode 100644
index 95f53ad5d5e..00000000000
--- a/srcpkgs/opencl-headers/patches/altivec-vector.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 1da98fd0ced4cb50f859725d5a8dc5e2633f9343 Mon Sep 17 00:00:00 2001
-From: James Price <j.price@bristol.ac.uk>
-Date: Wed, 12 Dec 2018 19:59:32 +0000
-Subject: [PATCH] Use __vector instead of vector to fix altivec builds
-
-Patch taken from Debian khronos-opencl-headers package:
-https://sources.debian.org/patches/khronos-opencl-headers/1.2-svn26009-1/use__vector.patch/
----
- CL/cl_platform.h | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/CL/cl_platform.h b/CL/cl_platform.h
-index 0c817dd..184db25 100644
---- cl_platform.h
-+++ cl_platform.h
-@@ -401,13 +401,13 @@ typedef unsigned int cl_GLenum;
- /* Define basic vector types */
- #if defined( __VEC__ )
-    #include <altivec.h>   /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */
--   typedef vector unsigned char     __cl_uchar16;
--   typedef vector signed char       __cl_char16;
--   typedef vector unsigned short    __cl_ushort8;
--   typedef vector signed short      __cl_short8;
--   typedef vector unsigned int      __cl_uint4;
--   typedef vector signed int        __cl_int4;
--   typedef vector float             __cl_float4;
-+   typedef __vector unsigned char     __cl_uchar16;
-+   typedef __vector signed char       __cl_char16;
-+   typedef __vector unsigned short    __cl_ushort8;
-+   typedef __vector signed short      __cl_short8;
-+   typedef __vector unsigned int      __cl_uint4;
-+   typedef __vector signed int        __cl_int4;
-+   typedef __vector float             __cl_float4;
-    #define  __CL_UCHAR16__  1
-    #define  __CL_CHAR16__   1
-    #define  __CL_USHORT8__  1
diff --git a/srcpkgs/opencl-headers/template b/srcpkgs/opencl-headers/template
index 517b721dcd5..ca95690a8b6 100644
--- a/srcpkgs/opencl-headers/template
+++ b/srcpkgs/opencl-headers/template
@@ -2,20 +2,11 @@
 pkgname=opencl-headers
 _openclver=1.2
 _distver=20160105
-_githash=47be6196cb09f2718990f9537ac69fc5ec43aed5
 version="${_openclver}.${_distver}"
-revision=2
+revision=3
 archs=noarch
-wrksrc="OpenCL-Headers-${_githash}"
-short_desc="OpenCL (Open Computing Language) header files"
+build_style=meta
+short_desc="OpenCL (Open Computing Language) header files (removed package)"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
+license="Apache-2.0"
 homepage="http://www.khronos.org/registry/cl/"
-distfiles="https://github.com/KhronosGroup/OpenCL-Headers/archive/${_githash}.tar.gz"
-checksum=76d9e8af99f05a23713499a1794b0f6b721cfc79366daa9104ac0b2ed73812c1
-replaces="opencl2-headers>=0"
-
-do_install() {
-	vmkdir usr/include/CL
-	install -m644 *.h ${DESTDIR}/usr/include/CL
-}

From 6e2cd1c5821e97db27c99a51b62673d9cc8fc753 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 17 Apr 2020 13:44:58 -0400
Subject: [PATCH 3/5] libgdal: switch to opencl2-headers, enable OpenCL

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

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index c6987b8aac7..cd8b06c0684 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,15 +1,15 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.0.4
-revision=2
+revision=3
 wrksrc="gdal-${version}"
 build_style=gnu-configure
-configure_args="--with-liblzma --with-webp --with-zstd --with-podofo"
+configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
 hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
 makedepends="freexl-devel geos-devel jasper-devel json-c-devel
  libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
- libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl-headers pcre2-devel
- proj-devel sqlite-devel"
+ libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl2-headers pcre2-devel
+ proj-devel sqlite-devel ocl-icd-devel"
 short_desc="Geospatial Data Abstraction Library"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="MIT"

From 0eab40e960ebe413c2509757c0f2f48e8603a122 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 17 Apr 2020 13:45:11 -0400
Subject: [PATCH 4/5] luxmark: switch to opencl2-headers

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

diff --git a/srcpkgs/luxmark/template b/srcpkgs/luxmark/template
index f25873d4e45..68a7a7ab86c 100644
--- a/srcpkgs/luxmark/template
+++ b/srcpkgs/luxmark/template
@@ -1,10 +1,10 @@
 # Template file for 'luxmark'
 pkgname=luxmark
 version=3.1
-revision=8
+revision=9
 build_style=cmake
 makedepends="openimageio-devel tiff-devel libpng-devel libgomp-devel
- libopenexr-devel MesaLib-devel ocl-icd-devel opencl-headers boost-devel
+ libopenexr-devel MesaLib-devel ocl-icd-devel opencl2-headers boost-devel
  python-devel luxrays-devel glew-devel libfreeglut-devel qt-devel opencl-clhpp"
 short_desc="OpenCL benchmark based on LuxCore"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"

From e66a984f5bed7d750a30df8570474dfcf49531c9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 17 Apr 2020 13:45:20 -0400
Subject: [PATCH 5/5] luxrays: switch to opencl2-headers [ci skip]

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

diff --git a/srcpkgs/luxrays/template b/srcpkgs/luxrays/template
index c67b59ac906..c750c684100 100644
--- a/srcpkgs/luxrays/template
+++ b/srcpkgs/luxrays/template
@@ -1,12 +1,12 @@
 # Template file for 'luxrays'
 pkgname=luxrays
 version=3.1
-revision=16
+revision=17
 build_style=cmake
 configure_args="-DLUXRAYS_DISABLE_OPENCL=OFF -DCMAKE_SKIP_RPATH=ON"
 hostmakedepends="flex bison boost-devel"
 makedepends="openimageio-devel tiff-devel libpng-devel libgomp-devel
- boost-devel glew-devel opencl-headers opencl-clhpp libopenexr-devel
+ boost-devel glew-devel opencl2-headers opencl-clhpp libopenexr-devel
  python-devel libfreeglut-devel embree-devel"
 short_desc="LuxMark renderer engine"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"

Re: opencl2-headers update, opencl-headers removal

[ahesford]

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/21094#issuecomment-615463186

Comment:
Skipping CI because the rebuild of libgdal will timeout.

Re: opencl2-headers update, opencl-headers removal

[ahesford]

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/21094#issuecomment-615463186

Comment:
My first PR submission passed Travis on most platforms but timed out on `x86_64`, passed on most of the other platforms, and was still running on `armv6l-musl` and `aarch64-musl` at the time of this comment. The later force push fixes a license complaint from `xlint`. There should be no problems running these through the builders.

Re: opencl2-headers update, opencl-headers removal

[ahesford]

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/21094#issuecomment-615463186

Comment:
My first PR submission passed Travis on most platforms but timed out on `x86_64`, and was still running on `armv6l-musl` and `aarch64-musl` at the time of this comment. The later force push fixes a license complaint from `xlint`. There should be no problems running these through the builders.

EDIT: The build succeeded on the remaining platforms, leaving only the timed-out `x86_64` failure.

Re: [PR PATCH] [Merged]: opencl2-headers update, opencl-headers removal

[xtraeme]

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

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

opencl2-headers update, opencl-headers removal
https://github.com/void-linux/void-packages/pull/21094

Description:
The `opencl-headers` package and `opencl2-headers` packages were both four years old. Also, `opencl2-headers` can be loaded in compatibility mode by defining a compiler macro prior to include. There is no need to maintain both packages.

This bumps the `opencl2-headers` package to a recent release version, replaces `opencl-headers` with a meta-package marking its removal, and updates the dependents of `opencl-headers` to use the new `opencl2-headers` package. There are no compilation problems.

As a bonus, I noticed that `libgdal` pulled in the headers, but did not pull in `ocl-icd-devel` to actually build with OpenCL support. This is now fixed.