[boinc] 01/02: Add GPU detection patch fix

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script.

locutusofborg-guest pushed a commit to branch master
in repository boinc.

commit 0e2073c1c97c704c1e7702b854745099205c4312
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Tue Apr 5 10:46:05 2016 +0200

    Add GPU detection patch fix
---
 debian/changelog                                   | 11 +++++++-
 .../dcd9eb3c2ec1f729b12983bf5ee6395565871a22.patch | 30 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 37b9520..b9f5de2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+boinc (7.6.31+dfsg-5) unstable; urgency=medium
+
+  * Upload to unstable.
+  [ Christian Beer ]
+  * debian/patches/dcd9eb3c2ec1f729b12983bf5ee6395565871a22.patch:
+    fix nvidia GPU detection (Closes: #819990)
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Tue, 05 Apr 2016 10:44:47 +0200
+
 boinc (7.6.31+dfsg-4exp1) experimental; urgency=medium
 
   * Upload to experimental again, with the boinc-server-* packages.
@@ -7,7 +16,7 @@ boinc (7.6.31+dfsg-4exp1) experimental; urgency=medium
 boinc (7.6.31+dfsg-4) unstable; urgency=medium
 
   * Upload to unstable.
-    [ Graham Inggs ]
+  [ Graham Inggs ]
   * do not build cuda package on ppc64el, libcuda1 is not
     available there.
 
diff --git a/debian/patches/dcd9eb3c2ec1f729b12983bf5ee6395565871a22.patch b/debian/patches/dcd9eb3c2ec1f729b12983bf5ee6395565871a22.patch
new file mode 100644
index 0000000..1186a1d
--- /dev/null
+++ b/debian/patches/dcd9eb3c2ec1f729b12983bf5ee6395565871a22.patch
@@ -0,0 +1,30 @@
+From dcd9eb3c2ec1f729b12983bf5ee6395565871a22 Mon Sep 17 00:00:00 2001
+From: Christian Beer <christian.beer at aei.mpg.de>
+Date: Tue, 5 Apr 2016 07:43:22 +0200
+Subject: [PATCH] Client: fix nvidia_driver_version dlopen()
+
+On Debian only the versioned object can be opened. It usually is a symlink to the actual file.
+---
+ client/gpu_nvidia.cpp | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/client/gpu_nvidia.cpp b/client/gpu_nvidia.cpp
+index 5ca1640..b7a8f52 100644
+--- a/client/gpu_nvidia.cpp
++++ b/client/gpu_nvidia.cpp
+@@ -105,8 +105,13 @@ static int nvidia_driver_version() {
+     void *handle = NULL;
+     char driver_string[81];
+ 
+-    handle  = dlopen("libnvidia-ml.so", RTLD_NOW);
+-    if (!handle) goto end; 
++    handle  = dlopen("libnvidia-ml.so.1", RTLD_NOW);
++    if (!handle) {
++        handle  = dlopen("libnvidia-ml.so", RTLD_NOW);
++        if (!handle) {
++            goto end;
++        }
++    }
+ 
+     nvml_driver = (int(*)(char *, unsigned int)) dlsym(handle,  "nvmlSystemGetDriverVersion");
+     nvml_init = (int(*)(void)) dlsym(handle,  "nvmlInit");
diff --git a/debian/patches/series b/debian/patches/series
index dee3e12..f6c62f0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -29,3 +29,4 @@ file_upload_handler_in_sched_linking.patch
 disable_silent_rules.patch
 envargs.patch
 fix-underlinking.patch
+dcd9eb3c2ec1f729b12983bf5ee6395565871a22.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-boinc/boinc.git