[arch-commits] Commit in gstreamer0.10-good/trunk (PKGBUILD linux-3.6.patch)
Evangelos Foutras
foutrelis at nymeria.archlinux.org
Tue Apr 30 15:06:05 UTC 2013
Date: Tuesday, April 30, 2013 @ 17:06:05
Author: foutrelis
Revision: 184002
upgpkg: gstreamer0.10-good 0.10.31-2
libpng 1.6 rebuild.
Added:
gstreamer0.10-good/trunk/linux-3.6.patch
Modified:
gstreamer0.10-good/trunk/PKGBUILD
-----------------+
PKGBUILD | 19 ++++++++++++++-----
linux-3.6.patch | 31 +++++++++++++++++++++++++++++++
2 files changed, 45 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-04-30 14:56:53 UTC (rev 184001)
+++ PKGBUILD 2013-04-30 15:06:05 UTC (rev 184002)
@@ -4,19 +4,28 @@
pkgbase=gstreamer0.10-good
pkgname=('gstreamer0.10-good' 'gstreamer0.10-good-plugins')
pkgver=0.10.31
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
license=('LGPL')
makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'bzip2' 'gdk-pixbuf2' 'libpulse' 'jack' 'udev')
url="http://gstreamer.freedesktop.org/"
options=(!libtool !emptydirs)
-source=(${url}/src/gst-plugins-good/gst-plugins-good-${pkgver}.tar.xz)
-sha256sums=('77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64')
+source=(${url}/src/gst-plugins-good/gst-plugins-good-${pkgver}.tar.xz
+ linux-3.6.patch)
+sha256sums=('77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64'
+ 'd14a9ebfdbff69a3dd27057d764ad0c68f62aa6ae9f20bb62a0d09b29c0c2cfe')
+prepare() {
+ cd "${srcdir}/gst-plugins-good-${pkgver}"
+ # https://bugzilla.gnome.org/show_bug.cgi?id=681491
+ patch -Np1 -i "${srcdir}/linux-3.6.patch"
+ sed -i '/AC_PATH_XTRA/d' configure.ac
+ sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac
+ autoreconf -vi --force
+}
+
build() {
cd "${srcdir}/gst-plugins-good-${pkgver}"
- sed -i '/AC_PATH_XTRA/d' configure.ac
- autoreconf
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
--disable-static --enable-experimental \
--disable-schemas-install \
Added: linux-3.6.patch
===================================================================
--- linux-3.6.patch (rev 0)
+++ linux-3.6.patch 2013-04-30 15:06:05 UTC (rev 184002)
@@ -0,0 +1,31 @@
+From bfb1ac952b4c3caaba0297bbe7dc73ea92f9b292 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen at redhat.com>
+Date: Thu, 09 Aug 2012 07:35:23 +0000
+Subject: v4l2: fix build with recent kernels, the v4l2_buffer input field was removed
+
+This was unused apparently and removed in the kernel in commit:
+
+ From 2b719d7baf490e24ce7d817c6337b7c87fda84c1 Mon Sep 17 00:00:00 2001
+ From: Sakari Ailus <sakari.ailus at iki.fi>
+ Date: Wed, 2 May 2012 09:40:03 -0300
+ Subject: [PATCH] [media] v4l: drop v4l2_buffer.input and V4L2_BUF_FLAG_INPUT
+
+ Remove input field in struct v4l2_buffer and flag V4L2_BUF_FLAG_INPUT which
+ tells the former is valid. The flag is used by no driver currently.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=681491
+---
+diff --git a/sys/v4l2/gstv4l2bufferpool.c b/sys/v4l2/gstv4l2bufferpool.c
+index 2e3a563..5aaed5a 100644
+--- a/sys/v4l2/gstv4l2bufferpool.c
++++ b/sys/v4l2/gstv4l2bufferpool.c
+@@ -182,7 +182,6 @@ gst_v4l2_buffer_new (GstV4l2BufferPool * pool, guint index, GstCaps * caps)
+ GST_LOG_OBJECT (pool->v4l2elem, " MMAP offset: %u",
+ ret->vbuffer.m.offset);
+ GST_LOG_OBJECT (pool->v4l2elem, " length: %u", ret->vbuffer.length);
+- GST_LOG_OBJECT (pool->v4l2elem, " input: %u", ret->vbuffer.input);
+
+ ret->mmap_length = ret->vbuffer.length;
+ data = (guint8 *) v4l2_mmap (0, ret->vbuffer.length,
+--
+cgit v0.9.0.2-2-gbebe
More information about the arch-commits
mailing list