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

Laurent Carlier lcarlier at archlinux.org
Mon Feb 27 09:31:03 UTC 2017


    Date: Monday, February 27, 2017 @ 09:31:02
  Author: lcarlier
Revision: 289602

upgpkg: nvidia-utils 378.13-2

rebuild without libglvnd update, not yet merged

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

-----------------------------+
 PKGBUILD                    |   36 +++++++++++++++++++++++++++++-------
 nvidia-drm-outputclass.conf |    8 --------
 2 files changed, 29 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-02-27 09:13:11 UTC (rev 289601)
+++ PKGBUILD	2017-02-27 09:31:02 UTC (rev 289602)
@@ -4,9 +4,9 @@
 # Contributor: James Rayner <iphitus at gmail.com>
 
 pkgbase=nvidia-utils
-pkgname=('nvidia-utils' 'opencl-nvidia')
+pkgname=('nvidia-utils' 'nvidia-libgl' 'opencl-nvidia')
 pkgver=378.13
-pkgrel=3
+pkgrel=2
 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=('158fc0ff11167957884768cfdc3dd77a')
+md5sums=('4f5562ee8f3171769e4638b35396c55d')
 md5sums_i686=('dd1077750af9a067739ec291fb24175f')
 md5sums_x86_64=('fe4d25b19a780a690cafc8e3b7c0113f')
 
@@ -55,6 +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}"
+
+    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')
@@ -61,11 +86,8 @@
     optdepends=('nvidia-settings: configuration tool'
                 'xorg-server-devel: nvidia-xconfig'
                 'opencl-nvidia: OpenCL support')
-    conflicts=('nvidia-libgl')
-    provides=('vulkan-driver' 'opengl-driver' 'nvidia-libgl')
-    replaces=('nvidia-libgl')
+    provides=('vulkan-driver')
     install="${pkgname}.install"
-
     cd "${_pkg}"
 
     # X driver

Modified: nvidia-drm-outputclass.conf
===================================================================
--- nvidia-drm-outputclass.conf	2017-02-27 09:13:11 UTC (rev 289601)
+++ nvidia-drm-outputclass.conf	2017-02-27 09:31:02 UTC (rev 289602)
@@ -2,13 +2,5 @@
     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