[arch-commits] Commit in bumblebee/trunk (PKGBUILD nvidia-drm-outputclass.conf)

[Sven-Hendrik Haase]

    Date: Monday, September 24, 2018 @ 06:47:19
  Author: svenstaro
Revision: 384337

upgpkg: bumblebee 3.2.1-19

Overwrite OutputClass and set PrimaryGPU due to FS#60102

Added:
  bumblebee/trunk/nvidia-drm-outputclass.conf
Modified:
  bumblebee/trunk/PKGBUILD

-----------------------------+
 PKGBUILD                    |   11 ++++++++---
 nvidia-drm-outputclass.conf |   15 +++++++++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-09-24 06:47:09 UTC (rev 384336)
+++ PKGBUILD	2018-09-24 06:47:19 UTC (rev 384337)
@@ -2,7 +2,7 @@
 
 pkgname=bumblebee
 pkgver=3.2.1
-pkgrel=18
+pkgrel=19
 pkgdesc="NVIDIA Optimus support for Linux through VirtualGL"
 arch=('x86_64')
 depends=('virtualgl' 'glib2' 'mesa-libgl')
@@ -30,7 +30,8 @@
         "0007-bb_mutebblogger.patch"
         "0008-libglvnd.patch"
         "bumblebee.conf"
-        "bumblebee.sysusers")
+        "bumblebee.sysusers"
+        "nvidia-drm-outputclass.conf")
 sha256sums=('1018703b07e2f607a4641249d69478ce076ae5a1e9dd6cff5694d394fa7ee30e'
             'aff3528d17a77ff19b4e0a7a10682b8351456f11795f71ef62b315e774fb408a'
             '70ad9b3d8e0d70a504110651c6f5f3a1b1d3c4c44eeb0fd49a4463e99124a47b'
@@ -41,7 +42,8 @@
             'cbe3e1717bc80146b87d8f2ab1158ee9e094ea5bb2ca9a4a8c09c24b086a7792'
             'b260d64a53617807afe21560db0592d114d7775b182e13fb59349f0157c8dba4'
             '1c3d4f5d40245a23a5f1cb1f2f6bd4274ff3c5b3749f76a09255191328ae3193'
-            '1bc209c21b4f6d1975ede4091829baf98d20b33100b9d21061393880bb391fd8')
+            '1bc209c21b4f6d1975ede4091829baf98d20b33100b9d21061393880bb391fd8'
+            '089d6dc247c9091b320c418b0d91ae6adda65e170934d178cdd4e9bd0785b182')
 
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
@@ -83,4 +85,7 @@
     sed -i "s/have/_have/" "${pkgdir}/usr/share/bash-completion/completions/optirun"
 
     install -Dm644 "$srcdir"/bumblebee.sysusers "$pkgdir"/usr/lib/sysusers.d/$pkgname.conf
+
+    # Overwrite the OutputClass due to https://bugs.archlinux.org/task/60102
+    install -D -m644 "${srcdir}/nvidia-drm-outputclass.conf" "${pkgdir}/usr/share/X11/xorg.conf.d/11-nvidia-drm-outputclass.conf"
 }

Added: nvidia-drm-outputclass.conf
===================================================================
--- nvidia-drm-outputclass.conf	                        (rev 0)
+++ nvidia-drm-outputclass.conf	2018-09-24 06:47:19 UTC (rev 384337)
@@ -0,0 +1,15 @@
+Section "OutputClass"
+    Identifier "intel"
+    MatchDriver "i915"
+    Driver "modesetting"
+EndSection
+
+Section "OutputClass"
+    Identifier "nvidia"
+    MatchDriver "nvidia-drm"
+    Driver "nvidia"
+    Option "AllowEmptyInitialConfiguration"
+    Option "PrimaryGPU" "yes"
+    ModulePath "/usr/lib/nvidia/xorg"
+    ModulePath "/usr/lib/xorg/modules"
+EndSection