diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-12-31 20:20:25 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-12-31 20:20:25 +0000 |
commit | c4b414ba84991b36b62c066b701385eaf44cdd49 (patch) | |
tree | 5cbdb7a51f1abb965fdfe90b686f8130e100afaa /dev-libs/ocl-icd | |
parent | ea5bad4d0ba1eb937df22adb7f6cc57ea77f03d8 (diff) |
gentoo auto-resync : 31:12:2022 - 20:20:25
Diffstat (limited to 'dev-libs/ocl-icd')
-rw-r--r-- | dev-libs/ocl-icd/Manifest | 6 | ||||
-rw-r--r-- | dev-libs/ocl-icd/files/ocl-icd-2.3.0-new-headers.patch | 94 | ||||
-rw-r--r-- | dev-libs/ocl-icd/metadata.xml | 13 | ||||
-rw-r--r-- | dev-libs/ocl-icd/ocl-icd-2.3.0.ebuild | 62 | ||||
-rw-r--r-- | dev-libs/ocl-icd/ocl-icd-2.3.1.ebuild | 58 |
5 files changed, 0 insertions, 233 deletions
diff --git a/dev-libs/ocl-icd/Manifest b/dev-libs/ocl-icd/Manifest deleted file mode 100644 index 3b8f5c782f7b..000000000000 --- a/dev-libs/ocl-icd/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX ocl-icd-2.3.0-new-headers.patch 4641 BLAKE2B 0013da2cfbe61cf98f98740055b54f2a3a1afacbf7d8845f0a3f53622e4a5e848d8d5d0be279e4717f29bc8e379affb3508aa2efa1c355c073ca42e883bdeead SHA512 951f1fb715031ebd6b1146b08d34fdc98154435129f8c1fb7b7b01ca33e10fdf2b8651c231fc1f47a41d3dc66c77df29786b3535099b7bbaac2e2b62fa4edc93 -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 -EBUILD ocl-icd-2.3.0.ebuild 1593 BLAKE2B 7dfb66e1e7bf7f086fffd3287ef99cfb8f0190f3890614b59fb214d0e766c048121d178ba5750a6c0a072574dc243eb957962f2f19421150c14a20b9f9f6292e SHA512 e822ffeb32ac80fac2774f0050d055b213af4e59fd1bbe398b9ad0b99370be5e2fac0874948af96377b9a52fdf36272da341d2e53a96cc96de4e93af962e9805 -EBUILD ocl-icd-2.3.1.ebuild 1551 BLAKE2B b8e10636ff4744bfeb50e6f9eb99b9a41c846761dfe02f86ca29c2a1d94474fd4b9ae55e03a9f95818a47abfcb84fbb9f19343b3645c93e14866216453f92053 SHA512 2447ced77634f796d6fe31e0e505dba7968164eedc32e62910d412521f2d7846f50b9b6bd9ee09216de9c84226ceb5b36680906ba6bfb424aefae2fbf3f0ec79 -MISC metadata.xml 397 BLAKE2B 385d442979cec4852b3ca02d98413415ea62683c4bbdf33c5ace01879f8a4a4f7bedf9a0f7ba4f88dcea4267765a0635cacb4a619e6d9294c6d399e01220a1f7 SHA512 730e4cd26169de827576ac7d61a07caa08c6d78cc1561417c5e017eee58a7137436003aafac620223ae1513a100c7817a3e00463ea50f0d9e3690949f2c54614 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 aa35c96ccda6..000000000000 --- 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/metadata.xml b/dev-libs/ocl-icd/metadata.xml deleted file mode 100644 index eba2b31b82d6..000000000000 --- a/dev-libs/ocl-icd/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>patrick@gentoo.org</email> - <name>Patrick Lauer</name> - </maintainer> - <use> - <flag name="khronos-headers" restrict=">dev-libs/ocl-icd-2.2.11-r1"> - Install Khronos OpenCL headers. - </flag> - </use> -</pkgmetadata> diff --git a/dev-libs/ocl-icd/ocl-icd-2.3.0.ebuild b/dev-libs/ocl-icd/ocl-icd-2.3.0.ebuild deleted file mode 100644 index e4d106dd1969..000000000000 --- a/dev-libs/ocl-icd/ocl-icd-2.3.0.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -USE_RUBY="ruby25 ruby26 ruby27 ruby30" -inherit autotools flag-o-matic multilib-minimal ruby-single - -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 ~ppc64 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="${RUBY_DEPS}" -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 \ - --enable-custom-vendordir="${EPREFIX}/etc/OpenCL/vendors" -} - -multilib_src_compile() { - local candidates=(${USE_RUBY}) - local ruby= - for (( idx=${#candidates[@]}-1 ; idx>=0 ; idx-- )) ; do - if ${candidates[idx]} --version &> /dev/null; then - ruby=${candidates[idx]} && break - fi - done - [[ -z ${ruby} ]] && die "No ruby executable found" - - emake RUBY=${ruby} -} - -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.ebuild b/dev-libs/ocl-icd/ocl-icd-2.3.1.ebuild deleted file mode 100644 index 75f550fd07a8..000000000000 --- a/dev-libs/ocl-icd/ocl-icd-2.3.1.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -USE_RUBY="ruby25 ruby26 ruby27 ruby30 ruby31" -inherit autotools flag-o-matic multilib-minimal ruby-single - -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 ~ppc64 ~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="${RUBY_DEPS}" -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 \ - --enable-custom-vendordir="${EPREFIX}/etc/OpenCL/vendors" -} - -multilib_src_compile() { - local candidates=(${USE_RUBY}) - local ruby= - for (( idx=${#candidates[@]}-1 ; idx>=0 ; idx-- )) ; do - if ${candidates[idx]} --version &> /dev/null; then - ruby=${candidates[idx]} && break - fi - done - [[ -z ${ruby} ]] && die "No ruby executable found" - - emake RUBY=${ruby} -} - -multilib_src_install() { - default - - # Drop .la files - find "${ED}" -name '*.la' -delete || die -} |