upgpkg: bumblebee 3.2.1-14

add a patch for libglvnd support (Bumblebee-Project/Bumblebee#845)

git-svn-id: file:///srv/repos/svn-community/svn@214085 9fca08f4-af9d-4005-b8df-a31f2cc04f65

trunk/0008-libglvnd.patch

@@ -0,0 +1,26 @@
+From c3ccbb7f6dd00038b1cb328898a29583e3a6c9be Mon Sep 17 00:00:00 2001
+From: SolarAquarion <shlomochoina@gmail.com>
+Date: Sun, 19 Feb 2017 16:53:09 -0500
+Subject: [PATCH] adding workaround for libglvnd
+
+---
+ src/optirun.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/optirun.c b/src/optirun.c
+index 65c83d4..ec72057 100644
+--- a/src/optirun.c
++++ b/src/optirun.c
+@@ -203,7 +203,11 @@ static int run_primus(int argc, char **argv) {
+
+   /* primus starts the X server when needed, fixes long-standing fork issue */
+   setenv("BUMBLEBEE_SOCKET", bb_config.socket_path, 1);
+-
++  
++/* primus needs this variable workaround for libglvnd enabled mesa */
++ 
++   setenv("__GLVND_DISALLOW_PATCHING", "1", 0);
++  
+   /* set LD_LIBRARY_PATH to primus_ld_path plus ld_path plus current LD_LIBRARY_PATH */
+   setenv("PRIMUS_DISPLAY", bb_config.x_display, 0);
+   char *ldpath_cur = getenv("LD_LIBRARY_PATH");

trunk/PKGBUILD

@@ -2,7 +2,7 @@
 
 pkgname=bumblebee
 pkgver=3.2.1
-pkgrel=13
+pkgrel=14
 pkgdesc="NVIDIA Optimus support for Linux through VirtualGL"
 arch=('i686' 'x86_64')
 depends=('virtualgl' 'glib2' 'mesa-libgl')
@@ -16,8 +16,6 @@ if [ "$CARCH" = "x86_64" ]; then
      optdepends[${#optdepends[@]}]='lib32-virtualgl: run 32bit applications with optirun'
      optdepends[${#optdepends[@]}]='lib32-primus: faster back-end for optirun'
 fi
-conflicts=('nvidia-libgl')
-provides=('nvidia-libgl')
 url="http://www.bumblebee-project.org"
 license=("GPL3")
 install='bumblebee.install'
@@ -32,6 +30,7 @@ source=("http://www.bumblebee-project.org/${pkgname}-${pkgver}.tar.gz"
         "0005-bb_nvidia_drm_detection_bug699_02.patch::https://github.com/arafey/Bumblebee/commit/fcfe596eb13f62ca9dd7de272a5a87ae843b2a00.patch"
         "0006-bb_hexadicimal_bug573.patch::https://github.com/Bumblebee-Project/Bumblebee/commit/2073f8537412aa47755eb6f3f22a114403e5285b.patch"
         "0007-bb_mutebblogger.patch"
+        "0008-libglvnd.patch"
         "bumblebee.conf")
 sha256sums=('1018703b07e2f607a4641249d69478ce076ae5a1e9dd6cff5694d394fa7ee30e'
             'aff3528d17a77ff19b4e0a7a10682b8351456f11795f71ef62b315e774fb408a'
@@ -41,6 +40,7 @@ sha256sums=('1018703b07e2f607a4641249d69478ce076ae5a1e9dd6cff5694d394fa7ee30e'
             '206f71c022b29a77227a3c7ba1f5cf68e219b957b5d807be9a30b6a6a7cafddc'
             '0b7c1f4bb2e27d131c6c21fd7006d075584917ac4259bd9899e6eca99efc0ece'
             'cbe3e1717bc80146b87d8f2ab1158ee9e094ea5bb2ca9a4a8c09c24b086a7792'
+            'b260d64a53617807afe21560db0592d114d7775b182e13fb59349f0157c8dba4'
             '1c3d4f5d40245a23a5f1cb1f2f6bd4274ff3c5b3749f76a09255191328ae3193')
 
 build() {