nvidia & nvidia-utils: update to 355.11

5 files changed, 82 insertions, 41 deletions

diff --git a/abs/core/nvidia-utils/PKGBUILD b/abs/core/nvidia-utils/PKGBUILD
index 32ffbd6..47ce055 100644
--- a/abs/core/nvidia-utils/PKGBUILD
+++ b/abs/core/nvidia-utils/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: James Rayner <iphitus@gmail.com>
 pkgbase=nvidia-utils
 pkgname=('nvidia-utils' 'nvidia-libgl' 'opencl-nvidia')
-pkgver=352.09
+pkgver=355.11
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
@@ -12,8 +12,8 @@ license=('custom')
 options=('!strip')
 source=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run"
         "ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run")
-sha1sums=('1cc711e6c419ee03b0656cb4004aeb2e3effb4bd'
-          '3ab419b8ec442b6f59ff17d7aa53f72f66021810')
+sha1sums=('5e944003366c2ec701ba5e0faf897cc1fd0defbf'
+          'e21f03e2f641e8b36ac6f2df0f632b1ce5b83d63')
 
 [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
 [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
@@ -67,9 +67,9 @@ package_nvidia-libgl() {
     ln -s "libGL.so.${pkgver}" "${pkgdir}/usr/lib/libGL.so.1"
     ln -s "libGL.so.${pkgver}" "${pkgdir}/usr/lib/libGL.so"
 
-    ln -s "/usr/lib/nvidia/libEGL.so.${pkgver}" "${pkgdir}/usr/lib/libEGL.so.${pkgver}"
-    ln -s "libEGL.so.${pkgver}" "${pkgdir}/usr/lib/libEGL.so.1"
-    ln -s "libEGL.so.${pkgver}" "${pkgdir}/usr/lib/libEGL.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.$pkgver"
+    ln -s "libEGL.so.1" "${pkgdir}/usr/lib/libEGL.so"
 
     ln -s "/usr/lib/nvidia/libGLESv1_CM.so.${pkgver}" "${pkgdir}/usr/lib/libGLESv1_CM.so.${pkgver}"
     ln -s "libGLESv1_CM.so.${pkgver}" "${pkgdir}/usr/lib/libGLESv1_CM.so.1"
@@ -101,9 +101,12 @@ package_nvidia-utils() {
 
     # OpenGL libraries
     install -D -m755 "libGL.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libGL.so.${pkgver}"
-    install -D -m755 "libEGL.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libEGL.so.${pkgver}"
+    install -D -m755 "libEGL.so.1" "${pkgdir}/usr/lib/nvidia/libEGL.so.1"
+    install -D -m755 "libEGL_nvidia.so.0" "${pkgdir}/usr/lib/libEGL_nvidia.so.0"
     install -D -m755 "libGLESv1_CM.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libGLESv1_CM.so.${pkgver}"
     install -D -m755 "libGLESv2.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libGLESv2.so.${pkgver}"
+    install -D -m755 "libOpenGL.so.0" "${pkgdir}/usr/lib/libOpenGL.so.0"
+    install -D -m755 "libGLdispatch.so.0" "${pkgdir}/usr/lib/libGLdispatch.so.0"
 
     # OpenGL core library
     install -D -m755 "libnvidia-glcore.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-glcore.so.${pkgver}"
diff --git a/abs/core/nvidia/PKGBUILD b/abs/core/nvidia/PKGBUILD
index c2264cf..68faa0e 100644
--- a/abs/core/nvidia/PKGBUILD
+++ b/abs/core/nvidia/PKGBUILD
@@ -1,50 +1,59 @@
 # $Id$
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Maintainer: Thomas Baechler <thomas@archlinux.org>
+# Maintainer: Felix Yan <felixonmars@archlinux.org>
+# Contributor: Thomas Baechler <thomas@archlinux.org>
 
-pkgname=nvidia
-pkgver=352.09
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=355.11
 _extramodules=extramodules-3.18-ARCH
-pkgrel=1
+pkgrel=3
 pkgdesc="NVIDIA drivers for linux"
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
-depends=('linux>=3.18' 'linux<3.19' "nvidia-libgl" "nvidia-utils=${pkgver}")
-makedepends=('linux-headers>=3.18' 'linux-headers<3.19')
+makedepends=('nvidia-libgl' "nvidia-utils=${pkgver}" 'linux' 'linux-headers>=3.18' 'linux-headers<3.19')
 license=('custom')
-install=nvidia.install
 options=(!strip)
-source=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run"
-        "ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run")
-md5sums=('0e009686400c522209eaa8ab835ff81f'
-         'eb5ad6a07dc03e0a19d5f6fa069c494b')
+source_i686="ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run"
+source_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run"
+md5sums_i686='16d143ccafe99328a2ca8e5a396fd4bc'
+md5sums_x86_64='30133d89690f4683c4e289ec6c0247dc'
 
 [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
 [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
 
-prepare() {
+prepare() { 
     sh "${_pkg}.run" --extract-only
     cd "${_pkg}"
     # patches here
+
+    cp -a kernel kernel-dkms
+    cd kernel-dkms
+    sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+    sed -i 's/__JOBS/`nproc`/' dkms.conf
+    sed -i 's/__DKMS_MODULES//' dkms.conf
+    sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"' dkms.conf
 }
 
 build() {
     _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
     cd "${_pkg}"/kernel
     make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
-
-    if [[ "$CARCH" = "x86_64" ]]; then
-        cd uvm
-        make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
-    fi
 }
 
-package() {
+package_nvidia() {
+    pkgdesc="NVIDIA drivers for linux"
+    depends=('linux>=3.18' 'linux<3.19' "nvidia-utils=${pkgver}" 'libgl')
+    install=nvidia.install
+
     install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \
         "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
 
     if [[ "$CARCH" = "x86_64" ]]; then
-        install -D -m644 "${srcdir}/${_pkg}/kernel/uvm/nvidia-uvm.ko" \
+        install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia-uvm.ko" \
             "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-uvm.ko"
     fi
 
@@ -53,3 +62,17 @@ package() {
 
     echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
 }
+
+package_nvidia-dkms() {
+    pkgdesc="NVIDIA driver sources for linux"
+    depends=('dkms' "nvidia-utils=$pkgver")
+    optdepends=('linux-headers: Build the module for Arch kernel'
+                'linux-lts-headers: Build the module for LTS Arch kernel')
+    conflicts+=('nvidia')
+    install=nvidia-dkms.install
+
+    cd ${_pkg}
+    install -dm 755 "${pkgdir}"/usr/{lib/modprobe.d,src}
+    cp -dr --no-preserve='ownership' kernel-dkms "${pkgdir}/usr/src/nvidia-${pkgver}"
+    echo 'blacklist nouveau' > "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
+}
diff --git a/abs/core/nvidia/__changelog b/abs/core/nvidia/__changelog
index 8bc0490..a8f8250 100644
--- a/abs/core/nvidia/__changelog
+++ b/abs/core/nvidia/__changelog
@@ -1,2 +1 @@
-PKGBUILD: use dep "nvidia-libgl" instead of libgl
 nvidia.install: post_upgrade add root cron job to run xconfig.cron
diff --git a/abs/core/nvidia/nv-drm-343.36.patch b/abs/core/nvidia/nv-drm-343.36.patch
deleted file mode 100644
index 4f96201..0000000
--- a/abs/core/nvidia/nv-drm-343.36.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/kernel/nv-drm.c b/kernel/nv-drm.c
-index c0b41a0..700c193 100644
---- a/kernel/nv-drm.c
-+++ b/kernel/nv-drm.c
-@@ -128,6 +128,8 @@ static struct drm_driver nv_drm_driver = {
-     .gem_prime_vmap = nv_gem_prime_vmap,
-     .gem_prime_vunmap = nv_gem_prime_vunmap,
- 
-+    .set_busid = drm_pci_set_busid,
-+
-     .name = "nvidia-drm",
-     .desc = "NVIDIA DRM driver",
-     .date = "20130102",
-
diff --git a/abs/core/nvidia/nvidia-dkms.install b/abs/core/nvidia/nvidia-dkms.install
new file mode 100644
index 0000000..f43e9a0
--- /dev/null
+++ b/abs/core/nvidia/nvidia-dkms.install
@@ -0,0 +1,30 @@
+#/bin/sh
+
+# arg 1:  the new package version
+post_install() {
+  dkms add nvidia/${1%-*}
+  cat << EOF
+==> To build and install your modules run: dkms install nvidia/${1%-*}
+==> To do this automatically at startup run: systemctl enable dkms.service
+EOF
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_upgrade() {
+  pre_remove "$2"
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+  post_install "$1"
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  # Remove modules using dkms
+  [ -n "${1%-*}" ] && dkms remove nvidia/${1%-*} --all &>/dev/null || true
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
\ No newline at end of file