| Submitter | Andreas Müller |
|---|---|
| Date | Sept. 5, 2012, 5:50 p.m. |
| Message ID | <1346867411-8227-1-git-send-email-schnitzeltony@googlemail.com> |
| Download | mbox | patch |
| Permalink | /patch/35979/ |
| State | New |
| Headers | show |
Comments
On Wed, Sep 5, 2012 at 7:50 PM, Andreas Müller <schnitzeltony@googlemail.com> wrote: > With linux-libc-headers-3.5.0 (for tests) the error message was: > > | gstv4l2bufferpool.c: In function 'gst_v4l2_buffer_new': > | gstv4l2bufferpool.c:184:3: error: 'struct v4l2_buffer' has no member named 'input' > > Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> > --- > ...ild-with-recent-kernels-the-v4l2_buffer-i.patch | 33 ++++++++++++++++++++ > .../gstreamer/gst-plugins-good_0.10.31.bb | 4 ++- > 2 files changed, 36 insertions(+), 1 deletions(-) > create mode 100644 meta/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31/0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch > > 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 0000000..6456d3c > --- /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 @@ > +From 12d18fe4e98e7c232d59b56d529a0521f293fe6d Mon Sep 17 00:00:00 2001 > +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> > +Date: Wed, 5 Sep 2012 18:54:42 +0200 > +Subject: [PATCH] v4l2: fix build with recent kernels, the v4l2_buffer input > + field was removed > +MIME-Version: 1.0 > +Content-Type: text/plain; charset=UTF-8 > +Content-Transfer-Encoding: 8bit > + > +Upstream-Status: Backport > + > +[1] http://cgit.freedesktop.org/gstreamer/gst-plugins-good/commit/?id=9f2aa8d47f835ea155aaf635f618c0fc1ca87012 > + > +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> > +--- > + 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 > +--- 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.6.5 > + > 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 ac63f94..abcd836 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 \ > > DEPENDS += "gst-plugins-base gconf cairo jpeg libpng gtk+ zlib libid3tag flac \ > speex libsoup-2.4 pulseaudio" > -PR = "r2" > +PR = "r3" > > inherit gettext gconf > > +SRC_URI += "file://0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch" > + > EXTRA_OECONF += "--disable-aalib --disable-esd --disable-shout2 --disable-libcaca --disable-hal --without-check \ > --disable-orc" > > -- Does it make sense to prepare a rebased version (it is a bugfix for kernel-libc-headers used in the future >3.5) Andreas
On Wed, 2012-09-12 at 14:27 +0200, Andreas Müller wrote: > On Wed, Sep 5, 2012 at 7:50 PM, Andreas Müller > <schnitzeltony@googlemail.com> wrote: > > With linux-libc-headers-3.5.0 (for tests) the error message was: > > > > | gstv4l2bufferpool.c: In function 'gst_v4l2_buffer_new': > > | gstv4l2bufferpool.c:184:3: error: 'struct v4l2_buffer' has no member named 'input' > > > > Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> > > --- > > ...ild-with-recent-kernels-the-v4l2_buffer-i.patch | 33 ++++++++++++++++++++ > > .../gstreamer/gst-plugins-good_0.10.31.bb | 4 ++- > > 2 files changed, 36 insertions(+), 1 deletions(-) > > create mode 100644 meta/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31/0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch > > > > 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 0000000..6456d3c > > --- /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 @@ > > +From 12d18fe4e98e7c232d59b56d529a0521f293fe6d Mon Sep 17 00:00:00 2001 > > +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> > > +Date: Wed, 5 Sep 2012 18:54:42 +0200 > > +Subject: [PATCH] v4l2: fix build with recent kernels, the v4l2_buffer input > > + field was removed > > +MIME-Version: 1.0 > > +Content-Type: text/plain; charset=UTF-8 > > +Content-Transfer-Encoding: 8bit > > + > > +Upstream-Status: Backport > > + > > +[1] http://cgit.freedesktop.org/gstreamer/gst-plugins-good/commit/?id=9f2aa8d47f835ea155aaf635f618c0fc1ca87012 > > + > > +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> > > +--- > > + 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 > > +--- 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.6.5 > > + > > 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 ac63f94..abcd836 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 \ > > > > DEPENDS += "gst-plugins-base gconf cairo jpeg libpng gtk+ zlib libid3tag flac \ > > speex libsoup-2.4 pulseaudio" > > -PR = "r2" > > +PR = "r3" > > > > inherit gettext gconf > > > > +SRC_URI += "file://0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch" > > + > > EXTRA_OECONF += "--disable-aalib --disable-esd --disable-shout2 --disable-libcaca --disable-hal --without-check \ > > --disable-orc" > > > > -- > Does it make sense to prepare a rebased version (it is a bugfix for > kernel-libc-headers used in the future >3.5) I've merged it, thanks. Richard
On 09/05/2012 10:50 AM, Andreas Müller wrote: > With linux-libc-headers-3.5.0 (for tests) the error message was: > > | gstv4l2bufferpool.c: In function 'gst_v4l2_buffer_new': > | gstv4l2bufferpool.c:184:3: error: 'struct v4l2_buffer' has no member named 'input' > > Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> > --- > ...ild-with-recent-kernels-the-v4l2_buffer-i.patch | 33 ++++++++++++++++++++ > .../gstreamer/gst-plugins-good_0.10.31.bb | 4 ++- > 2 files changed, 36 insertions(+), 1 deletions(-) > create mode 100644 meta/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31/0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch > Merged into OE-Core Thanks Sau! > 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 0000000..6456d3c > --- /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 @@ > +From 12d18fe4e98e7c232d59b56d529a0521f293fe6d Mon Sep 17 00:00:00 2001 > +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> > +Date: Wed, 5 Sep 2012 18:54:42 +0200 > +Subject: [PATCH] v4l2: fix build with recent kernels, the v4l2_buffer input > + field was removed > +MIME-Version: 1.0 > +Content-Type: text/plain; charset=UTF-8 > +Content-Transfer-Encoding: 8bit > + > +Upstream-Status: Backport > + > +[1] http://cgit.freedesktop.org/gstreamer/gst-plugins-good/commit/?id=9f2aa8d47f835ea155aaf635f618c0fc1ca87012 > + > +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> > +--- > + 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 > +--- 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.6.5 > + > 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 ac63f94..abcd836 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 \ > > DEPENDS += "gst-plugins-base gconf cairo jpeg libpng gtk+ zlib libid3tag flac \ > speex libsoup-2.4 pulseaudio" > -PR = "r2" > +PR = "r3" > > inherit gettext gconf > > +SRC_URI += "file://0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch" > + > EXTRA_OECONF += "--disable-aalib --disable-esd --disable-shout2 --disable-libcaca --disable-hal --without-check \ > --disable-orc" > >
Patch
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 0000000..6456d3c --- /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 @@ +From 12d18fe4e98e7c232d59b56d529a0521f293fe6d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> +Date: Wed, 5 Sep 2012 18:54:42 +0200 +Subject: [PATCH] v4l2: fix build with recent kernels, the v4l2_buffer input + field was removed +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Backport + +[1] http://cgit.freedesktop.org/gstreamer/gst-plugins-good/commit/?id=9f2aa8d47f835ea155aaf635f618c0fc1ca87012 + +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> +--- + 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 +--- 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.6.5 + 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 ac63f94..abcd836 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 \ DEPENDS += "gst-plugins-base gconf cairo jpeg libpng gtk+ zlib libid3tag flac \ speex libsoup-2.4 pulseaudio" -PR = "r2" +PR = "r3" inherit gettext gconf +SRC_URI += "file://0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch" + EXTRA_OECONF += "--disable-aalib --disable-esd --disable-shout2 --disable-libcaca --disable-hal --without-check \ --disable-orc"
With linux-libc-headers-3.5.0 (for tests) the error message was: | gstv4l2bufferpool.c: In function 'gst_v4l2_buffer_new': | gstv4l2bufferpool.c:184:3: error: 'struct v4l2_buffer' has no member named 'input' Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> --- ...ild-with-recent-kernels-the-v4l2_buffer-i.patch | 33 ++++++++++++++++++++ .../gstreamer/gst-plugins-good_0.10.31.bb | 4 ++- 2 files changed, 36 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31/0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch