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

[Laurent Carlier]

    Date: Tuesday, February 14, 2017 @ 18:53:08
  Author: lcarlier
Revision: 288982

upgpkg: nvidia-utils 378.13-1

upstream update 378.13

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

-----------------------------+
 PKGBUILD                    |   68 +++++++++++++++++++++---------------------
 nvidia-drm-outputclass.conf |    8 ----
 2 files changed, 34 insertions(+), 42 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-02-14 18:10:50 UTC (rev 288981)
+++ PKGBUILD	2017-02-14 18:53:08 UTC (rev 288982)
@@ -4,9 +4,9 @@
 # Contributor: James Rayner <iphitus at gmail.com>
 
 pkgbase=nvidia-utils
-pkgname=('nvidia-utils' 'opencl-nvidia')
-pkgver=375.26
-pkgrel=4
+pkgname=('nvidia-utils' 'nvidia-libgl' 'opencl-nvidia')
+pkgver=378.13
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
 license=('custom')
@@ -14,9 +14,9 @@
 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_i686=('b0706e88ad173f6b9c7bd2e5a838c163')
-md5sums_x86_64=('5595fb385e41638c5118784114b03d9a')
+md5sums=('4f5562ee8f3171769e4638b35396c55d')
+md5sums_i686=('dd1077750af9a067739ec291fb24175f')
+md5sums_x86_64=('fe4d25b19a780a690cafc8e3b7c0113f')
 
 [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
 [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
@@ -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}"
-#
-#    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-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')
@@ -86,8 +86,7 @@
     optdepends=('nvidia-settings: configuration tool'
                 'xorg-server-devel: nvidia-xconfig'
                 'opencl-nvidia: OpenCL support')
-    conflicts=('nvidia-libgl')
-    provides=('vulkan-driver' 'opengl-driver' 'nvidia-libgl')
+    provides=('vulkan-driver')
     install="${pkgname}.install"
     cd "${_pkg}"
 
@@ -103,8 +102,9 @@
     ln -s "libGLX_nvidia.so.${pkgver}" "${pkgdir}/usr/lib/libGLX_indirect.so.0"
 
     # Wayland stuff
-    install -D -m755 "libnvidia-egl-wayland.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-egl-wayland.so.${pkgver}"
-    ln -s "libnvidia-egl-wayland.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-egl-wayland.so.0"
+    install -D -m755 "libnvidia-egl-wayland.so.1.0.1" "${pkgdir}/usr/lib/libnvidia-egl-wayland.so.1.0.1"
+    ln -s "libnvidia-egl-wayland.so.1.0.1" "${pkgdir}/usr/lib/libnvidia-egl-wayland.so.1"
+    install -D -m644 "10_nvidia_wayland.json" "${pkgdir}/usr/share/egl/egl_external_platform.d/10_nvidia_wayland.json"
 
     # OpenGL libraries
     install -D -m755 "libEGL_nvidia.so.${pkgver}" "${pkgdir}/usr/lib/libEGL_nvidia.so.${pkgver}"

Modified: nvidia-drm-outputclass.conf
===================================================================
--- nvidia-drm-outputclass.conf	2017-02-14 18:10:50 UTC (rev 288981)
+++ nvidia-drm-outputclass.conf	2017-02-14 18:53:08 UTC (rev 288982)
@@ -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