From e74d9c1053b5d300748e5dbd1e3050c704bc17a2 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Oct 06 2020 03:15:27 +0000 Subject: update to 2.2.13 --- diff --git a/fix-ocl-icd-gcc10.patch b/fix-ocl-icd-gcc10.patch deleted file mode 100644 index e919517..0000000 --- a/fix-ocl-icd-gcc10.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 4667bddd365bcc1dc66c483835971f0083b44b1d Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich -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 ---- - icd_generator.rb | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/icd_generator.rb b/icd_generator.rb -index 49443b8..764cabb 100644 ---- 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/ocl-icd.spec b/ocl-icd.spec index 3724211..b94f877 100644 --- a/ocl-icd.spec +++ b/ocl-icd.spec @@ -1,13 +1,12 @@ Name: ocl-icd -Version: 2.2.12 -Release: 10%{?dist} +Version: 2.2.13 +Release: 1%{?dist} Summary: OpenCL Library (Installable Client Library) Bindings License: BSD -URL: https://forge.imag.fr/projects/ocl-icd/ -Source0: https://forge.imag.fr/frs/download.php/836/%{name}-%{version}.tar.gz +URL: https://github.com/OCL-dev/%{name}/ +Source0: https://github.com/OCL-dev/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz -Patch0: fix-ocl-icd-gcc10.patch BuildRequires: gcc BuildRequires: automake BuildRequires: autoconf @@ -58,6 +57,9 @@ make check %{_libdir}/pkgconfig/OpenCL.pc %changelog +* Tue Oct 06 2020 Dave Airlie - 2.2.13-1 +- update to 2.2.13 + * Tue Jul 28 2020 Fedora Release Engineering - 2.2.12-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 34aafa1..a50b83e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ocl-icd-2.2.12.tar.gz) = 8a5afe80da8ece3dcb5a8893942b77f7e44466d9aefd1d58ad8f0bcd686d83e3566192bf59880363c39d0b96b0f33f777e0f221f6b346bbe62c3e2b27faf2d1b +SHA512 (ocl-icd-2.2.13.tar.gz) = b6ab891d332eca75b9e0616ab963b743d29d7a34545820d6a6fab70e734b51dbb83ad9297e374dc260ebaf27ea726d64f74374d0aa36bc24e8feaa4460c29122