summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-multimedia')
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31/0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch33
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb4
2 files changed, 36 insertions, 1 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31/0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch b/meta/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31/0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch
new file mode 100644
index 0000000000..6456d3c6c2
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31/0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch
@@ -0,0 +1,33 @@
1From 12d18fe4e98e7c232d59b56d529a0521f293fe6d Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Wed, 5 Sep 2012 18:54:42 +0200
4Subject: [PATCH] v4l2: fix build with recent kernels, the v4l2_buffer input
5 field was removed
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
9
10Upstream-Status: Backport
11
12[1] http://cgit.freedesktop.org/gstreamer/gst-plugins-good/commit/?id=9f2aa8d47f835ea155aaf635f618c0fc1ca87012
13
14Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
15---
16 sys/v4l2/gstv4l2bufferpool.c | 1 -
17 1 files changed, 0 insertions(+), 1 deletions(-)
18
19diff --git a/sys/v4l2/gstv4l2bufferpool.c b/sys/v4l2/gstv4l2bufferpool.c
20index b81c6a4..51cc0ce 100644
21--- a/sys/v4l2/gstv4l2bufferpool.c
22+++ b/sys/v4l2/gstv4l2bufferpool.c
23@@ -181,7 +181,6 @@ gst_v4l2_buffer_new (GstV4l2BufferPool * pool, guint index, GstCaps * caps)
24 GST_LOG_OBJECT (pool->v4l2elem, " MMAP offset: %u",
25 ret->vbuffer.m.offset);
26 GST_LOG_OBJECT (pool->v4l2elem, " length: %u", ret->vbuffer.length);
27- GST_LOG_OBJECT (pool->v4l2elem, " input: %u", ret->vbuffer.input);
28
29 data = (guint8 *) v4l2_mmap (0, ret->vbuffer.length,
30 PROT_READ | PROT_WRITE, MAP_SHARED, pool->video_fd,
31--
321.7.6.5
33
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb
index 0fc34dfed1..e095b386be 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb
@@ -7,10 +7,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
7 7
8DEPENDS += "gst-plugins-base gconf cairo jpeg libpng zlib libid3tag flac \ 8DEPENDS += "gst-plugins-base gconf cairo jpeg libpng zlib libid3tag flac \
9 speex libsoup-2.4 pulseaudio" 9 speex libsoup-2.4 pulseaudio"
10PR = "r3" 10PR = "r4"
11 11
12inherit gettext gconf 12inherit gettext gconf
13 13
14SRC_URI += "file://0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch"
15
14EXTRA_OECONF += "--disable-aalib --disable-esd --disable-shout2 --disable-libcaca --disable-hal --without-check \ 16EXTRA_OECONF += "--disable-aalib --disable-esd --disable-shout2 --disable-libcaca --disable-hal --without-check \
15 --disable-orc --disable-examples" 17 --disable-orc --disable-examples"
16 18