diff options
author | NBonaparte | 2016-12-14 11:27:09 -0800 |
---|---|---|
committer | NBonaparte | 2016-12-14 11:27:09 -0800 |
commit | 0e79519a4142a05bcb6b3441807959738e0a003f (patch) | |
tree | 608cda10213f2e1aca727c8baa609dda97a3d60f | |
parent | 767b00d4d2d7fcced3615967e3f7d87d7fc38807 (diff) | |
download | aur-0e79519a4142a05bcb6b3441807959738e0a003f.tar.gz |
patch: remove patch (was merged upstream)
-rw-r--r-- | 4.8.patch | 19 | ||||
-rw-r--r-- | PKGBUILD | 13 |
2 files changed, 3 insertions, 29 deletions
diff --git a/4.8.patch b/4.8.patch deleted file mode 100644 index c94914cdd241..000000000000 --- a/4.8.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/smi2021_v4l2.c b/smi2021_v4l2.c -index 9d8fa3d..a72c29a 100644 ---- a/smi2021_v4l2.c -+++ b/smi2021_v4l2.c -@@ -194,7 +194,13 @@ static int queue_setup(struct vb2_queue *vq, - const void *parg, - #endif - unsigned int *nbuffers, unsigned int *nplanes, -- unsigned int sizes[], void *alloc_ctxs[]) -+ unsigned int sizes[], -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0) -+ void *alloc_ctxs[] -+#else -+ struct device *alloc_devs[] -+#endif -+ ) - { - struct smi2021 *smi2021 = vb2_get_drv_priv(vq); - *nbuffers = clamp_t(unsigned int, *nbuffers, 4, 16); @@ -5,18 +5,16 @@ _altname=$(printf ${pkgname%%-git}) _gitname=smi2021 _gitbranch=master _gitauthor=Manouchehri -pkgver=v0.0.1.r56.g5520828 +pkgver=v0.0.1.r58.g4040e4a pkgrel=1 pkgdesc="EasyCap driver module" url="https://github.com/$_gitauthor/$_gitname" license=('GPL') source=("git://github.com/$_gitauthor/$_gitname.git#branch=$_gitbranch" - "https://github.com/stevelacy/EasyCap/raw/master/somagic_firmware.bin" - "4.8.patch") + "https://github.com/stevelacy/EasyCap/raw/master/somagic_firmware.bin") validpgpkeys=('F0FE029614EA35BC9E4F9768A6ECFD0C40839755') # David Manouchehri sha512sums=('SKIP' - '722128600bd982b1ff6af8e372e361d22ee872282aeab50b62d8769ad2ee08bb2c6612f59ba48736a26c2c47704a7e192af2746ac0746a074bc3aa242bffa712' - '99f0049238b735e56ad1ffbb62a88e04d71172eb581eb99de343919f04917ea9934239b29ba0b2432a097385ebe71bd45e1b58d1ea582ccf95a20cfc5d041f95') + '722128600bd982b1ff6af8e372e361d22ee872282aeab50b62d8769ad2ee08bb2c6612f59ba48736a26c2c47704a7e192af2746ac0746a074bc3aa242bffa712') arch=('i686' 'x86_64') depends=('') makedepends=('git' 'linux-headers') @@ -33,11 +31,6 @@ pkgver() { ) } -prepare() { - cd "$srcdir/$_gitname" - patch -p1 -i "$srcdir/4.8.patch" -} - build() { cd "$srcdir/$_gitname" sed -i '0,/obj/{s/$(CONFIG_VIDEO_SMI2021)/m/}' Makefile # Without this, no modules will be built. |