From a42500512309ea50044d2db9a954a54fa506bcb0 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 24 Aug 2016 10:48:43 +0200 Subject: [PATCH] nvidia: update to 367.44. --- common/shlibs | 2 +- .../nvidia/files/0001-linux-4.7-i686.patch | 44 ------------- .../nvidia/files/0001-linux-4.7-x86_64.patch | 61 ------------------- srcpkgs/nvidia/template | 12 ++-- 4 files changed, 5 insertions(+), 114 deletions(-) delete mode 100644 srcpkgs/nvidia/files/0001-linux-4.7-i686.patch delete mode 100644 srcpkgs/nvidia/files/0001-linux-4.7-x86_64.patch diff --git a/common/shlibs b/common/shlibs index 21b20ab0473..a633e3d20e6 100644 --- a/common/shlibs +++ b/common/shlibs @@ -137,7 +137,7 @@ libnvidia-gtk2.so.346.47 nvidia-gtklibs-346.47_1 ignore libnvidia-gtk3.so.346.47 nvidia-gtklibs-346.47_1 ignore libnvidia-glcore.so.346.47 nvidia340-libs-340.46_1 ignore libnvidia-glsi.so.346.72 nvidia-libs-346.72_1 ignore -libnvidia-fatbinaryloader.so.367.35 nvidia-libs-367.35_1 ignore +libnvidia-fatbinaryloader.so.367.44 nvidia-libs-367.44_1 ignore libglapi.so.0 libglapi-7.11_1 libgbm.so.1 libgbm-9.0_1 librsvg-2.so.2 librsvg-2.26.0_1 diff --git a/srcpkgs/nvidia/files/0001-linux-4.7-i686.patch b/srcpkgs/nvidia/files/0001-linux-4.7-i686.patch deleted file mode 100644 index 23aa8899948..00000000000 --- a/srcpkgs/nvidia/files/0001-linux-4.7-i686.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- kernel/nvidia-drm/nvidia-drm-fb.c.orig -+++ kernel/nvidia-drm/nvidia-drm-fb.c -@@ -31,6 +31,7 @@ - #include "nvidia-drm-gem.h" - - #include -+#include - - static void nvidia_framebuffer_destroy(struct drm_framebuffer *fb) - { -@@ -114,7 +115,11 @@ - * We don't support any planar format, pick up first buffer only. - */ - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0) -+ gem = drm_gem_object_lookup(file, cmd->handles[0]); -+#else - gem = drm_gem_object_lookup(dev, file, cmd->handles[0]); -+#endif - - if (gem == NULL) - { ---- kernel/nvidia-drm/nvidia-drm-gem.c.orig -+++ kernel/nvidia-drm/nvidia-drm-gem.c -@@ -27,6 +27,7 @@ - #include "nvidia-drm-priv.h" - #include "nvidia-drm-ioctl.h" - #include "nvidia-drm-gem.h" -+#include - - static struct nvidia_drm_gem_object *nvidia_drm_gem_new - ( -@@ -408,7 +409,11 @@ - - mutex_lock(&dev->struct_mutex); - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0) -+ gem = drm_gem_object_lookup(file, handle); -+#else - gem = drm_gem_object_lookup(dev, file, handle); -+#endif - - if (gem == NULL) - { diff --git a/srcpkgs/nvidia/files/0001-linux-4.7-x86_64.patch b/srcpkgs/nvidia/files/0001-linux-4.7-x86_64.patch deleted file mode 100644 index f1869f7f715..00000000000 --- a/srcpkgs/nvidia/files/0001-linux-4.7-x86_64.patch +++ /dev/null @@ -1,61 +0,0 @@ ---- kernel/nvidia-drm/nvidia-drm-fb.c.orig -+++ kernel/nvidia-drm/nvidia-drm-fb.c -@@ -31,6 +31,7 @@ - #include "nvidia-drm-gem.h" - - #include -+#include - - static void nvidia_framebuffer_destroy(struct drm_framebuffer *fb) - { -@@ -114,7 +115,11 @@ - * We don't support any planar format, pick up first buffer only. - */ - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0) -+ gem = drm_gem_object_lookup(file, cmd->handles[0]); -+#else - gem = drm_gem_object_lookup(dev, file, cmd->handles[0]); -+#endif - - if (gem == NULL) - { ---- kernel/nvidia-drm/nvidia-drm-gem.c.orig -+++ kernel/nvidia-drm/nvidia-drm-gem.c -@@ -27,6 +27,7 @@ - #include "nvidia-drm-priv.h" - #include "nvidia-drm-ioctl.h" - #include "nvidia-drm-gem.h" -+#include - - static struct nvidia_drm_gem_object *nvidia_drm_gem_new - ( -@@ -408,7 +409,11 @@ - - mutex_lock(&dev->struct_mutex); - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0) -+ gem = drm_gem_object_lookup(file, handle); -+#else - gem = drm_gem_object_lookup(dev, file, handle); -+#endif - - if (gem == NULL) - { ---- kernel/nvidia-uvm/uvm_linux.h.orig -+++ kernel/nvidia-uvm/uvm_linux.h -@@ -554,12 +554,13 @@ - INIT_RADIX_TREE(tree, GFP_NOWAIT); - } - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,7,0) - static bool radix_tree_empty(struct radix_tree_root *tree) - { - void *dummy; - return radix_tree_gang_lookup(tree, &dummy, 0, 1) == 0; - } -- -+#endif - - #if !defined(NV_USLEEP_RANGE_PRESENT) - static void __sched usleep_range(unsigned long min, unsigned long max) diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template index dbe55aa7eed..967a3cd6ab2 100644 --- a/srcpkgs/nvidia/template +++ b/srcpkgs/nvidia/template @@ -3,8 +3,8 @@ _desc="NVIDIA drivers for linux (long-lived series)" pkgname=nvidia -version=367.35 -revision=2 +version=367.44 +revision=1 maintainer="Juan RP " license="Proprietary NVIDIA license" homepage="http://www.nvidia.com" @@ -24,11 +24,11 @@ build_options_default="glvnd" if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then _pkg="NVIDIA-Linux-x86-${version}" distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86/${version}/${_pkg}.run" - checksum=38cb22fa85ef74ea960d3e5d644838cd961984ffc32bb0d052414cc7fa32e315 + checksum=b2ad4d0d4a2e98528e877ae0d98c38039c2400b09cfb5928cd21899f3a991291 else _pkg="NVIDIA-Linux-x86_64-${version}-no-compat32" distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run" - checksum=8a6c554e9315e31e09d73fd60223ee4fbbe5507cd04c2e041c868a2080439354 + checksum=53ae50a381f57293dd3e6b00e87237606451af90a38e6772ac95f84160c563e7 fi subpackages="nvidia-gtklibs nvidia-dkms nvidia-opencl nvidia-libs" @@ -42,10 +42,6 @@ do_extract() { do_configure() { cd ${_pkg} # patches - case "$XBPS_TARGET_MACHINE" in - i686) patch -sNp0 -i ${FILESDIR}/0001-linux-4.7-i686.patch;; - x86_64) patch -sNp0 -i ${FILESDIR}/0001-linux-4.7-x86_64.patch;; - esac } do_install() { cd ${_pkg}