ports/contrib
3
3
Fork 2
Code Issues 1 Pull Requests Activity

gst-plugins-good: fix for linux-headers for video4linux2

Browse Source
This commit is contained in:
Danny Rawlins 2014-03-30 17:29:48 +11:00
parent f483f20c51
commit 0d060af4a1
4 changed files with 72 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gst-plugins-good/.md5sum
View File

@ -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

9
gst-plugins-good/Pkgfile
View File

@ -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 \

38
gst-plugins-good/gst-plugins-v4l2-0.10.31-linux-headers-3.6.patch Normal file
View File

@ -0,0 +1,38 @@
From 968a3dac9959c2a6ae4ff619535db15b37446ce4 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
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 <sakari.ailus@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
[Alexandre Rostovtsev <tetromino@gentoo.org>: 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

25
gst-plugins-good/gst-plugins-v4l2-0.10.31-linux-headers-3.9.patch Normal file
View File

@ -0,0 +1,25 @@
From 8e633d2059cb835448021cf79becb487aff10975 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
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