Bug#770614: unblock: clinfo/0.0.20130513-2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package clinfo
This fixes one bug in the behavior of clinfo:
Don't exit on CL_DEVICE_NOT_FOUND (Closes: #767985)
which may happen if an ICD is installed that does not have supporting
hardware in the system. Instead of exiting the next ICD should be used.
IMHO this bug should have been filed with Severity: important
The reminder is some housekeeping (Homepage was deleted because it
returned 404). For jessie+1 we will switch to a different upstream.
unblock clinfo/0.0.20130513-2
Andreas
diff -Nru clinfo-0.0.20130513/debian/changelog clinfo-0.0.20130513/debian/changelog
--- clinfo-0.0.20130513/debian/changelog 2014-09-15 18:03:02.000000000 +0200
+++ clinfo-0.0.20130513/debian/changelog 2014-11-13 12:20:37.000000000 +0100
@@ -1,3 +1,17 @@
+clinfo (0.0.20130513-2) unstable; urgency=medium
+
+ [ Andreas Beckmann ]
+ * Set Maintainer to "Debian OpenCL Maintainers" with Simon's permission.
+ * Add Simon Richter and myself to Uploaders.
+ * Import packaging into git. Add Vcs-* URLs.
+ * Bump Standards-Version to 3.9.6, no changes needed.
+
+ [ Rebecca N. Palmer ]
+ * Don't exit on CL_DEVICE_NOT_FOUND (Closes: #767985)
+ * Fix typo in "endianness".
+
+ -- Andreas Beckmann <anbe@debian.org> Thu, 13 Nov 2014 12:16:40 +0100
+
clinfo (0.0.20130513-1.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru clinfo-0.0.20130513/debian/control clinfo-0.0.20130513/debian/control
--- clinfo-0.0.20130513/debian/control 2014-09-15 18:40:05.000000000 +0200
+++ clinfo-0.0.20130513/debian/control 2014-11-13 12:20:37.000000000 +0100
@@ -1,11 +1,15 @@
Source: clinfo
Section: admin
Priority: optional
-Maintainer: Simon Richter <sjr@debian.org>
+Maintainer: Debian OpenCL Maintainers <pkg-opencl-devel@lists.alioth.debian.org>
+Uploaders:
+ Simon Richter <sjr@debian.org>,
+ Andreas Beckmann <anbe@debian.org>,
Build-Depends: debhelper (>= 9.0.0), autotools-dev,
ocl-icd-opencl-dev | amd-opencl-dev | nvidia-opencl-dev
-Standards-Version: 3.9.4
-Homepage: http://www.simonrichter.eu/clinfo
+Standards-Version: 3.9.6
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-opencl/clinfo.git
+Vcs-Git: git://anonscm.debian.org/pkg-opencl/clinfo.git
Package: clinfo
Architecture: any
diff -Nru clinfo-0.0.20130513/debian/patches/fix-no-devices.diff clinfo-0.0.20130513/debian/patches/fix-no-devices.diff
--- clinfo-0.0.20130513/debian/patches/fix-no-devices.diff 1970-01-01 01:00:00.000000000 +0100
+++ clinfo-0.0.20130513/debian/patches/fix-no-devices.diff 2014-11-13 12:20:37.000000000 +0100
@@ -0,0 +1,20 @@
+Description: Don't error out on CL_DEVICE_NOT_FOUND
+
+If an ICD is installed on hardware it doesn't support, it will
+return CL_DEVICE_NOT_FOUND and 0 devices.
+This is expected behaviour, and should not be a fatal error.
+
+Author: Rebecca Palmer <rebecca_palmer@zoho.com>
+Bug-Debian: https://bugs.debian.org/767985
+
+--- clinfo-0.0.20130513.orig/platform.cpp
++++ clinfo-0.0.20130513/platform.cpp
+@@ -38,6 +38,8 @@ void platform::load()
+
+ cl_uint num_device_ids;
+ cl_int rc = clGetDeviceIDs(id, CL_DEVICE_TYPE_ALL, 0, 0, &num_device_ids);
++ if(rc == CL_DEVICE_NOT_FOUND)
++ return;
+ if(rc != CL_SUCCESS)
+ throw rc;
+
diff -Nru clinfo-0.0.20130513/debian/patches/series clinfo-0.0.20130513/debian/patches/series
--- clinfo-0.0.20130513/debian/patches/series 2014-09-15 18:02:35.000000000 +0200
+++ clinfo-0.0.20130513/debian/patches/series 2014-11-13 12:20:37.000000000 +0100
@@ -1 +1,3 @@
fix-opencl-1.1.diff
+fix-no-devices.diff
+spelling.diff
diff -Nru clinfo-0.0.20130513/debian/patches/spelling.diff clinfo-0.0.20130513/debian/patches/spelling.diff
--- clinfo-0.0.20130513/debian/patches/spelling.diff 1970-01-01 01:00:00.000000000 +0100
+++ clinfo-0.0.20130513/debian/patches/spelling.diff 2014-11-13 12:20:37.000000000 +0100
@@ -0,0 +1,14 @@
+Description: Fix typo
+
+Origin: lintian
+--- clinfo-0.0.20130513.orig/output_amd_compat.cpp
++++ clinfo-0.0.20130513/output_amd_compat.cpp
+@@ -96,7 +96,7 @@ void output_amd_compat_device(device con
+ std::cout << " Error correction support:\t\t\t " << d.error_correction_support << std::endl;
+ std::cout << " Unified memory for Host and Device:\t\t " << d.host_unified_memory << std::endl;
+ std::cout << " Profiling timer resolution:\t\t\t " << d.profiling_timer_resolution << std::endl;
+- std::cout << " Device endianess:\t\t\t\t " << (d.endian_little ? "Little" : "Big") << std::endl;
++ std::cout << " Device endianness:\t\t\t\t " << (d.endian_little ? "Little" : "Big") << std::endl;
+ std::cout << " Available:\t\t\t\t\t " << (d.available ? "Yes":"No") << std::endl;
+ std::cout << " Compiler available:\t\t\t\t " << (d.compiler_available ? "Yes":"No") << std::endl;
+ std::cout << " Execution capabilities:\t\t\t\t " << std::endl;
Reply to: