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 <sndir...@suse.com>
+
+- added patch markups to specfile for better documentation
+
+-------------------------------------------------------------------
+Sat Aug 22 16:49:25 UTC 2020 - Stefan Dirsch <sndir...@suse.com>
+
+- 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.c 2020-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, &buf);
+ 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);
}
