diff options
| author |  Tom Willemse | 2014-07-03 20:45:57 +0200 |
|---|---|---|
| committer | Tom Willemse | 2014-07-03 20:45:57 +0200 |
| commit | 32b10a4d98e92b089f0c8fbf23c3bc430a34b85f (patch) | |
| tree | a3d81747bc523e26a89387a14ebfee67b6a81372 | |
| parent | 3f681bd329aae33011f7924ab7d7f16c9671f786 (diff) | |
| download | pkgbuilds-32b10a4d98e92b089f0c8fbf23c3bc430a34b85f.tar.gz pkgbuilds-32b10a4d98e92b089f0c8fbf23c3bc430a34b85f.zip | |
Update linux-drd to 3.15.3
| -rw-r--r-- | linux-drd/0012-fix-saa7134.patch | 37 | ||||
| -rw-r--r-- | linux-drd/PKGBUILD | 13 |
2 files changed, 3 insertions, 47 deletions
diff --git a/linux-drd/0012-fix-saa7134.patch b/linux-drd/0012-fix-saa7134.patch deleted file mode 100644 index 070fbc8..0000000 --- a/linux-drd/0012-fix-saa7134.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- a/drivers/media/pci/saa7134/saa7134-video.c -+++ a/drivers/media/pci/saa7134/saa7134-video.c -@@ -1243,6 +1243,7 @@ static int video_release(struct file *file) - videobuf_streamoff(&dev->cap); - res_free(dev, fh, RESOURCE_VIDEO); - videobuf_mmap_free(&dev->cap); -+ INIT_LIST_HEAD(&dev->cap.stream); - } - if (dev->cap.read_buf) { - buffer_release(&dev->cap, dev->cap.read_buf); -@@ -1254,6 +1255,7 @@ static int video_release(struct file *file) - videobuf_stop(&dev->vbi); - res_free(dev, fh, RESOURCE_VBI); - videobuf_mmap_free(&dev->vbi); -+ INIT_LIST_HEAD(&dev->vbi.stream); - } - - /* ts-capture will not work in planar mode, so turn it off Hac: 04.05*/ -@@ -1987,17 +1989,12 @@ int saa7134_streamoff(struct file *file, void *priv, - enum v4l2_buf_type type) - { - struct saa7134_dev *dev = video_drvdata(file); -- int err; - int res = saa7134_resource(file); - - if (res != RESOURCE_EMPRESS) - pm_qos_remove_request(&dev->qos_request); - -- err = videobuf_streamoff(saa7134_queue(file)); -- if (err < 0) -- return err; -- res_free(dev, priv, res); -- return 0; -+ return videobuf_streamoff(saa7134_queue(file)); - } - EXPORT_SYMBOL_GPL(saa7134_streamoff); - diff --git a/linux-drd/PKGBUILD b/linux-drd/PKGBUILD index 3db0c45..6fe5686 100644 --- a/linux-drd/PKGBUILD +++ b/linux-drd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 215499 2014-06-27 06:17:19Z tpowa $ +# $Id: PKGBUILD 215934 2014-07-01 05:46:47Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # pkgbase=linux # Build stock -ARCH kernel pkgbase=linux-drd # Build kernel with a different name _srcname=linux-3.15 -pkgver=3.15.2 +pkgver=3.15.3 pkgrel=1 arch=('i686' 'x86_64') url="http://www.kernel.org/" @@ -19,17 +19,15 @@ source=("https://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz" # standard config files for mkinitcpio ramdisk 'linux.preset' 'change-default-console-loglevel.patch' - '0012-fix-saa7134.patch' 'aufs3-standalone::git://git.code.sf.net/p/aufs/aufs3-standalone#branch=aufs3.15' # 'aufs3-mmap.patch' ) sha256sums=('c3927e87be4040fa8aca1b58663dc0776aaf00485604ff88a623be2f3fb07794' - '47d902c0f6cb5833a45ba45132197b14e4c85c6bc17883cbdcff60f5c46f3f02' + '82ee661b91246c77d0ef3d9d6d8dcc191d3490cad17cd295a95169059735f295' 'ec593326ac4dad420b0b45a472ba3d6be2ce66b9b4d7cccf1453d02d5eb01b19' 'ae18091d5ce27bf03942209faa44a9e354f79e0cbbb720a914f94017cdf42102' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' 'faced4eb4c47c4eb1a9ee8a5bf8a7c4b49d6b4d78efbe426e410730e6267d182' - '79359454c9d8446eb55add2b1cdbf8332bd67dafb01fefb5b1ca090225f64d18' 'SKIP') _kernelname=${pkgbase#linux} @@ -48,11 +46,6 @@ prepare() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -p1 -i "${srcdir}/change-default-console-loglevel.patch" - # fix saa7134 video - # https://bugs.archlinux.org/task/39904 - # https://bugzilla.kernel.org/show_bug.cgi?id=73361 - patch -Np1 -i "${srcdir}/0012-fix-saa7134.patch" - ## aufs3 patch -p1 -i "${srcdir}/aufs3-standalone/aufs3-kbuild.patch" patch -p1 -i "${srcdir}/aufs3-standalone/aufs3-base.patch" |