diff options
-rw-r--r-- | .SRCINFO | 20 | ||||
-rw-r--r-- | PKGBUILD | 12 | ||||
-rw-r--r-- | linux-4.7.patch | 12 | ||||
-rw-r--r-- | linux-4.8.patch | 19 |
4 files changed, 17 insertions, 46 deletions
@@ -1,7 +1,7 @@ # Generated by mksrcinfo v8 # Wed Feb 10 11:39:08 UTC 2016 pkgbase = nvidia-full-beta-all - pkgver = 370.23 + pkgver = 370.28 pkgrel = 1 url = http://www.nvidia.com/ arch = i686 @@ -10,20 +10,18 @@ pkgbase = nvidia-full-beta-all makedepends = linux-headers options = !strip source = 20-nvidia.conf - source = linux-4.7.patch source = linux-4.8.patch md5sums = 2640eac092c220073f0668a7aaff61f7 - md5sums = 4ce4db437695790a73f132651a601889 - md5sums = 5a08e2109ebe7e597348796743337c01 - source_i686 = http://us.download.nvidia.com/XFree86/Linux-x86/370.23/NVIDIA-Linux-x86-370.23.run - md5sums_i686 = 7b7466e23ae6ffa97106c9749aee2628 - source_x86_64 = http://us.download.nvidia.com/XFree86/Linux-x86_64/370.23/NVIDIA-Linux-x86_64-370.23-no-compat32.run - md5sums_x86_64 = cbe2cee787e07f8775a3fd994c9263a9 + md5sums = 96a37004a3394b01385d3ea9d8e8fa86 + source_i686 = http://us.download.nvidia.com/XFree86/Linux-x86/370.28/NVIDIA-Linux-x86-370.28.run + md5sums_i686 = 7d3e1c691cd53852f422a93169268178 + source_x86_64 = http://us.download.nvidia.com/XFree86/Linux-x86_64/370.28/NVIDIA-Linux-x86_64-370.28-no-compat32.run + md5sums_x86_64 = 3bcd9a132e50a17b846869f1c57b9c75 pkgname = nvidia-full-beta-all pkgdesc = Full NVIDIA drivers' package for all kernels on the system (drivers and shared utilities and libraries) (beta version) install = nvidia-full-beta-all.install - depends = nvidia-utils-full-beta-all>=370.23 + depends = nvidia-utils-full-beta-all>=370.28 depends = libgl provides = nvidia conflicts = nvidia-96xx @@ -38,7 +36,7 @@ pkgname = nvidia-utils-full-beta-all optdepends = gtk3: nvidia-settings (GTK+ v3) optdepends = opencl-nvidia-full-beta-all: OpenCL support optdepends = xorg-server-devel: nvidia-xconfig - provides = nvidia-utils=370.23 + provides = nvidia-utils=370.28 provides = nvidia-settings provides = libglvnd conflicts = nvidia-utils @@ -68,7 +66,7 @@ pkgname = lib32-nvidia-utils-full-beta-all depends = lib32-zlib depends = lib32-gcc-libs optdepends = lib32-opencl-nvidia-full-beta-all: OpenCL support - provides = lib32-nvidia-utils=370.23 + provides = lib32-nvidia-utils=370.28 provides = lib32-libglvnd conflicts = lib32-nvidia-utils conflicts = lib32-libglvnd @@ -8,7 +8,7 @@ _lib32=0 pkgname=('nvidia-full-beta-all' 'nvidia-utils-full-beta-all' 'nvidia-libgl-full-beta-all' 'opencl-nvidia-full-beta-all') -pkgver=370.23 +pkgver=370.28 pkgrel=1 arch=('i686' 'x86_64') url="http://www.nvidia.com/" @@ -27,16 +27,14 @@ fi # Source source=('20-nvidia.conf' - 'linux-4.7.patch' 'linux-4.8.patch') 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/$_pkg.run") md5sums=('2640eac092c220073f0668a7aaff61f7' - '4ce4db437695790a73f132651a601889' - '5a08e2109ebe7e597348796743337c01') -md5sums_i686=('7b7466e23ae6ffa97106c9749aee2628') -md5sums_x86_64=('cbe2cee787e07f8775a3fd994c9263a9') -[[ $_pkg = NVIDIA-Linux-x86_64-$pkgver ]] && md5sums_x86_64=('65b99201ca894ea9a878593fbb19f0a3') + '96a37004a3394b01385d3ea9d8e8fa86') +md5sums_i686=('7d3e1c691cd53852f422a93169268178') +md5sums_x86_64=('3bcd9a132e50a17b846869f1c57b9c75') +[[ $_pkg = NVIDIA-Linux-x86_64-$pkgver ]] && md5sums_x86_64=('95a6401db6576eaeea6ba4bc06fb61d2') # Auto-detect patches (e.g. linux-4.1.patch) for _patch in $(find "$startdir" -maxdepth 1 -name '*.patch' -printf "%f\n"); do diff --git a/linux-4.7.patch b/linux-4.7.patch deleted file mode 100644 index 5a3f8dfc43c1..000000000000 --- a/linux-4.7.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -r kernel/nvidia-drm/nvidia-drm-fence.c kernel-patched/nvidia-drm/nvidia-drm-fence.c ---- kernel/nvidia-drm/nvidia-drm-fence.c 2016-08-09 01:43:19.000000000 +0200 -+++ kernel-patched/nvidia-drm/nvidia-drm-fence.c 2016-08-25 14:31:34.419655564 +0200 -@@ -325,7 +325,7 @@ - struct nvidia_drm_gem_object *nv_gem; - }; - --static void nvidia_drm_gem_prime_soft_fence_event -+static void NVKMS_KAPI_CALL nvidia_drm_gem_prime_soft_fence_event - ( - void *dataPtr, - NvU32 dataU32 diff --git a/linux-4.8.patch b/linux-4.8.patch index f8f03af6b685..471d1b0bc97f 100644 --- a/linux-4.8.patch +++ b/linux-4.8.patch @@ -9,7 +9,7 @@ diff -ur kernel/nvidia-drm/nvidia-drm-drv.c kernel-patched/nvidia-drm/nvidia-drm #include <drm/drm_crtc_helper.h> -@@ -420,7 +421,7 @@ +@@ -424,7 +425,7 @@ static void nvidia_drm_master_drop(struct drm_device *dev, @@ -18,7 +18,7 @@ diff -ur kernel/nvidia-drm/nvidia-drm-drv.c kernel-patched/nvidia-drm/nvidia-drm { struct nvidia_drm_device *nv_dev = dev->dev_private; int ret; -@@ -453,7 +454,7 @@ +@@ -457,7 +458,7 @@ mutex_lock(&dev->master_mutex); if (!file_priv->is_master || @@ -27,7 +27,7 @@ diff -ur kernel/nvidia-drm/nvidia-drm-drv.c kernel-patched/nvidia-drm/nvidia-drm { goto done; } -@@ -474,7 +475,7 @@ +@@ -478,7 +479,7 @@ * NVKMS modeset ownership, because nvidia_drm_master_set()'s call to * grabOwnership() will fail. */ @@ -36,19 +36,6 @@ diff -ur kernel/nvidia-drm/nvidia-drm-drv.c kernel-patched/nvidia-drm/nvidia-drm file_priv->is_master = 0; ret = 0; -Only in kernel-patched/nvidia-drm: nvidia-drm-drv.c.orig -diff -ur kernel/nvidia-drm/nvidia-drm-fence.c kernel-patched/nvidia-drm/nvidia-drm-fence.c ---- kernel/nvidia-drm/nvidia-drm-fence.c 2016-08-09 02:43:19.000000000 +0300 -+++ kernel-patched/nvidia-drm/nvidia-drm-fence.c 2016-08-26 20:14:29.115451900 +0300 -@@ -325,7 +325,7 @@ - struct nvidia_drm_gem_object *nv_gem; - }; - --static void nvidia_drm_gem_prime_soft_fence_event -+static void NVKMS_KAPI_CALL nvidia_drm_gem_prime_soft_fence_event - ( - void *dataPtr, - NvU32 dataU32 diff -ur kernel/nvidia-drm/nvidia-drm-modeset.c kernel-patched/nvidia-drm/nvidia-drm-modeset.c --- kernel/nvidia-drm/nvidia-drm-modeset.c 2016-08-09 02:43:19.000000000 +0300 +++ kernel-patched/nvidia-drm/nvidia-drm-modeset.c 2016-08-26 20:14:29.113947800 +0300 |