commit ocl-icd for openSUSE:Factory

2020-10-26 Thread root
Hello community,

here is the log from the commit of package ocl-icd for openSUSE:Factory checked 
in at 2020-10-26 16:19:37

Comparing /work/SRC/openSUSE:Factory/ocl-icd (Old)
 and  /work/SRC/openSUSE:Factory/.ocl-icd.new.3463 (New)


Package is "ocl-icd"

Mon Oct 26 16:19:37 2020 rev:14 rq:843812 version:2.2.13

Changes:

--- /work/SRC/openSUSE:Factory/ocl-icd/ocl-icd.changes  2020-09-01 
20:10:40.760685325 +0200
+++ /work/SRC/openSUSE:Factory/.ocl-icd.new.3463/ocl-icd.changes
2020-10-26 16:20:03.795116098 +0100
@@ -1,0 +2,14 @@
+Sat Oct 24 12:10:24 UTC 2020 - Martin Hauke 
+
+- Update to version 2.2.13
+  * Removed warnings and use uniform warning suppression
+  * Switched Khornos Headers to OpenCL3.0
+  * Added OpenCL 3.0 support
+  * Fix warning in gcc10
+  * Updated loader and headers to support
+clSetContextDestructorCallback.
+  * Call clGetDeviceIDs directly through the dispatch table
+- Drop patch:
+  * ocl-icd-gcc10.patch (fixed upstream)
+
+---

Old:

  ocl-icd-2.2.12.tar.gz
  ocl-icd-gcc10.patch

New:

  ocl-icd-2.2.13.tar.gz



Other differences:
--
++ ocl-icd.spec ++
--- /var/tmp/diff_new_pack.SJyGDL/_old  2020-10-26 16:20:07.079118739 +0100
+++ /var/tmp/diff_new_pack.SJyGDL/_new  2020-10-26 16:20:07.083118742 +0100
@@ -17,15 +17,13 @@
 
 
 Name:   ocl-icd
-Version:2.2.12
+Version:2.2.13
 Release:0
 Summary:OpenCL ICD Bindings
 License:BSD-2-Clause
 URL:https://github.com/OCL-dev/ocl-icd
 Source: 
https://github.com/OCL-dev/ocl-icd/archive/v%{version}/%{name}-%{version}.tar.gz
 Source1:baselibs.conf
-# PATCH-FIx-UPSTREAM ocl-icd-gcc10.patch dims...@opensuse.org -- Fix build 
with gcc10
-Patch0: ocl-icd-gcc10.patch
 # PATCH-FEATURE-OPENSUSE n_UsrShare.patch boo#1173005, comment#8
 Patch1: n_UsrShare.patch
 BuildRequires:  libtool

++ ocl-icd-2.2.12.tar.gz -> ocl-icd-2.2.13.tar.gz ++
 8504 lines of diff (skipped)




commit ocl-icd for openSUSE:Factory

2020-09-01 Thread root
Hello community,

here is the log from the commit of package ocl-icd for openSUSE:Factory checked 
in at 2020-09-01 20:10:22

Comparing /work/SRC/openSUSE:Factory/ocl-icd (Old)
 and  /work/SRC/openSUSE:Factory/.ocl-icd.new.3399 (New)


Package is "ocl-icd"

Tue Sep  1 20:10:22 2020 rev:13 rq:830979 version:2.2.12

Changes:

--- /work/SRC/openSUSE:Factory/ocl-icd/ocl-icd.changes  2020-06-24 
15:49:03.524448405 +0200
+++ /work/SRC/openSUSE:Factory/.ocl-icd.new.3399/ocl-icd.changes
2020-09-01 20:10:40.760685325 +0200
@@ -1,0 +2,13 @@
+Mon Aug 31 19:03:27 UTC 2020 - Stefan Dirsch 
+
+- added patch markups to specfile for better documentation
+
+---
+Sat Aug 22 16:49:25 UTC 2020 - Stefan Dirsch 
+
+- n_UsrShare.patch
+  * first try /etc/OpenCL/vendors, then /usr/share/OpenCL/vendors
+  (boo#1173005, comment#8)
+- supersedes configure option --enable-custom-vendordir
+
+---

New:

  n_UsrShare.patch



Other differences:
--
++ ocl-icd.spec ++
--- /var/tmp/diff_new_pack.VvrqYS/_old  2020-09-01 20:10:41.368685609 +0200
+++ /var/tmp/diff_new_pack.VvrqYS/_new  2020-09-01 20:10:41.372685611 +0200
@@ -26,6 +26,8 @@
 Source1:baselibs.conf
 # PATCH-FIx-UPSTREAM ocl-icd-gcc10.patch dims...@opensuse.org -- Fix build 
with gcc10
 Patch0: ocl-icd-gcc10.patch
+# PATCH-FEATURE-OPENSUSE n_UsrShare.patch boo#1173005, comment#8
+Patch1: n_UsrShare.patch
 BuildRequires:  libtool
 BuildRequires:  opencl-headers >= 2.2
 BuildRequires:  pkgconfig
@@ -73,7 +75,7 @@
 
 %build
 ./bootstrap
-%configure --enable-custom-vendordir=%{_datadir}/OpenCL/vendors
+%configure
 %make_build stamp-generator stamp-generator-dummy
 %make_build
 

++ n_UsrShare.patch ++
Common subdirectories: ocl-icd-2.2.12.orig/m4 and ocl-icd-2.2.12/m4
diff -u -p ocl-icd-2.2.12.orig/ocl_icd_loader.c ocl-icd-2.2.12/ocl_icd_loader.c
--- ocl-icd-2.2.12.orig/ocl_icd_loader.c2020-08-22 18:35:11.229578000 
+0200
+++ ocl-icd-2.2.12/ocl_icd_loader.c 2020-08-22 20:31:52.943988000 +0200
@@ -583,8 +583,15 @@ static void __initClIcd( void ) {
   const char* dir_path=getenv("OCL_ICD_VENDORS");
   const char* vendor_path=getenv("OPENCL_VENDOR_PATH");
   if (! vendor_path || vendor_path[0]==0) {
+struct stat buf;
+int ret;
 vendor_path=ETC_OPENCL_VENDORS;
 debug(D_DUMP, "OPENCL_VENDOR_PATH unset or empty. Using hard-coded path 
'%s'", vendor_path);
+ret=stat(vendor_path, );
+if (ret != 0) {
+  debug(D_WARN, "Cannot stat '%s'. Trying /usr/share/OpenCL/vendors", 
vendor_path);
+  vendor_path="/usr/share/OpenCL/vendors";
+}
   } else {
 debug(D_DUMP, "OPENCL_VENDOR_PATH set to '%s', using it", vendor_path);
   }



commit ocl-icd for openSUSE:Factory

2020-06-24 Thread root
Hello community,

here is the log from the commit of package ocl-icd for openSUSE:Factory checked 
in at 2020-06-24 15:48:57

Comparing /work/SRC/openSUSE:Factory/ocl-icd (Old)
 and  /work/SRC/openSUSE:Factory/.ocl-icd.new.2956 (New)


Package is "ocl-icd"

Wed Jun 24 15:48:57 2020 rev:12 rq:816703 version:2.2.12

Changes:

--- /work/SRC/openSUSE:Factory/ocl-icd/ocl-icd.changes  2020-06-23 
21:07:52.046476673 +0200
+++ /work/SRC/openSUSE:Factory/.ocl-icd.new.2956/ocl-icd.changes
2020-06-24 15:49:03.524448405 +0200
@@ -1,0 +2,6 @@
+Tue Jun 23 18:18:54 UTC 2020 - Stefan Dirsch 
+
+- switch from /usr/etc/OpenCL/vendors to /usr/share/OpenCL/vendors
+  for vendor specific .icd files (boo#1173005)
+
+---



Other differences:
--
++ ocl-icd.spec ++
--- /var/tmp/diff_new_pack.TUkEub/_old  2020-06-24 15:49:04.072450702 +0200
+++ /var/tmp/diff_new_pack.TUkEub/_new  2020-06-24 15:49:04.076450719 +0200
@@ -16,10 +16,6 @@
 #
 
 
-%if 0%{?suse_version} < 1550
-  %define _distconfdir /etc
-%endif
-
 Name:   ocl-icd
 Version:2.2.12
 Release:0
@@ -77,7 +73,7 @@
 
 %build
 ./bootstrap
-%configure --enable-custom-vendordir=%{_distconfdir}/OpenCL/vendors
+%configure --enable-custom-vendordir=%{_datadir}/OpenCL/vendors
 %make_build stamp-generator stamp-generator-dummy
 %make_build
 




commit ocl-icd for openSUSE:Factory

2020-06-23 Thread root
Hello community,

here is the log from the commit of package ocl-icd for openSUSE:Factory checked 
in at 2020-06-23 21:07:10

Comparing /work/SRC/openSUSE:Factory/ocl-icd (Old)
 and  /work/SRC/openSUSE:Factory/.ocl-icd.new.2956 (New)


Package is "ocl-icd"

Tue Jun 23 21:07:10 2020 rev:11 rq:816579 version:2.2.12

Changes:

--- /work/SRC/openSUSE:Factory/ocl-icd/ocl-icd.changes  2020-06-03 
20:36:00.149827084 +0200
+++ /work/SRC/openSUSE:Factory/.ocl-icd.new.2956/ocl-icd.changes
2020-06-23 21:07:52.046476673 +0200
@@ -1,0 +2,8 @@
+Thu Jun 18 10:20:08 UTC 2020 - Stefan Dirsch 
+
+- switch to /usr/etc/OpenCL/vendors for vendor specific .icd files
+  (boo#1173005); currently I'm only aware of Mesa using it (taking
+  care about adjusting this myself); NVIDIA is using its own
+  libOpenCL ...
+
+---



Other differences:
--
++ ocl-icd.spec ++
--- /var/tmp/diff_new_pack.655LiX/_old  2020-06-23 21:07:53.906482682 +0200
+++ /var/tmp/diff_new_pack.655LiX/_new  2020-06-23 21:07:53.910482695 +0200
@@ -16,6 +16,10 @@
 #
 
 
+%if 0%{?suse_version} < 1550
+  %define _distconfdir /etc
+%endif
+
 Name:   ocl-icd
 Version:2.2.12
 Release:0
@@ -73,7 +77,7 @@
 
 %build
 ./bootstrap
-%configure
+%configure --enable-custom-vendordir=%{_distconfdir}/OpenCL/vendors
 %make_build stamp-generator stamp-generator-dummy
 %make_build
 




commit ocl-icd for openSUSE:Factory

2020-06-03 Thread root
Hello community,

here is the log from the commit of package ocl-icd for openSUSE:Factory checked 
in at 2020-06-03 20:34:59

Comparing /work/SRC/openSUSE:Factory/ocl-icd (Old)
 and  /work/SRC/openSUSE:Factory/.ocl-icd.new.3606 (New)


Package is "ocl-icd"

Wed Jun  3 20:34:59 2020 rev:10 rq:81 version:2.2.12

Changes:

--- /work/SRC/openSUSE:Factory/ocl-icd/ocl-icd.changes  2020-02-27 
14:37:04.265999255 +0100
+++ /work/SRC/openSUSE:Factory/.ocl-icd.new.3606/ocl-icd.changes
2020-06-03 20:36:00.149827084 +0200
@@ -1,0 +2,10 @@
+Wed Jun  3 10:56:53 UTC 2020 - Dominique Leuenberger 
+
+- Add ocl-icd-gcc10.patch: Fix build with gcc10 (boo#1172436).
+
+---
+Sat May 30 08:57:18 UTC 2020 - Marcus Meissner 
+
+- add baselibs.conf to build 32bit binaries for Wine (bsc#1172303)
+
+---

New:

  baselibs.conf
  ocl-icd-gcc10.patch



Other differences:
--
++ ocl-icd.spec ++
--- /var/tmp/diff_new_pack.UiscZU/_old  2020-06-03 20:36:01.429831096 +0200
+++ /var/tmp/diff_new_pack.UiscZU/_new  2020-06-03 20:36:01.433831108 +0200
@@ -23,6 +23,9 @@
 License:BSD-2-Clause
 URL:https://github.com/OCL-dev/ocl-icd
 Source: 
https://github.com/OCL-dev/ocl-icd/archive/v%{version}/%{name}-%{version}.tar.gz
+Source1:baselibs.conf
+# PATCH-FIx-UPSTREAM ocl-icd-gcc10.patch dims...@opensuse.org -- Fix build 
with gcc10
+Patch0: ocl-icd-gcc10.patch
 BuildRequires:  libtool
 BuildRequires:  opencl-headers >= 2.2
 BuildRequires:  pkgconfig
@@ -66,7 +69,7 @@
 use ocl-icd for ICD functionality.
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
 ./bootstrap

++ baselibs.conf ++
libOpenCL1
ocl-icd-devel
requires "libOpenCL1- = %version"
++ ocl-icd-gcc10.patch ++
>From 4667bddd365bcc1dc66c483835971f0083b44b1d Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich 
Date: Wed, 22 Jan 2020 19:38:23 +
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"
 }




commit ocl-icd for openSUSE:Factory

2020-02-27 Thread root
Hello community,

here is the log from the commit of package ocl-icd for openSUSE:Factory checked 
in at 2020-02-27 14:36:48

Comparing /work/SRC/openSUSE:Factory/ocl-icd (Old)
 and  /work/SRC/openSUSE:Factory/.ocl-icd.new.26092 (New)


Package is "ocl-icd"

Thu Feb 27 14:36:48 2020 rev:9 rq:779470 version:2.2.12

Changes:

--- /work/SRC/openSUSE:Factory/ocl-icd/ocl-icd.changes  2019-08-28 
16:04:52.890769839 +0200
+++ /work/SRC/openSUSE:Factory/.ocl-icd.new.26092/ocl-icd.changes   
2020-02-27 14:37:04.265999255 +0100
@@ -1,0 +2,8 @@
+Wed Feb 26 12:25:52 UTC 2020 - Tomáš Chvátal 
+
+- Remove condition for SLE11 build as it is unresolvable anyway
+- Require update-alternatives only where really needed
+- Require opencl-headers in the develpackage as otherwise all
+  those that pull the devel would need to do it on their own.
+
+---



Other differences:
--
++ ocl-icd.spec ++
--- /var/tmp/diff_new_pack.c06NB8/_old  2020-02-27 14:37:05.786002390 +0100
+++ /var/tmp/diff_new_pack.c06NB8/_new  2020-02-27 14:37:05.786002390 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package ocl-icd
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -21,7 +21,6 @@
 Release:0
 Summary:OpenCL ICD Bindings
 License:BSD-2-Clause
-Group:  System/Libraries
 URL:https://github.com/OCL-dev/ocl-icd
 Source: 
https://github.com/OCL-dev/ocl-icd/archive/v%{version}/%{name}-%{version}.tar.gz
 BuildRequires:  libtool
@@ -29,11 +28,6 @@
 BuildRequires:  pkgconfig
 BuildRequires:  ruby
 BuildRequires:  pkgconfig(egl)
-%if (0%{?sle_version} >= 150100 || 0%{?suse_version} >= 1550)
-BuildRequires:  update-alternatives
-Requires(pre):  update-alternatives
-Requires(post): update-alternatives
-%endif
 
 %description
 OpenCL is a royalty-free standard for cross-platform, parallel programming
@@ -46,11 +40,10 @@
 
 %package -n libOpenCL1
 Summary:OpenCL ICD Bindings
-Group:  System/Libraries
 Suggests:   pocl
 %if (0%{?sle_version} >= 150100 || 0%{?suse_version} >= 1550)
-Requires(pre):  update-alternatives
 Requires(post): update-alternatives
+Requires(pre):  update-alternatives
 %endif
 
 %description -n libOpenCL1
@@ -64,8 +57,8 @@
 
 %packagedevel
 Summary:Development files of ocl-icd
-Group:  Development/Libraries/C and C++
 Requires:   libOpenCL1 = %{version}
+Requires:   opencl-headers >= 2.2
 Requires:   pkgconfig(egl)
 
 %descriptiondevel
@@ -78,15 +71,8 @@
 %build
 ./bootstrap
 %configure
-make %{?_smp_mflags} stamp-generator stamp-generator-dummy
-%if 0%{?sles_version} || (0%{?suse_version} && 0%{?suse_version} <= 1140)
-for i in *.h *.c; do
-sed -i -e '/#[ ]*pragma GCC diagnostic push/d
-   /#[ ]*pragma GCC diagnostic pop/d
-   /#[ ]*pragma GCC diagnostic ignored "-Wcpp"/d' $i
-done
-%endif
-make %{?_smp_mflags}
+%make_build stamp-generator stamp-generator-dummy
+%make_build
 
 %install
 %make_install
@@ -104,7 +90,6 @@
 %endif
 
 %if (0%{?sle_version} >= 150100 || 0%{?suse_version} >= 1550)
-
 %post -n libOpenCL1
 # apparently needed when updating from a pre update-alternatives package ...
 rm -f %{_libdir}/libOpenCL.so.1.*
@@ -116,11 +101,8 @@
 if [ "$1" = 0 ] ; then
%{_sbindir}/update-alternatives --remove libOpenCL.so.1  
%{_libdir}/ocl-icd/libOpenCL.so.1
 fi
-
 %else
-
 %post -n libOpenCL1 -p /sbin/ldconfig
-
 %endif
 
 %postun -n libOpenCL1 -p /sbin/ldconfig
@@ -135,7 +117,7 @@
 %endif
 
 %check
-make check
+%make_build check
 
 %files -n libOpenCL1
 %doc README




commit ocl-icd for openSUSE:Factory

2019-08-28 Thread root
Hello community,

here is the log from the commit of package ocl-icd for openSUSE:Factory checked 
in at 2019-08-28 16:04:51

Comparing /work/SRC/openSUSE:Factory/ocl-icd (Old)
 and  /work/SRC/openSUSE:Factory/.ocl-icd.new.7948 (New)


Package is "ocl-icd"

Wed Aug 28 16:04:51 2019 rev:8 rq:726255 version:2.2.12

Changes:

--- /work/SRC/openSUSE:Factory/ocl-icd/ocl-icd.changes  2019-01-24 
14:11:36.831487122 +0100
+++ /work/SRC/openSUSE:Factory/.ocl-icd.new.7948/ocl-icd.changes
2019-08-28 16:04:52.890769839 +0200
@@ -1,0 +2,11 @@
+Mon Aug  5 15:57:04 UTC 2019 - Antoine Belvire 
+
+- Update to version 2.2.12:
+  * Switched khronos headers to OpenCL 2.2.
+  * Added OpenCL 2.2 support.
+- Update URL to GitHub repository since previous URL is not
+  accessible anymore.
+- Only suggest pocl instead of recommending it.
+- Add check section.
+
+---

Old:

  ocl-icd-2.2.11.tar.gz

New:

  ocl-icd-2.2.12.tar.gz



Other differences:
--
++ ocl-icd.spec ++
--- /var/tmp/diff_new_pack.nEZd8V/_old  2019-08-28 16:04:53.522769744 +0200
+++ /var/tmp/diff_new_pack.nEZd8V/_new  2019-08-28 16:04:53.522769744 +0200
@@ -12,19 +12,20 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 Name:   ocl-icd
-Version:2.2.11
+Version:2.2.12
 Release:0
 Summary:OpenCL ICD Bindings
 License:BSD-2-Clause
 Group:  System/Libraries
-Url:https://forge.imag.fr/projects/ocl-icd/
-Source: 
https://forge.imag.fr/frs/download.php/814/%{name}-%{version}.tar.gz
-BuildRequires:  opencl-headers >= 1.2
+URL:https://github.com/OCL-dev/ocl-icd
+Source: 
https://github.com/OCL-dev/ocl-icd/archive/v%{version}/%{name}-%{version}.tar.gz
+BuildRequires:  libtool
+BuildRequires:  opencl-headers >= 2.2
 BuildRequires:  pkgconfig
 BuildRequires:  ruby
 BuildRequires:  pkgconfig(egl)
@@ -46,7 +47,7 @@
 %package -n libOpenCL1
 Summary:OpenCL ICD Bindings
 Group:  System/Libraries
-Recommends: pocl
+Suggests:   pocl
 %if (0%{?sle_version} >= 150100 || 0%{?suse_version} >= 1550)
 Requires(pre):  update-alternatives
 Requires(post): update-alternatives
@@ -75,6 +76,7 @@
 %setup -q
 
 %build
+./bootstrap
 %configure
 make %{?_smp_mflags} stamp-generator stamp-generator-dummy
 %if 0%{?sles_version} || (0%{?suse_version} && 0%{?suse_version} <= 1140)
@@ -132,8 +134,10 @@
 fi
 %endif
 
+%check
+make check
+
 %files -n libOpenCL1
-%defattr(-, root, root)
 %doc README
 %if (0%{?sle_version} >= 150100 || 0%{?suse_version} >= 1550)
 %dir %{_libdir}/ocl-icd
@@ -145,8 +149,8 @@
 %endif
 
 %files devel
-%defattr(-, root, root)
-%doc README NEWS COPYING
+%doc README NEWS
+%license COPYING
 %doc instdocs/*
 %{_libdir}/libOpenCL.so
 %{_libdir}/pkgconfig/OpenCL.pc

++ ocl-icd-2.2.11.tar.gz -> ocl-icd-2.2.12.tar.gz ++
 52346 lines of diff (skipped)




commit ocl-icd for openSUSE:Factory

2019-01-24 Thread root
Hello community,

here is the log from the commit of package ocl-icd for openSUSE:Factory checked 
in at 2019-01-24 14:11:36

Comparing /work/SRC/openSUSE:Factory/ocl-icd (Old)
 and  /work/SRC/openSUSE:Factory/.ocl-icd.new.28833 (New)


Package is "ocl-icd"

Thu Jan 24 14:11:36 2019 rev:7 rq:667197 version:2.2.11

Changes:

--- /work/SRC/openSUSE:Factory/ocl-icd/ocl-icd.changes  2017-07-12 
19:36:49.009476316 +0200
+++ /work/SRC/openSUSE:Factory/.ocl-icd.new.28833/ocl-icd.changes   
2019-01-24 14:11:36.831487122 +0100
@@ -1,0 +2,17 @@
+Sat Jan 19 21:35:38 UTC 2019 - mar...@gmx.de
+
+- Add missing Requires(post): update-alternatives
+
+---
+Mon Jan 14 01:22:04 UTC 2019 - sndir...@suse.com
+
+- limit usage of update-alernatives to sle15-sp1/Leap 15.1 and newer 
+
+---
+Sun Jan 13 19:51:09 UTC 2019 - sndir...@suse.com
+
+- sle15/Leap15 and newer: switch to usage of update-alternatives, 
+  so the package no longer conflicts with nvidia packages
+  (boo#1108304)
+
+---



Other differences:
--
++ ocl-icd.spec ++
--- /var/tmp/diff_new_pack.M8XnxX/_old  2019-01-24 14:11:37.167486735 +0100
+++ /var/tmp/diff_new_pack.M8XnxX/_new  2019-01-24 14:11:37.167486735 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package ocl-icd
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -28,6 +28,11 @@
 BuildRequires:  pkgconfig
 BuildRequires:  ruby
 BuildRequires:  pkgconfig(egl)
+%if (0%{?sle_version} >= 150100 || 0%{?suse_version} >= 1550)
+BuildRequires:  update-alternatives
+Requires(pre):  update-alternatives
+Requires(post): update-alternatives
+%endif
 
 %description
 OpenCL is a royalty-free standard for cross-platform, parallel programming
@@ -42,6 +47,10 @@
 Summary:OpenCL ICD Bindings
 Group:  System/Libraries
 Recommends: pocl
+%if (0%{?sle_version} >= 150100 || 0%{?suse_version} >= 1550)
+Requires(pre):  update-alternatives
+Requires(post): update-alternatives
+%endif
 
 %description -n libOpenCL1
 OpenCL is a royalty-free standard for cross-platform, parallel programming
@@ -82,14 +91,58 @@
 find %{buildroot} -type f -name "*.la" -delete -print
 rm -rf instdocs
 mv %{buildroot}%{_datadir}/doc/%{name} instdocs
+%if (0%{?sle_version} >= 150100 || 0%{?suse_version} >= 1550)
+install -d %{buildroot}/%{_sysconfdir}/alternatives \
+   %{buildroot}/%{_libdir}/ocl-icd
+mv %{buildroot}/%{_libdir}/libOpenCL.so.1* %{buildroot}/%{_libdir}/ocl-icd
+ln -snf ocl-icd/libOpenCL.so.1 %{buildroot}/%{_libdir}/libOpenCL.so
+# dummy target for update-alternatives
+ln -s %{_sysconfdir}/alternatives/libOpenCL.so.1 
%{buildroot}/%{_libdir}/libOpenCL.so.1
+ln -s %{_libdir}/ocl-icd/libOpenCL.so.1 
%{buildroot}/%{_sysconfdir}/alternatives/libOpenCL.so.1
+%endif
+
+%if (0%{?sle_version} >= 150100 || 0%{?suse_version} >= 1550)
+
+%post -n libOpenCL1
+# apparently needed when updating from a pre update-alternatives package ...
+rm -f %{_libdir}/libOpenCL.so.1.*
+%{_sbindir}/update-alternatives --force --install \
+   %{_libdir}/libOpenCL.so.1 libOpenCL.so.1 %{_libdir}/ocl-icd/libOpenCL.so.1  
50
+/sbin/ldconfig
+
+%preun -n libOpenCL1
+if [ "$1" = 0 ] ; then
+   %{_sbindir}/update-alternatives --remove libOpenCL.so.1  
%{_libdir}/ocl-icd/libOpenCL.so.1
+fi
+
+%else
 
 %post -n libOpenCL1 -p /sbin/ldconfig
+
+%endif
+
 %postun -n libOpenCL1 -p /sbin/ldconfig
 
+%if (0%{?sle_version} >= 150100 || 0%{?suse_version} >= 1550)
+%posttrans -n libOpenCL1
+if [ "$1" = 0 ] ; then
+  if ! [ -f %{_libdir}/libOpenCl.so.1 ] ; then
+  "%{_sbindir}/update-alternatives" --auto libOpenCL.so.1
+  fi
+fi
+%endif
+
 %files -n libOpenCL1
 %defattr(-, root, root)
 %doc README
+%if (0%{?sle_version} >= 150100 || 0%{?suse_version} >= 1550)
+%dir %{_libdir}/ocl-icd
+%{_libdir}/ocl-icd/libOpenCL.so.1*
+%ghost %{_libdir}/libOpenCL.so.1
+%ghost %{_sysconfdir}/alternatives/libOpenCL.so.1
+%else
 %{_libdir}/libOpenCL.so.1*
+%endif
 
 %files devel
 %defattr(-, root, root)




commit ocl-icd for openSUSE:Factory

2017-07-12 Thread root
Hello community,

here is the log from the commit of package ocl-icd for openSUSE:Factory checked 
in at 2017-07-12 19:36:33

Comparing /work/SRC/openSUSE:Factory/ocl-icd (Old)
 and  /work/SRC/openSUSE:Factory/.ocl-icd.new (New)


Package is "ocl-icd"

Wed Jul 12 19:36:33 2017 rev:6 rq:509642 version:2.2.11

Changes:

--- /work/SRC/openSUSE:Factory/ocl-icd/ocl-icd.changes  2017-01-24 
10:38:58.286950258 +0100
+++ /work/SRC/openSUSE:Factory/.ocl-icd.new/ocl-icd.changes 2017-07-12 
19:36:49.009476316 +0200
@@ -1,0 +2,6 @@
+Sat Jul  8 17:37:36 UTC 2017 - mar...@gmx.de
+
+- Recommend pocl when installing libOpenCL to get a better
+  "out of the box" OpenCL experience for (open)SUSE users.
+
+---



Other differences:
--
++ ocl-icd.spec ++
--- /var/tmp/diff_new_pack.ftOSJq/_old  2017-07-12 19:36:49.425417562 +0200
+++ /var/tmp/diff_new_pack.ftOSJq/_new  2017-07-12 19:36:49.425417562 +0200
@@ -41,6 +41,7 @@
 %package -n libOpenCL1
 Summary:OpenCL ICD Bindings
 Group:  System/Libraries
+Recommends: pocl
 
 %description -n libOpenCL1
 OpenCL is a royalty-free standard for cross-platform, parallel programming




commit ocl-icd for openSUSE:Factory

2017-01-24 Thread root
Hello community,

here is the log from the commit of package ocl-icd for openSUSE:Factory checked 
in at 2017-01-24 10:38:58

Comparing /work/SRC/openSUSE:Factory/ocl-icd (Old)
 and  /work/SRC/openSUSE:Factory/.ocl-icd.new (New)


Package is "ocl-icd"

Changes:

--- /work/SRC/openSUSE:Factory/ocl-icd/ocl-icd.changes  2016-02-17 
12:16:59.0 +0100
+++ /work/SRC/openSUSE:Factory/.ocl-icd.new/ocl-icd.changes 2017-01-24 
10:38:58.286950258 +0100
@@ -1,0 +2,23 @@
+Sun Jan 22 10:38:26 UTC 2017 - mplus...@suse.com
+
+- Update to version 2.2.11:
+  * Add autoconf option for custom vendors .icd path
+  * Make vendordir relative to
+  * Hack the docs to reflect configured vendordir
+  * Revert "By default, use platforme specific clGetPlatformInfo"
+  * Do not deference the plateform structure before checking it is an ICD
+  * Cleanup --enable-custom-vendordir usage
+  * [doc] ensure that files are correctly distributed and/or cleaned up
+  * [doc] improve doc
+  * [build] add notice message about what is choosen
+- Changes for version 2.2.10:
+  * Suppress warning due to shadowed variable name
+  * Static-const-ify ICD loader info strings
+  * Fallback to dispatch table for clGetPlatformInfo
+  * By default, use platforme specific clGetPlatformInfo
+- Changes for version 2.2.9:
+  * Update clGetICDLoaderInfoOCLICD to report version 2.1.
+  * Report the correct supported OpenCL version when asked
+  * Add support for OPENCL_VENDOR_PATH envvar
+
+---

Old:

  ocl-icd-2.2.8.tar.gz

New:

  ocl-icd-2.2.11.tar.gz



Other differences:
--
++ ocl-icd.spec ++
--- /var/tmp/diff_new_pack.2POUPE/_old  2017-01-24 10:38:58.826873576 +0100
+++ /var/tmp/diff_new_pack.2POUPE/_new  2017-01-24 10:38:58.830873008 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package ocl-icd
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,18 +17,17 @@
 
 
 Name:   ocl-icd
-Version:2.2.8
+Version:2.2.11
 Release:0
 Summary:OpenCL ICD Bindings
 License:BSD-2-Clause
 Group:  System/Libraries
 Url:https://forge.imag.fr/projects/ocl-icd/
-Source: 
https://forge.imag.fr/frs/download.php/698/%{name}-%{version}.tar.gz
+Source: 
https://forge.imag.fr/frs/download.php/814/%{name}-%{version}.tar.gz
 BuildRequires:  opencl-headers >= 1.2
-BuildRequires:  pkg-config
+BuildRequires:  pkgconfig
 BuildRequires:  ruby
 BuildRequires:  pkgconfig(egl)
-BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 %description
 OpenCL is a royalty-free standard for cross-platform, parallel programming
@@ -80,18 +79,16 @@
 %install
 %make_install
 find %{buildroot} -type f -name "*.la" -delete -print
-find %{buildroot} -type f -name "*.la" -delete -print
 rm -rf instdocs
 mv %{buildroot}%{_datadir}/doc/%{name} instdocs
 
 %post -n libOpenCL1 -p /sbin/ldconfig
-
 %postun -n libOpenCL1 -p /sbin/ldconfig
 
 %files -n libOpenCL1
 %defattr(-, root, root)
 %doc README
-%{_libdir}/libOpenCL.so.*
+%{_libdir}/libOpenCL.so.1*
 
 %files devel
 %defattr(-, root, root)

++ ocl-icd-2.2.8.tar.gz -> ocl-icd-2.2.11.tar.gz ++
 1943 lines of diff (skipped)




commit ocl-icd for openSUSE:Factory

2016-02-17 Thread h_root
Hello community,

here is the log from the commit of package ocl-icd for openSUSE:Factory checked 
in at 2016-02-17 10:26:08

Comparing /work/SRC/openSUSE:Factory/ocl-icd (Old)
 and  /work/SRC/openSUSE:Factory/.ocl-icd.new (New)


Package is "ocl-icd"

Changes:

--- /work/SRC/openSUSE:Factory/ocl-icd/ocl-icd.changes  2016-01-28 
17:25:09.0 +0100
+++ /work/SRC/openSUSE:Factory/.ocl-icd.new/ocl-icd.changes 2016-02-17 
12:16:59.0 +0100
@@ -1,0 +2,5 @@
+Mon Feb 15 10:01:42 UTC 2016 - mar...@gmx.de
+
+- Fix BuildRequires: ocl_icd.h includes CL/cl_egl.h
+
+---



Other differences:
--
++ ocl-icd.spec ++
--- /var/tmp/diff_new_pack.Hyolgb/_old  2016-02-17 12:17:00.0 +0100
+++ /var/tmp/diff_new_pack.Hyolgb/_new  2016-02-17 12:17:00.0 +0100
@@ -56,6 +56,7 @@
 Summary:Development files of ocl-icd
 Group:  Development/Libraries/C and C++
 Requires:   libOpenCL1 = %{version}
+Requires:   pkgconfig(egl)
 
 %descriptiondevel
 This package provides the files needed to build OpenCL client drivers that




commit ocl-icd for openSUSE:Factory

2016-01-29 Thread h_root
Hello community,

here is the log from the commit of package ocl-icd for openSUSE:Factory checked 
in at 2016-01-28 17:24:18

Comparing /work/SRC/openSUSE:Factory/ocl-icd (Old)
 and  /work/SRC/openSUSE:Factory/.ocl-icd.new (New)


Package is "ocl-icd"

Changes:

--- /work/SRC/openSUSE:Factory/ocl-icd/ocl-icd.changes  2015-09-08 
17:58:17.0 +0200
+++ /work/SRC/openSUSE:Factory/.ocl-icd.new/ocl-icd.changes 2016-01-28 
17:25:09.0 +0100
@@ -1,0 +2,6 @@
+Tue Jan 26 11:33:59 UTC 2016 - mplus...@suse.com
+
+- Update to 2.2.7
+  * See NEWS for full list of changes
+
+---

Old:

  ocl-icd-2.2.7.tar.gz

New:

  ocl-icd-2.2.8.tar.gz



Other differences:
--
++ ocl-icd.spec ++
--- /var/tmp/diff_new_pack.MzFYxj/_old  2016-01-28 17:25:09.0 +0100
+++ /var/tmp/diff_new_pack.MzFYxj/_new  2016-01-28 17:25:09.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package ocl-icd
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,16 +17,17 @@
 
 
 Name:   ocl-icd
-Version:2.2.7
+Version:2.2.8
 Release:0
 Summary:OpenCL ICD Bindings
 License:BSD-2-Clause
 Group:  System/Libraries
 Url:https://forge.imag.fr/projects/ocl-icd/
-Source: 
https://forge.imag.fr/frs/download.php/667/%{name}-%{version}.tar.gz
+Source: 
https://forge.imag.fr/frs/download.php/698/%{name}-%{version}.tar.gz
 BuildRequires:  opencl-headers >= 1.2
 BuildRequires:  pkg-config
 BuildRequires:  ruby
+BuildRequires:  pkgconfig(egl)
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 %description

++ ocl-icd-2.2.7.tar.gz -> ocl-icd-2.2.8.tar.gz ++
 2497 lines of diff (skipped)




commit ocl-icd for openSUSE:Factory

2015-09-08 Thread h_root
Hello community,

here is the log from the commit of package ocl-icd for openSUSE:Factory checked 
in at 2015-09-08 17:44:01

Comparing /work/SRC/openSUSE:Factory/ocl-icd (Old)
 and  /work/SRC/openSUSE:Factory/.ocl-icd.new (New)


Package is "ocl-icd"

Changes:

--- /work/SRC/openSUSE:Factory/ocl-icd/ocl-icd.changes  2015-07-03 
00:11:18.0 +0200
+++ /work/SRC/openSUSE:Factory/.ocl-icd.new/ocl-icd.changes 2015-09-08 
17:58:17.0 +0200
@@ -1,0 +2,7 @@
+Sun Sep  6 12:37:54 UTC 2015 - mplus...@suse.com
+
+- Update to 2.2.7
+  * See NEWS for full list of changes
+- Cleanup spec file with spec-cleaner
+
+---

Old:

  ocl-icd-2.1.3.tar.gz

New:

  ocl-icd-2.2.7.tar.gz



Other differences:
--
++ ocl-icd.spec ++
--- /var/tmp/diff_new_pack.5D4S19/_old  2015-09-08 17:58:19.0 +0200
+++ /var/tmp/diff_new_pack.5D4S19/_new  2015-09-08 17:58:19.0 +0200
@@ -17,17 +17,17 @@
 
 
 Name:   ocl-icd
-Version:2.1.3
+Version:2.2.7
 Release:0
 Summary:OpenCL ICD Bindings
 License:BSD-2-Clause
 Group:  System/Libraries
 Url:https://forge.imag.fr/projects/ocl-icd/
-Source: 
https://forge.imag.fr/frs/download.php/524/%{name}-%{version}.tar.gz
-BuildRoot:  %{_tmppath}/%{name}-%{version}-build
+Source: 
https://forge.imag.fr/frs/download.php/667/%{name}-%{version}.tar.gz
 BuildRequires:  opencl-headers >= 1.2
 BuildRequires:  pkg-config
 BuildRequires:  ruby
+BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 %description
 OpenCL is a royalty-free standard for cross-platform, parallel programming
@@ -65,7 +65,7 @@
 
 %build
 %configure
-make stamp-generator stamp-generator-dummy
+make %{?_smp_mflags} stamp-generator stamp-generator-dummy
 %if 0%{?sles_version} || (0%{?suse_version} && 0%{?suse_version} <= 1140)
 for i in *.h *.c; do
 sed -i -e '/#[ ]*pragma GCC diagnostic push/d
@@ -73,24 +73,18 @@
/#[ ]*pragma GCC diagnostic ignored "-Wcpp"/d' $i
 done
 %endif
-make
+make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
 %make_install
-find %{buildroot} -name '*.la'
-find %{buildroot} -name '*.la' -delete
+find %{buildroot} -type f -name "*.la" -delete -print
+find %{buildroot} -type f -name "*.la" -delete -print
 rm -rf instdocs
 mv %{buildroot}%{_datadir}/doc/%{name} instdocs
 
-%clean
-rm -rf %{buildroot}
-
-%post -n libOpenCL1
-ldconfig
+%post -n libOpenCL1 -p /sbin/ldconfig
 
-%postun -n libOpenCL1
-ldconfig
+%postun -n libOpenCL1 -p /sbin/ldconfig
 
 %files -n libOpenCL1
 %defattr(-, root, root)

++ ocl-icd-2.1.3.tar.gz -> ocl-icd-2.2.7.tar.gz ++
 11502 lines of diff (skipped)