[PR PATCH] bumblebee: set correct MODPATH_NVIDIA after libglvnd switch

[voidlinux-github@inbox.vuxu.org]

[-- Attachment #1: Type: text/plain, Size: 1243 bytes --]

There is a new pull request by st3r4g against master on the void-packages repository

https://github.com/st3r4g/void-packages bumblebee-modulepath
https://github.com/void-linux/void-packages/pull/17933

bumblebee: set correct MODPATH_NVIDIA after libglvnd switch
This simple change results in a working bumblebee setup in a `mesa`/`nvidia390` Optimus laptop. After the switch to `libglvnd`, `bumblebee` can be setup correctly because `nvidia390` doesn't attempt to replace `mesa` anymore. Enabling the `bumblebeed` service makes Xorg pick up Mesa's GLX by default, while apps run with `optirun` use NVIDIA's GL. Arch has an additional [patch](https://git.archlinux.org/svntogit/community.git/tree/trunk/0008-libglvnd.patch?h=packages/bumblebee) for `libglvnd` support which sets the __GLVND_DISALLOW_PATCHING env variable but I didn't find it necessary, maybe it got fixed in a recent `libglvnd` update. If someone else finds that necessary, we can include it.
Tested on a Optimus laptop with `mesa`/`nvidia390` configuration (but should also work for `mesa`/`nvidia`, although NVIDIA's Prime Render Offload is a much better method performance-wise).

A patch file from https://github.com/void-linux/void-packages/pull/17933.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bumblebee-modulepath-17933.patch --]
[-- Type: text/x-diff, Size: 922 bytes --]

From cf264c8508bf515aeea5315793d858d5eb1caca3 Mon Sep 17 00:00:00 2001
From: Stefano Ragni <st3r4g@protonmail.com>
Date: Tue, 31 Dec 2019 13:20:17 +0100
Subject: [PATCH] bumblebee: set correct MODPATH_NVIDIA after libglvnd switch

---
 srcpkgs/bumblebee/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bumblebee/template b/srcpkgs/bumblebee/template
index 9f7004a3097..8e149dfe7c7 100644
--- a/srcpkgs/bumblebee/template
+++ b/srcpkgs/bumblebee/template
@@ -1,13 +1,13 @@
 # Template file for 'bumblebee'
 pkgname=bumblebee
 version=3.2.1
-revision=7
+revision=8
 archs="i686 x86_64"
 build_style=gnu-configure
 configure_args="
  CONF_DRIVER_MODULE_NVIDIA=nvidia
  CONF_LDPATH_NVIDIA=/usr/lib
- CONF_MODPATH_NVIDIA=/usr/lib/xorg/modules
+ CONF_MODPATH_NVIDIA=/usr/lib/nvidia/xorg,/usr/lib/xorg/modules
  --with-udev-rules=/usr/lib/udev/rules.d/
  --without-pidfile"
 conf_files="