dev-libs/ocl-icd : version bump

5 files changed, 8 insertions, 49 deletions

diff --git a/dev-libs/ocl-icd/Manifest b/dev-libs/ocl-icd/Manifest
index ae9b88a9..8b40bf4c 100644
--- a/dev-libs/ocl-icd/Manifest
+++ b/dev-libs/ocl-icd/Manifest
@@ -1 +1 @@
-DIST ocl-icd-2.2.12.tar.gz 80718 BLAKE2B 524f9eea9782323eafa2f41858c4970333c029898c651bbf15624331e184d1b439d2259532b02defd67c9ab434a35b1b9a64a28e1515b3f42f09b3a270975df7 SHA512 f1668c3a39ecfbc089ee5a5f61f44ceb86ab80e504e58064dec306ce907daf77936c5403b4af15ed8714068891d68346c86725f285cfbc90c4fcb35d18db4048
+DIST ocl-icd-2.2.14.tar.gz 100629 BLAKE2B 4862560541c979edb06d89f7f57b78a34c02e38843c02b0f125a121649cd6a33570e29c86fe7d3fd6f0fa3d489831777100daef97264e32b82854384075cbbf2 SHA512 78510b6fa4e2c6a52141a51ccf0d0ef3110b0b4902a43bb97f7622ff0ce470b108dc05c9619c28ce8758ccea1e1cf6b2e7f1a296f8b07f52532f23b2b036a5cf
diff --git a/dev-libs/ocl-icd/files/ocl-icd-2.2.12-gcc-10.patch b/dev-libs/ocl-icd/files/ocl-icd-2.2.12-gcc-10.patch
deleted file mode 100644
index 64948d5b..00000000
--- a/dev-libs/ocl-icd/files/ocl-icd-2.2.12-gcc-10.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://bugs.gentoo.org/706098
-
-From 4667bddd365bcc1dc66c483835971f0083b44b1d Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Wed, 22 Jan 2020 19:38:23 +0000
-Subject: [PATCH] icd_generator.rb: fix build failure against gcc-10
-
-On gcc-10 (and gcc-9 -fno-common) build fails as:
-
-```
-libtool: link: gcc -shared  -fPIC -DPIC  .libs/libdummy_icd.o .libs/libdummy_icd_gen.o \
-    -ldl  -g -O2   -Wl,-soname -Wl,libdummycl.so.0 -o .libs/libdummycl.so.0.0.0
-ld: .libs/libdummy_icd_gen.o:/home/slyfox/dev/git/ocl-icd/libdummy_icd_gen.h:226:
-  multiple definition of `master_dispatch'; .libs/libdummy_icd.o:/home/slyfox/dev/git/ocl-icd/libdummy_icd_gen.h:226: first defined here
-```
-
-gcc-10 will change the default from -fcommon to fno-common:
-https://gcc.gnu.org/PR85678.
-
-The error also happens if CFLAGS=-fno-common passed explicitly.
-
-Reported-by: Anthony Parsons
-Bug: https://bugs.gentoo.org/706098
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- icd_generator.rb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/icd_generator.rb
-+++ b/icd_generator.rb
-@@ -207,7 +207,7 @@ def self.generate_libdummy_icd_header
-     }
-     libdummy_icd_structures += "};\n\n"
-     libdummy_icd_structures += "#pragma GCC visibility push(hidden)\n\n"
--    libdummy_icd_structures += "struct _cl_icd_dispatch master_dispatch; \n\n"
-+    libdummy_icd_structures += "extern struct _cl_icd_dispatch master_dispatch; \n\n"
-     $use_name_in_test.each { |k, f|
-       libdummy_icd_structures += "typeof(#{f}) INT#{f};\n"
-     }
diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.12-r10.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.14-r10.ebuild
index 2f086a09..e4d747fa 100644
--- a/dev-libs/ocl-icd/ocl-icd-2.2.12-r10.ebuild
+++ b/dev-libs/ocl-icd/ocl-icd-2.2.14-r10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,13 +18,11 @@ IUSE="+khronos-headers"
 
 BDEPEND="dev-lang/ruby:2.5
 	virtual/rubygems"
-DEPEND="dev-util/opencl-headers"
+DEPEND=">=dev-util/opencl-headers-2020.12.18"
 RDEPEND="${DEPEND}
 	!app-eselect/eselect-opencl
 	!dev-libs/opencl-icd-loader"
 
-PATCHES=("${FILESDIR}"/${P}-gcc-10.patch)
-
 src_prepare() {
 	replace-flags -Os -O2 # bug 646122
 
diff --git a/metadata/md5-cache/dev-libs/ocl-icd-2.2.12-r10 b/metadata/md5-cache/dev-libs/ocl-icd-2.2.14-r10
index 34d5e318..68032da9 100644
--- a/metadata/md5-cache/dev-libs/ocl-icd-2.2.12-r10
+++ b/metadata/md5-cache/dev-libs/ocl-icd-2.2.14-r10
@@ -1,14 +1,14 @@
 BDEPEND=dev-lang/ruby:2.5 virtual/rubygems >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-util/opencl-headers
+DEPEND=>=dev-util/opencl-headers-2020.12.18
 DESCRIPTION=Alternative to vendor specific OpenCL ICD loaders
 EAPI=7
 HOMEPAGE=https://github.com/OCL-dev/ocl-icd
 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 !app-eselect/eselect-opencl !dev-libs/opencl-icd-loader
+RDEPEND=>=dev-util/opencl-headers-2020.12.18 !app-eselect/eselect-opencl !dev-libs/opencl-icd-loader
 SLOT=0
-SRC_URI=https://github.com/OCL-dev/ocl-icd/archive/v2.2.12.tar.gz -> ocl-icd-2.2.12.tar.gz
+SRC_URI=https://github.com/OCL-dev/ocl-icd/archive/v2.2.14.tar.gz -> ocl-icd-2.2.14.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2575c650161ca72d48e3e6eca1758501
+_md5_=f13bca4f7dddef41ae89c9a94174d67d
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 7df934b0..c39efacd 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -15,7 +15,7 @@ app-portage/sisyphus-qt 4.2103.0: A simple portage python wrapper which works li
 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.2.12-r10: Alternative to vendor specific OpenCL ICD loaders
+dev-libs/ocl-icd 2.2.14-r10: Alternative to vendor specific OpenCL ICD loaders
 dev-python/animation 0.0.5-r1: Tools for terminal-based wait animations
 dev-python/sh 1.12.14-r3: Python process launching
 dev-python/typer 0.2.1: Build great CLIs. Easy to code. Based on Python type hints