summaryrefslogtreecommitdiff
path: root/dev-libs
diff options
context:
space:
mode:
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/ocl-icd/Manifest2
-rw-r--r--dev-libs/ocl-icd/files/ocl-icd-2.3.0-new-headers.patch94
-rw-r--r--dev-libs/ocl-icd/ocl-icd-2.3.1-r100.ebuild (renamed from dev-libs/ocl-icd/ocl-icd-2.3.0-r100.ebuild)4
3 files changed, 1 insertions, 99 deletions
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.1-r100.ebuild
index 5f85dbb1..e8de34e6 100644
--- a/dev-libs/ocl-icd/ocl-icd-2.3.0-r100.ebuild
+++ b/dev-libs/ocl-icd/ocl-icd-2.3.1-r100.ebuild
@@ -23,10 +23,6 @@ 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 13:09:26 +0000