diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-12-06 09:48:50 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-12-06 09:48:50 +0100 |
| commit | 25f4e0dee100618fab4654d9e29e121c19520fc3 (patch) | |
| tree | 223be8f7fa05fda63737d53dffd6319784c5355f | |
| parent | 6c3fda202660dccca161800ed0a85bdb92c9231a (diff) | |
| download | ptxdist-25f4e0dee100618fab4654d9e29e121c19520fc3.tar.gz ptxdist-25f4e0dee100618fab4654d9e29e121c19520fc3.tar.xz | |
gst-plugins-good: add upstream patch to fix building with newer kernel headers
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | patches/gst-plugins-good-0.10.31/0002-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch | 32 | ||||
| -rw-r--r-- | patches/gst-plugins-good-0.10.31/series | 3 |
2 files changed, 34 insertions, 1 deletions
diff --git a/patches/gst-plugins-good-0.10.31/0002-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch b/patches/gst-plugins-good-0.10.31/0002-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch new file mode 100644 index 000000000..21e7b2b60 --- /dev/null +++ b/patches/gst-plugins-good-0.10.31/0002-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch @@ -0,0 +1,32 @@ +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 +--- + 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, diff --git a/patches/gst-plugins-good-0.10.31/series b/patches/gst-plugins-good-0.10.31/series index 29bbdf088..393ed3849 100644 --- a/patches/gst-plugins-good-0.10.31/series +++ b/patches/gst-plugins-good-0.10.31/series @@ -1,4 +1,5 @@ # generated by git-ptx-patches #tag:base --start-number 1 0001-follow-up-on-bug-622500-in-gst-plugins-good-bugzilla.patch -# 8f44abf83b61db1e76bd51800f25820a - git-ptx-patches magic +0002-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch +# 545b34a2190c98327369f1d5f4e31f23 - git-ptx-patches magic |