From 0d060af4a18dd51bcae72630b21216c65abdf827 Mon Sep 17 00:00:00 2001 From: Danny Rawlins Date: Sun, 30 Mar 2014 17:29:48 +1100 Subject: [PATCH] gst-plugins-good: fix for linux-headers for video4linux2 --- gst-plugins-good/.md5sum | 2 + gst-plugins-good/Pkgfile | 9 ++++- ...ugins-v4l2-0.10.31-linux-headers-3.6.patch | 38 +++++++++++++++++++ ...ugins-v4l2-0.10.31-linux-headers-3.9.patch | 25 ++++++++++++ 4 files changed, 72 insertions(+), 2 deletions(-) create mode 100644 gst-plugins-good/gst-plugins-v4l2-0.10.31-linux-headers-3.6.patch create mode 100644 gst-plugins-good/gst-plugins-v4l2-0.10.31-linux-headers-3.9.patch diff --git a/gst-plugins-good/.md5sum b/gst-plugins-good/.md5sum index ce50b25b8..b60a71021 100644 --- a/gst-plugins-good/.md5sum +++ b/gst-plugins-good/.md5sum @@ -1 +1,3 @@ 555845ceab722e517040bab57f9ace95 gst-plugins-good-0.10.31.tar.xz +7ae65b4f90977db6c453649fa6cfd543 gst-plugins-v4l2-0.10.31-linux-headers-3.6.patch +da56b9cd7b471a160a913504569420ba gst-plugins-v4l2-0.10.31-linux-headers-3.9.patch diff --git a/gst-plugins-good/Pkgfile b/gst-plugins-good/Pkgfile index a50a9a771..3e82daedf 100644 --- a/gst-plugins-good/Pkgfile +++ b/gst-plugins-good/Pkgfile @@ -6,12 +6,17 @@ name=gst-plugins-good version=0.10.31 -release=2 -source=(http://gstreamer.freedesktop.org/src/$name/$name-$version.tar.xz) +release=3 +source=(http://gstreamer.freedesktop.org/src/$name/$name-$version.tar.xz + gst-plugins-v4l2-0.10.31-linux-headers-3.6.patch + gst-plugins-v4l2-0.10.31-linux-headers-3.9.patch) build() { cd $name-$version + patch -p1 -i $SRC/gst-plugins-v4l2-0.10.31-linux-headers-3.6.patch + patch -p1 -i $SRC/gst-plugins-v4l2-0.10.31-linux-headers-3.9.patch + ./configure \ --prefix=/usr \ --mandir=/usr/man \ diff --git a/gst-plugins-good/gst-plugins-v4l2-0.10.31-linux-headers-3.6.patch b/gst-plugins-good/gst-plugins-v4l2-0.10.31-linux-headers-3.6.patch new file mode 100644 index 000000000..919b19b7d --- /dev/null +++ b/gst-plugins-good/gst-plugins-v4l2-0.10.31-linux-headers-3.6.patch @@ -0,0 +1,38 @@ +From 968a3dac9959c2a6ae4ff619535db15b37446ce4 Mon Sep 17 00:00:00 2001 +From: Matthias Clasen +Date: Thu, 9 Aug 2012 08:35:23 +0100 +Subject: [PATCH] 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 + 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 + +[Alexandre Rostovtsev : backport to 0.10.31] +--- + sys/v4l2/gstv4l2bufferpool.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/sys/v4l2/gstv4l2bufferpool.c b/sys/v4l2/gstv4l2bufferpool.c +index b81c6a4..51cc0ce 100644 +--- a/sys/v4l2/gstv4l2bufferpool.c ++++ b/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.12.3 + diff --git a/gst-plugins-good/gst-plugins-v4l2-0.10.31-linux-headers-3.9.patch b/gst-plugins-good/gst-plugins-v4l2-0.10.31-linux-headers-3.9.patch new file mode 100644 index 000000000..25c255054 --- /dev/null +++ b/gst-plugins-good/gst-plugins-v4l2-0.10.31-linux-headers-3.9.patch @@ -0,0 +1,25 @@ +From 8e633d2059cb835448021cf79becb487aff10975 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Mon, 18 Mar 2013 14:59:35 +0000 +Subject: v4l2: fix compilation against newer kernel headers as on FC19 + +--- +diff --git a/sys/v4l2/v4l2_calls.c b/sys/v4l2/v4l2_calls.c +index 07d390a..4c10f4f 100644 +--- a/sys/v4l2/v4l2_calls.c ++++ b/sys/v4l2/v4l2_calls.c +@@ -291,8 +291,12 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l2object) + break; + case V4L2_CID_HFLIP: + case V4L2_CID_VFLIP: ++#ifndef V4L2_CID_PAN_RESET + case V4L2_CID_HCENTER: ++#endif ++#ifndef V4L2_CID_TILT_RESET + case V4L2_CID_VCENTER: ++#endif + #ifdef V4L2_CID_PAN_RESET + case V4L2_CID_PAN_RESET: + #endif +-- +cgit v0.9.0.2-2-gbebe