From a7c8087d9cbe4cf96a41dce3734a42f6a72eb507 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Wed, 6 Apr 2022 22:49:17 +0100
Subject: dev-libs/ocl-icd : version bump
---
dev-libs/ocl-icd/Manifest | 2 +-
.../ocl-icd/files/ocl-icd-2.3.0-new-headers.patch | 94 ----------------------
dev-libs/ocl-icd/ocl-icd-2.3.0-r100.ebuild | 52 ------------
dev-libs/ocl-icd/ocl-icd-2.3.1-r100.ebuild | 48 +++++++++++
metadata/md5-cache/dev-libs/ocl-icd-2.3.0-r100 | 15 ----
metadata/md5-cache/dev-libs/ocl-icd-2.3.1-r100 | 15 ++++
metadata/pkg_desc_index | 2 +-
7 files changed, 65 insertions(+), 163 deletions(-)
delete mode 100644 dev-libs/ocl-icd/files/ocl-icd-2.3.0-new-headers.patch
delete mode 100644 dev-libs/ocl-icd/ocl-icd-2.3.0-r100.ebuild
create mode 100644 dev-libs/ocl-icd/ocl-icd-2.3.1-r100.ebuild
delete mode 100644 metadata/md5-cache/dev-libs/ocl-icd-2.3.0-r100
create mode 100644 metadata/md5-cache/dev-libs/ocl-icd-2.3.1-r100
diff --git a/dev-libs/ocl-icd/Manifest b/dev-libs/ocl-icd/Manifest
index 80ea1001..0a003866 100644
--- a/dev-libs/ocl-icd/Manifest
+++ b/dev-libs/ocl-icd/Manifest
@@ -1 +1 @@
-DIST ocl-icd-2.3.0.tar.gz 100848 BLAKE2B b9e5b78df63f4865bb4cb3623fbc6bd336c86b4a9e1f23a29fab1cf11f848cb20d6d8d4a480ff44e442b02d606247a923798143058256ef59c2b16c9daf7098d SHA512 003f3661b7086a7364e79d1058591f12a7095aa2c3decfc4b496f00a0863a91cd81080f33b9308e3948045f8aca5856868ed2725f478654230e51a60d654e613
+DIST ocl-icd-2.3.1.tar.gz 102616 BLAKE2B f3e41d73e8cca7b42697a81f9d353341ba40ae67bb07ccbb7f6bd4fc9c8d16cbb4a9a9826ef81a381629cf1bd2c61d6ad9d7a02dcdb2871359041cfd8e9815b7 SHA512 3fa92dbcbe8ea2acf1ee967419d1b39ca7ace96e64261e3818984bd70831d62692e953c30e3e271fe74d59c634785055320f03c4d0516e2f53f7f700d3bcc76d
diff --git a/dev-libs/ocl-icd/files/ocl-icd-2.3.0-new-headers.patch b/dev-libs/ocl-icd/files/ocl-icd-2.3.0-new-headers.patch
deleted file mode 100644
index aa35c96c..00000000
--- a/dev-libs/ocl-icd/files/ocl-icd-2.3.0-new-headers.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From aed1832c81c0971ea001e12d41e04df834257f94 Mon Sep 17 00:00:00 2001
-From: Brice Videau <bvideau@anl.gov>
-Date: Wed, 12 May 2021 10:24:44 -0500
-Subject: [PATCH] Updated to support latest Khronos headers.
-
----
- icd_generator.rb | 4 +-
- khronos-headers/CL/cl.h | 46 +--
- khronos-headers/CL/cl_d3d10.h | 12 +-
- khronos-headers/CL/cl_d3d11.h | 12 +-
- khronos-headers/CL/cl_dx9_media_sharing.h | 32 +-
- khronos-headers/CL/cl_egl.h | 8 +-
- khronos-headers/CL/cl_ext.h | 228 +++++++++----
- khronos-headers/CL/cl_gl.h | 22 +-
- khronos-headers/CL/cl_gl_ext.h | 26 +-
- khronos-headers/CL/cl_icd.h | 316 +++++++++---------
- khronos-headers/CL/cl_layer.h | 4 +-
- khronos-headers/CL/cl_platform.h | 125 ++++---
- .../CL/cl_va_api_media_sharing_intel.h | 24 +-
- khronos-headers/CL/opencl.h | 3 +-
- ocl_interface.yaml | 10 +-
- run_dummy_icd.c | 1 -
- 16 files changed, 484 insertions(+), 389 deletions(-)
-
-diff --git a/icd_generator.rb b/icd_generator.rb
-index bb0f2e9..ed4217f 100644
---- a/icd_generator.rb
-+++ b/icd_generator.rb
-@@ -57,7 +57,7 @@ module IcdGenerator
- "clGetGLContextInfoKHR", "clUnloadCompiler",
- "clCreateContext", "clCreateContextFromType", "clWaitForEvents"]
- $header_files = ["/usr/include/CL/cl.h", "/usr/include/CL/cl_gl.h", "/usr/include/CL/cl_egl.h",
-- "/usr/include/CL/cl_ext.h", "/usr/include/CL/cl_gl_ext.h"]
-+ "/usr/include/CL/cl_ext.h"]
- $windows_header_files = ["/usr/include/CL/cl_dx9_media_sharing.h", "/usr/include/CL/cl_d3d11.h", "/usr/include/CL/cl_d3d10.h"]
- $cl_data_type_error = { "cl_platform_id" => "CL_INVALID_PLATFORM",
- "cl_device_id" => "CL_INVALID_DEVICE",
-@@ -246,7 +246,7 @@ def self.generate_run_dummy_icd_source
- run_dummy_icd += "\n\n"
- $api_entries.each_key { |func_name|
- next if $forbidden_funcs.include?(func_name)
-- run_dummy_icd += $api_entries[func_name]+";\n"
-+ run_dummy_icd += $api_entries[func_name]+"\n"
- }
- run_dummy_icd += "\n\n"
- run_dummy_icd += "void call_all_OpenCL_functions(cl_platform_id chosen_platform) {\n"
-diff --git a/ocl_interface.yaml b/ocl_interface.yaml
-index 1e80f16..43a0e59 100644
---- a/ocl_interface.yaml
-+++ b/ocl_interface.yaml
-@@ -674,18 +674,18 @@
- const cl_device_partition_property_ext * /* properties */,
- cl_uint /*num_entries*/,
- cl_device_id * /*out_devices*/,
-- cl_uint * /*num_devices*/ ) CL_EXT_SUFFIX__VERSION_1_1;
-+ cl_uint * /*num_devices*/ ) CL_API_SUFFIX__VERSION_1_1;
- 90: |-
- CL_API_ENTRY cl_int CL_API_CALL
-- clRetainDeviceEXT( cl_device_id /*device*/ ) CL_EXT_SUFFIX__VERSION_1_1;
-+ clRetainDeviceEXT( cl_device_id /*device*/ ) CL_API_SUFFIX__VERSION_1_1;
- 91: |-
- CL_API_ENTRY cl_int CL_API_CALL
-- clReleaseDeviceEXT( cl_device_id /*device*/ ) CL_EXT_SUFFIX__VERSION_1_1;
-+ clReleaseDeviceEXT( cl_device_id /*device*/ ) CL_API_SUFFIX__VERSION_1_1;
- 92: |-
- CL_API_ENTRY cl_event CL_API_CALL
- clCreateEventFromGLsyncKHR(cl_context /* context */,
- cl_GLsync /* cl_GLsync */,
-- cl_int * /* errcode_ret */) CL_EXT_SUFFIX__VERSION_1_1;
-+ cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_1;
- 93: |-
- CL_API_ENTRY cl_int CL_API_CALL
- clCreateSubDevices(cl_device_id /* in_device */,
-@@ -1016,7 +1016,7 @@
- const void * /*input_value*/,
- size_t /*param_value_size*/,
- void* /*param_value*/,
-- size_t* /*param_value_size_ret*/ ) CL_EXT_SUFFIX__VERSION_2_0;
-+ size_t* /*param_value_size_ret*/ ) CL_API_SUFFIX__VERSION_2_0;
- 137: |-
- CL_API_ENTRY cl_kernel CL_API_CALL
- clCloneKernel(cl_kernel /* source_kernel */,
-diff --git a/run_dummy_icd.c b/run_dummy_icd.c
-index 400c1b0..c064b19 100644
---- a/run_dummy_icd.c
-+++ b/run_dummy_icd.c
-@@ -39,7 +39,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- # include <CL/cl_gl.h>
- # include <CL/cl_egl.h>
- # include <CL/cl_ext.h>
--# include <CL/cl_gl_ext.h>
- #pragma GCC diagnostic pop
- #include <string.h>
- #include "ocl_icd_debug.h"
diff --git a/dev-libs/ocl-icd/ocl-icd-2.3.0-r100.ebuild b/dev-libs/ocl-icd/ocl-icd-2.3.0-r100.ebuild
deleted file mode 100644
index 5f85dbb1..00000000
--- a/dev-libs/ocl-icd/ocl-icd-2.3.0-r100.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic multilib-minimal
-
-DESCRIPTION="Alternative to vendor specific OpenCL ICD loaders"
-HOMEPAGE="https://github.com/OCL-dev/ocl-icd"
-SRC_URI="https://github.com/OCL-dev/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# Does nothing now but by keeping it here we avoid having to have virtual/opencl
-# handle ebuilds both with and without this flag.
-IUSE="+khronos-headers"
-
-BDEPEND="dev-lang/ruby:2.7
- virtual/rubygems"
-DEPEND=">=dev-util/opencl-headers-2021.04.29"
-RDEPEND="${DEPEND}
- !app-eselect/eselect-opencl
- !dev-libs/opencl-icd-loader"
-
-PATCHES=(
- "${FILESDIR}"/${P}-new-headers.patch
-)
-
-src_prepare() {
- replace-flags -Os -O2 # bug 646122
-
- default
- eautoreconf
-}
-
-multilib_src_configure() {
- # dev-util/opencl-headers ARE official Khronos Group headers, what this option
- # does is disable the use of the bundled ones
- ECONF_SOURCE="${S}" econf --enable-pthread-once --disable-official-khronos-headers
-}
-
-multilib_src_compile() {
- emake RUBY="$(type -P ruby27)"
-}
-
-multilib_src_install() {
- default
-
- # Drop .la files
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/ocl-icd/ocl-icd-2.3.1-r100.ebuild b/dev-libs/ocl-icd/ocl-icd-2.3.1-r100.ebuild
new file mode 100644
index 00000000..e8de34e6
--- /dev/null
+++ b/dev-libs/ocl-icd/ocl-icd-2.3.1-r100.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib-minimal
+
+DESCRIPTION="Alternative to vendor specific OpenCL ICD loaders"
+HOMEPAGE="https://github.com/OCL-dev/ocl-icd"
+SRC_URI="https://github.com/OCL-dev/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Does nothing now but by keeping it here we avoid having to have virtual/opencl
+# handle ebuilds both with and without this flag.
+IUSE="+khronos-headers"
+
+BDEPEND="dev-lang/ruby:2.7
+ virtual/rubygems"
+DEPEND=">=dev-util/opencl-headers-2021.04.29"
+RDEPEND="${DEPEND}
+ !app-eselect/eselect-opencl
+ !dev-libs/opencl-icd-loader"
+
+src_prepare() {
+ replace-flags -Os -O2 # bug 646122
+
+ default
+ eautoreconf
+}
+
+multilib_src_configure() {
+ # dev-util/opencl-headers ARE official Khronos Group headers, what this option
+ # does is disable the use of the bundled ones
+ ECONF_SOURCE="${S}" econf --enable-pthread-once --disable-official-khronos-headers
+}
+
+multilib_src_compile() {
+ emake RUBY="$(type -P ruby27)"
+}
+
+multilib_src_install() {
+ default
+
+ # Drop .la files
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/metadata/md5-cache/dev-libs/ocl-icd-2.3.0-r100 b/metadata/md5-cache/dev-libs/ocl-icd-2.3.0-r100
deleted file mode 100644
index afac51c2..00000000
--- a/metadata/md5-cache/dev-libs/ocl-icd-2.3.0-r100
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/ruby:2.7 virtual/rubygems sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.4:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-util/opencl-headers-2021.04.29
-DESCRIPTION=Alternative to vendor specific OpenCL ICD loaders
-EAPI=7
-HOMEPAGE=https://github.com/OCL-dev/ocl-icd
-INHERIT=autotools flag-o-matic multilib-minimal
-IUSE=+khronos-headers abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=>=dev-util/opencl-headers-2021.04.29 !app-eselect/eselect-opencl !dev-libs/opencl-icd-loader
-SLOT=0
-SRC_URI=https://github.com/OCL-dev/ocl-icd/archive/v2.3.0.tar.gz -> ocl-icd-2.3.0.tar.gz
-_eclasses_=autotools ed3ef2014ee93d24bde80f0c0ea9732e edos2unix 33e347e171066657f91f8b0c72ec8773 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic a500d7cc40da3de38c361e889153bdf7 gnuconfig 262062cef0ba4f22b397193da514a350 libtool 241a8f577b9781a42a7421e53448a44e multibuild d26d81f242cb193d899a72bca423d0bd multilib de4beb52bfa93c4c5d96792a6b5e1784 multilib-build 05f207909a804c9174bc39a00547d598 multilib-minimal 4b0f1857965db8869a729948d5277e0b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=df59bf59ed177af8d1bef27c5e4080bc
diff --git a/metadata/md5-cache/dev-libs/ocl-icd-2.3.1-r100 b/metadata/md5-cache/dev-libs/ocl-icd-2.3.1-r100
new file mode 100644
index 00000000..73628137
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/ocl-icd-2.3.1-r100
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/ruby:2.7 virtual/rubygems sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.4:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-util/opencl-headers-2021.04.29
+DESCRIPTION=Alternative to vendor specific OpenCL ICD loaders
+EAPI=7
+HOMEPAGE=https://github.com/OCL-dev/ocl-icd
+INHERIT=autotools flag-o-matic multilib-minimal
+IUSE=+khronos-headers abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=>=dev-util/opencl-headers-2021.04.29 !app-eselect/eselect-opencl !dev-libs/opencl-icd-loader
+SLOT=0
+SRC_URI=https://github.com/OCL-dev/ocl-icd/archive/v2.3.1.tar.gz -> ocl-icd-2.3.1.tar.gz
+_eclasses_=autotools ed3ef2014ee93d24bde80f0c0ea9732e edos2unix 33e347e171066657f91f8b0c72ec8773 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic a500d7cc40da3de38c361e889153bdf7 gnuconfig 262062cef0ba4f22b397193da514a350 libtool 241a8f577b9781a42a7421e53448a44e multibuild d26d81f242cb193d899a72bca423d0bd multilib de4beb52bfa93c4c5d96792a6b5e1784 multilib-build 05f207909a804c9174bc39a00547d598 multilib-minimal 4b0f1857965db8869a729948d5277e0b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 wrapper 4251d4c84c25f59094fd557e0063a974
+_md5_=017223789fbe28b7c01cd7236fa6507b
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 9e26ac27..fdd7cf8e 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -16,7 +16,7 @@ app-portage/sisyphus-qt 4.2107.0-r2: A simple portage python wrapper which works
app-text/simplenote 2.6.0: The simplest way to keep notes
dev-libs/libdbusmenu-qt 0.9.3_pre20160218-r2: A library providing Qt implementation of DBusMenu specification (meta mackage)
dev-libs/libdbusmenu-qt5 0.9.3_pre20160218-r2: Library providing Qt implementation of DBusMenu specification
-dev-libs/ocl-icd 2.3.0-r100: Alternative to vendor specific OpenCL ICD loaders
+dev-libs/ocl-icd 2.3.1-r100: Alternative to vendor specific OpenCL ICD loaders
dev-python/animation 0.0.5-r2: Tools for terminal-based wait animations
dev-python/click 7.1.2-r100: A Python package for creating beautiful command line interfaces
dev-python/sh 1.12.14-r4: Python process launching
--
cgit v1.2.3