Remove unnecessary patch

This commit is contained in:
Anish Bhatt 2015-03-30 20:29:09 -07:00
parent 2d96cf4571
commit 702b9309c0
3 changed files with 4 additions and 38 deletions

View file

@ -1,7 +1,7 @@
pkgbase = nvidia-340xx-dkms
pkgdesc = NVIDIA kernel module sources (DKMS)
pkgver = 340.76
pkgrel = 3
pkgrel = 4
url = http://www.nvidia.com/
install = nvidia-340xx-dkms.install
arch = i686
@ -17,10 +17,8 @@ pkgbase = nvidia-340xx-dkms
conflicts = nvidia-dkms
source = http://us.download.nvidia.com/XFree86/Linux-x86/340.76/NVIDIA-Linux-x86-340.76.run
source = http://us.download.nvidia.com/XFree86/Linux-x86_64/340.76/NVIDIA-Linux-x86_64-340.76-no-compat32.run
source = nv-drm.patch
sha1sums = 1335af174324f5c752388110e65c3c51beea729b
sha1sums = 2df59750d9fdeed613e84379108fb2bec67afd14
sha1sums = f0798ef2269fa4257a754ecc86fd1632774b188c
pkgname = nvidia-340xx-dkms

View file

@ -7,7 +7,7 @@
pkgname=nvidia-340xx-dkms
pkgver=340.76
pkgrel=3
pkgrel=4
pkgdesc='NVIDIA kernel module sources (DKMS)'
arch=('i686' 'x86_64')
url='http://www.nvidia.com/'
@ -19,11 +19,9 @@ provides=("nvidia=${pkgver}" "nvidia-dkms")
conflicts=('nvidia-340xx' 'nvidia-dkms')
install="${pkgname}.install"
source=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run"
"http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run"
"nv-drm.patch")
"http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run")
sha1sums=('1335af174324f5c752388110e65c3c51beea729b'
'2df59750d9fdeed613e84379108fb2bec67afd14'
'f0798ef2269fa4257a754ecc86fd1632774b188c')
'2df59750d9fdeed613e84379108fb2bec67afd14')
[[ $CARCH == i686 ]] && _pkg=NVIDIA-Linux-x86-${pkgver}
[[ $CARCH == x86_64 ]] && _pkg=NVIDIA-Linux-x86_64-${pkgver}-no-compat32
@ -33,9 +31,6 @@ prepare() {
fi
sh ${_pkg}.run --extract-only
pushd ${_pkg}
patch -p0 -i ../nv-drm.patch
popd
}
package() {

View file

@ -1,27 +0,0 @@
--- kernel/nv-drm.c~ 2014-09-12 00:33:06.000000000 +0200
+++ kernel/nv-drm.c 2014-10-14 11:35:52.854400737 +0200
@@ -18,6 +18,11 @@
#include <drm/drmP.h>
+/* 3.18-rc0+ */
+#ifndef drm_gem_object
+#include <drm/drm_gem.h>
+#endif
+
extern nv_linux_state_t *nv_linux_devices;
struct nv_gem_object {
diff --git a/kernel/nv-drm.c~ b/kernel/nv-drm.c
index ecc982a..60d7aae 100644
--- kernel/nv-drm.c~
+++ kernel/nv-drm.c
@@ -129,6 +129,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",