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

Laurent Carlier lcarlier at archlinux.org
Mon Feb 13 09:49:31 UTC 2017


    Date: Monday, February 13, 2017 @ 09:49:30
  Author: lcarlier
Revision: 288861

upgpkg: nvidia-utils 375.26-4

libglvnd rebuild

Modified:
  nvidia-utils/trunk/PKGBUILD
  nvidia-utils/trunk/nvidia-drm-outputclass.conf

-----------------------------+
 PKGBUILD                    |   57 +++++++++++++++++++++---------------------
 nvidia-drm-outputclass.conf |    8 +++++
 2 files changed, 37 insertions(+), 28 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-02-13 09:36:49 UTC (rev 288860)
+++ PKGBUILD	2017-02-13 09:49:30 UTC (rev 288861)
@@ -4,9 +4,9 @@
 # Contributor: James Rayner <iphitus at gmail.com>
 
 pkgbase=nvidia-utils
-pkgname=('nvidia-utils' 'nvidia-libgl' 'opencl-nvidia')
+pkgname=('nvidia-utils' 'opencl-nvidia')
 pkgver=375.26
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
 license=('custom')
@@ -14,7 +14,7 @@
 source=('nvidia-drm-outputclass.conf')
 source_i686=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run")
 source_x86_64=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run")
-md5sums=('4f5562ee8f3171769e4638b35396c55d')
+md5sums=('158fc0ff11167957884768cfdc3dd77a')
 md5sums_i686=('b0706e88ad173f6b9c7bd2e5a838c163')
 md5sums_x86_64=('5595fb385e41638c5118784114b03d9a')
 
@@ -55,31 +55,31 @@
     ln -s nvidia "${pkgdir}/usr/share/licenses/opencl-nvidia"
 }
 
-package_nvidia-libgl() {
-    pkgdesc="NVIDIA drivers libraries symlinks"
-    depends=('nvidia-utils')
-    conflicts=('libgl' 'libegl' 'libgles')
-    provides=('libgl' 'libegl' 'libgles')
-    cd "${_pkg}"
+#package_nvidia-libgl() {
+#    pkgdesc="NVIDIA drivers libraries symlinks"
+#    depends=('nvidia-utils')
+#    conflicts=('libgl' 'libegl' 'libgles')
+#    provides=('libgl' 'libegl' 'libgles')
+#    cd "${_pkg}"
+#
+#    mkdir -p "${pkgdir}/usr/lib/"
+#
+#    ln -s "/usr/lib/nvidia/libGL.so.1" "${pkgdir}/usr/lib/libGL.so.1"
+#    ln -s "libGL.so.1" "${pkgdir}/usr/lib/libGL.so"
+#
+#    ln -s "/usr/lib/nvidia/libEGL.so.1" "${pkgdir}/usr/lib/libEGL.so.1"
+#    ln -s "libEGL.so.1" "${pkgdir}/usr/lib/libEGL.so"
+#
+#    ln -s "/usr/lib/nvidia/libGLESv1_CM.so.1" "${pkgdir}/usr/lib/libGLESv1_CM.so.1"
+#    ln -s "libGLESv1_CM.so.1" "${pkgdir}/usr/lib/libGLESv1_CM.so"
+#
+#    ln -s "/usr/lib/nvidia/libGLESv2.so.2" "${pkgdir}/usr/lib/libGLESv2.so.2"
+#    ln -s "libGLESv2.so.2" "${pkgdir}/usr/lib/libGLESv2.so"
+#
+#    mkdir -p "${pkgdir}/usr/share/licenses"
+#    ln -s nvidia "${pkgdir}/usr/share/licenses/nvidia-libgl"
+#}
 
-    mkdir -p "${pkgdir}/usr/lib/"
-
-    ln -s "/usr/lib/nvidia/libGL.so.1" "${pkgdir}/usr/lib/libGL.so.1"
-    ln -s "libGL.so.1" "${pkgdir}/usr/lib/libGL.so"
-
-    ln -s "/usr/lib/nvidia/libEGL.so.1" "${pkgdir}/usr/lib/libEGL.so.1"
-    ln -s "libEGL.so.1" "${pkgdir}/usr/lib/libEGL.so"
-
-    ln -s "/usr/lib/nvidia/libGLESv1_CM.so.1" "${pkgdir}/usr/lib/libGLESv1_CM.so.1"
-    ln -s "libGLESv1_CM.so.1" "${pkgdir}/usr/lib/libGLESv1_CM.so"
-
-    ln -s "/usr/lib/nvidia/libGLESv2.so.2" "${pkgdir}/usr/lib/libGLESv2.so.2"
-    ln -s "libGLESv2.so.2" "${pkgdir}/usr/lib/libGLESv2.so"
-
-    mkdir -p "${pkgdir}/usr/share/licenses"
-    ln -s nvidia "${pkgdir}/usr/share/licenses/nvidia-libgl"
-}
-
 package_nvidia-utils() {
     pkgdesc="NVIDIA drivers utilities"
     depends=('xorg-server' 'libglvnd')
@@ -86,7 +86,8 @@
     optdepends=('nvidia-settings: configuration tool'
                 'xorg-server-devel: nvidia-xconfig'
                 'opencl-nvidia: OpenCL support')
-    provides=('vulkan-driver')
+    conflicts=('nvidia-libgl')
+    provides=('vulkan-driver' 'opengl-driver' 'nvidia-libgl')
     install="${pkgname}.install"
     cd "${_pkg}"
 

Modified: nvidia-drm-outputclass.conf
===================================================================
--- nvidia-drm-outputclass.conf	2017-02-13 09:36:49 UTC (rev 288860)
+++ nvidia-drm-outputclass.conf	2017-02-13 09:49:30 UTC (rev 288861)
@@ -2,5 +2,13 @@
     Identifier "nvidia"
     MatchDriver "nvidia-drm"
     Driver "nvidia"
+    Option "AllowEmptyInitialConfiguration"
+    Option "PrimaryGPU" "yes"
     ModulePath "/usr/lib/nvidia/xorg"
 EndSection
+
+Section "OutputClass"
+    Identifier "intel"
+    MatchDriver "i915"
+    Driver "modesetting"
+EndSection



More information about the arch-commits mailing list