From 68952890a22f40e2839442d7a6b85c13222eced7 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 20 Feb 2014 10:07:36 +0100 Subject: [PATCH] gst-plugins-good: unbreak build (v4l) with recent kernels (via LFS). --- ...ith-recent-kernels-the-v4l2_buffer-i.patch | 24 ------------------- srcpkgs/gst-plugins-good/template | 5 ++++ 2 files changed, 5 insertions(+), 24 deletions(-) delete mode 100644 srcpkgs/gst-plugins-good/patches/0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch diff --git a/srcpkgs/gst-plugins-good/patches/0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch b/srcpkgs/gst-plugins-good/patches/0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch deleted file mode 100644 index ac783ffc6d0..00000000000 --- a/srcpkgs/gst-plugins-good/patches/0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch +++ /dev/null @@ -1,24 +0,0 @@ -Upstream-Status: Backport - -[1] http://cgit.freedesktop.org/gstreamer/gst-plugins-good/commit/?id=9f2aa8d47f835ea155aaf635f618c0fc1ca87012 - -Signed-off-by: Andreas Müller ---- - sys/v4l2/gstv4l2bufferpool.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -diff --git a/sys/v4l2/gstv4l2bufferpool.c b/sys/v4l2/gstv4l2bufferpool.c -index b81c6a4..51cc0ce 100644 ---- sys/v4l2/gstv4l2bufferpool.c -+++ sys/v4l2/gstv4l2bufferpool.c -@@ -181,7 +181,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); - - data = (guint8 *) v4l2_mmap (0, ret->vbuffer.length, - PROT_READ | PROT_WRITE, MAP_SHARED, pool->video_fd, --- -1.7.6.5 - diff --git a/srcpkgs/gst-plugins-good/template b/srcpkgs/gst-plugins-good/template index b2c53f539b0..c90b5e7aa52 100644 --- a/srcpkgs/gst-plugins-good/template +++ b/srcpkgs/gst-plugins-good/template @@ -20,6 +20,11 @@ license="LGPL-2.1" distfiles="http://gstreamer.freedesktop.org/src/$pkgname/$pkgname-$version.tar.xz" checksum=77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 +pre_configure() { + sed -i -e "/input:/d" sys/v4l2/gstv4l2bufferpool.c + sed -i -e "/case V4L2_CID_HCENTER/d" -e "/case V4L2_CID_VCENTER/d" sys/v4l2/v4l2_calls.c +} + post_install() { mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc} gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/gstreamer-0.10.schemas \