Bug#787952: jessie-pu: package ocl-icd/2.2.3-1
Package: release.debian.org
Tags: jessie
Followup-For: Bug #787952
User: release.debian.org@packages.debian.org
Usertags: pu
Here is the updated debdiff with the Breaks/Replaces update:
$ debdiff ocl-icd_2.2.3-1.dsc ocl-icd_2.2.3-1+deb8u1.dsc
diff -Nru ocl-icd-2.2.3/debian/changelog ocl-icd-2.2.3/debian/changelog
--- ocl-icd-2.2.3/debian/changelog 2014-10-05 17:07:47.000000000 +0200
+++ ocl-icd-2.2.3/debian/changelog 2015-07-21 17:16:19.000000000 +0200
@@ -1,3 +1,14 @@
+ocl-icd (2.2.3-1+deb8u1) jessie; urgency=medium
+
+ * Fix "clSVMFree never called in OpenCL ICD" (Closes: #787941)
+ The patch is backported from upstream
+ * ocl-icd-opencl-dev: Bump the Breaks/Replaces on nvidia-libopencl1 to
+ cover new upstream releases of nvidia-graphics-drivers (304.xx legacy
+ series) in wheezy (backported patch from sid by Andreas Beckmann in
+ #787952)
+
+ -- Vincent Danjean <vdanjean@debian.org> Thu, 11 Jun 2015 16:25:49 +0200
+
ocl-icd (2.2.3-1) unstable; urgency=medium
* New upstream release
diff -Nru ocl-icd-2.2.3/debian/control ocl-icd-2.2.3/debian/control
--- ocl-icd-2.2.3/debian/control 2014-10-05 17:07:47.000000000 +0200
+++ ocl-icd-2.2.3/debian/control 2015-07-21 17:16:19.000000000 +0200
@@ -41,8 +41,8 @@
Depends: ${shlibs:Depends}, ${misc:Depends},
opencl-headers (>= 1.2), ocl-icd-libopencl1 (= ${binary:Version})
Conflicts: opencl-dev
-Breaks: ocl-icd-libopencl1 (<< 2.1.3-5~), nvidia-libopencl1 (<<304.88-7~), amd-libopencl1 (<<1:13.4-4~)
-Replaces: opencl-dev, ocl-icd-libopencl1 (<< 2.1.3-5~), nvidia-libopencl1 (<<304.88-7~), amd-libopencl1 (<<1:13.4-4~)
+Breaks: ocl-icd-libopencl1 (<< 2.1.3-5~), nvidia-libopencl1 (<< 305~), amd-libopencl1 (<< 1:13.4-4~)
+Replaces: opencl-dev, ocl-icd-libopencl1 (<< 2.1.3-5~), nvidia-libopencl1 (<< 305~), amd-libopencl1 (<< 1:13.4-4~)
Recommends: libgl1-mesa-dev | libgl-dev
Description: OpenCL development files
OpenCL (Open Computing Language) is a multivendor open standard for
diff -Nru ocl-icd-2.2.3/debian/patches/0001-BUG-call-the-function-when-the-return-type-is-void.patch ocl-icd-2.2.3/debian/patches/0001-BUG-call-the-function-when-the-return-type-is-void.patch
--- ocl-icd-2.2.3/debian/patches/0001-BUG-call-the-function-when-the-return-type-is-void.patch 1970-01-01 01:00:00.000000000 +0100
+++ ocl-icd-2.2.3/debian/patches/0001-BUG-call-the-function-when-the-return-type-is-void.patch 2015-07-21 17:16:19.000000000 +0200
@@ -0,0 +1,30 @@
+From a224b6edd654ac741af3ea7ca5eb282198e3f5c6 Mon Sep 17 00:00:00 2001
+From: Vincent Danjean <Vincent.Danjean@ens-lyon.org>
+Date: Sat, 6 Jun 2015 18:05:23 +0200
+Subject: [PATCH] [BUG] call the function when the return type is void
+
+Before this patch, clSVMFree was never called...
+---
+ icd_generator.rb | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+--- a/icd_generator.rb
++++ b/icd_generator.rb
+@@ -574,12 +574,13 @@
+ error_handler.call
+ ocl_icd_loader_gen_source += " }\n"
+ if return_type != "void" then
+- ocl_icd_loader_gen_source += " RETURN(((struct _#{fps[0]} *)#{fps[1]})->dispatch->#{func_name}("
+- ocl_icd_loader_gen_source += ps.join(", ")
+- ocl_icd_loader_gen_source += "));\n"
++ return_debug="RETURN"
+ else
+- ocl_icd_loader_gen_source += " return;"
++ return_debug="return"
+ end
++ ocl_icd_loader_gen_source += " #{return_debug}(((struct _#{fps[0]} *)#{fps[1]})->dispatch->#{func_name}("
++ ocl_icd_loader_gen_source += ps.join(", ")
++ ocl_icd_loader_gen_source += "));\n"
+ ocl_icd_loader_gen_source += "}\n\n"
+ }
+ ocl_icd_loader_gen_source += "#pragma GCC visibility push(hidden)\n\n"
diff -Nru ocl-icd-2.2.3/debian/patches/series ocl-icd-2.2.3/debian/patches/series
--- ocl-icd-2.2.3/debian/patches/series 2014-10-05 17:07:47.000000000 +0200
+++ ocl-icd-2.2.3/debian/patches/series 2015-07-21 17:16:19.000000000 +0200
@@ -0,0 +1 @@
+0001-BUG-call-the-function-when-the-return-type-is-void.patch
Regards,
Vincent
-- System Information:
Debian Release: stretch/sid
APT prefers stable-updates
APT policy: (500, 'stable-updates'), (500, 'oldstable-updates'), (500, 'oldoldstable'), (500, 'unstable'), (500, 'testing'), (500, 'stable'), (500, 'oldstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386, armel, mipsel
Kernel: Linux 4.1.0-trunk-amd64 (SMP w/8 CPU cores)
Locale: LANG=fr_FR.utf8, LC_CTYPE=fr_FR.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
Reply to: