I have made the following changes intended for : CE:MW:Shared / gst-plugins-good
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/8127 Thank You, msameer [This message was auto-generated] --- Request # 8127: Messages from BOSS: State: review at 2013-02-19T22:19:33 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:msameer:branches:CE:MW:Shared / gst-plugins-good -> CE:MW:Shared / gst-plugins-good changes files: -------------- --- gst-plugins-good.changes +++ gst-plugins-good.changes @@ -0,0 +1,4 @@ +* Tue Feb 19 2013 Mohammed Hassan <[email protected]> - 0.10.27 +- Add gst-plugins-good-0.11-v4l2-fix-interlaced-set_format-configuration.patch +- Backported 0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch from upstream git + new: ---- 0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch 0001-v4l2-remove-unnecessary-linux-videodev.h-include.patch spec files: ----------- --- gst-plugins-good.spec +++ gst-plugins-good.spec @@ -17,6 +17,8 @@ Source0: http://gstreamer.freedesktop.org/src/%{name}/%{name}-%{version}.tar.bz2 Source100: gst-plugins-good.yaml Patch0: gst-plugins-good-0.11-v4l2-fix-interlaced-set_format-configuration.patch +Patch1: 0001-v4l2-remove-unnecessary-linux-videodev.h-include.patch +Patch2: 0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch Requires(pre): %{_bindir}/gconftool-2 Requires(preun): %{_bindir}/gconftool-2 Requires(post): %{_bindir}/gconftool-2 @@ -49,6 +51,10 @@ # gst-plugins-good-0.11-v4l2-fix-interlaced-set_format-configuration.patch %patch0 -p1 +# 0001-v4l2-remove-unnecessary-linux-videodev.h-include.patch +%patch1 -p1 +# 0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch +%patch2 -p1 # >> setup # << setup other changes: -------------- ++++++ 0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch (new) --- 0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch +++ 0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch @@ -0,0 +1,39 @@ +From d7722686add4c3b1478a09f4dfe98606beb174e4 Mon Sep 17 00:00:00 2001 +From: Matthias Clasen <[email protected]> +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 <[email protected]> + 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 + +Conflicts: + sys/v4l2/gstv4l2bufferpool.c +--- + sys/v4l2/gstv4l2bufferpool.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/sys/v4l2/gstv4l2bufferpool.c b/sys/v4l2/gstv4l2bufferpool.c +index e976ec5..4c714ac 100644 +--- a/sys/v4l2/gstv4l2bufferpool.c ++++ b/sys/v4l2/gstv4l2bufferpool.c +@@ -180,7 +180,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.10.4 + ++++++ 0001-v4l2-remove-unnecessary-linux-videodev.h-include.patch (new) --- 0001-v4l2-remove-unnecessary-linux-videodev.h-include.patch +++ 0001-v4l2-remove-unnecessary-linux-videodev.h-include.patch @@ -0,0 +1,28 @@ +From 0cd62a10ad471601b9dc5420de8548fe21d25e9f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <[email protected]> +Date: Thu, 3 Mar 2011 00:16:47 +0000 +Subject: [PATCH 1/2] v4l2: remove unnecessary linux/videodev.h include + +Causes compilation issues with newer kernel headers where the old +v4l interface has been removed. + +https://bugzilla.gnome.org/show_bug.cgi?id=643716 +--- + sys/v4l2/v4l2_calls.h | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/sys/v4l2/v4l2_calls.h b/sys/v4l2/v4l2_calls.h +index a47872d..d2e2c72 100644 +--- a/sys/v4l2/v4l2_calls.h ++++ b/sys/v4l2/v4l2_calls.h +@@ -30,7 +30,6 @@ + # include <libv4l2.h> + #else + # include <sys/ioctl.h> +-# include <linux/videodev.h> + # include <linux/videodev2.h> + # define v4l2_fd_open(fd, flags) (fd) + # define v4l2_close close +-- +1.7.10.4 + ++++++ gst-plugins-good.yaml --- gst-plugins-good.yaml +++ gst-plugins-good.yaml @@ -9,6 +9,8 @@ - http://gstreamer.freedesktop.org/src/%{name}/%{name}-%{version}.tar.bz2 Patches: - gst-plugins-good-0.11-v4l2-fix-interlaced-set_format-configuration.patch + - 0001-v4l2-remove-unnecessary-linux-videodev.h-include.patch + - 0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch Description: | GStreamer Good Plug-ins is a collection of well-supported plug-ins of good quality and under the LGPL license.
