Patchwork [v1] gst-plugins-good: fix compilation of v4l2 against newer kernel headers.

login
register
mail settings
Submitter Yevhen Kyriukha
Date Aug. 9, 2013, 1:58 p.m.
Message ID <1376056696-31679-1-git-send-email-kirgene@gmail.com>
Download mbox | patch
Permalink /patch/55417/
State New
Headers show

Comments

Yevhen Kyriukha - Aug. 9, 2013, 1:58 p.m.
Patch fixes "'V4L2_CID_VCENTER_DEPRECATED' undeclared" error.

Signed-off-by: Yevhen Kyriukha <kirgene@gmail.com>
---
 .../0002-v4l2-fix-build-with-recent-kernels.patch  | 25 ++++++++++++++++++++++
 .../gstreamer/gst-plugins-good_0.10.31.bb          |  3 ++-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31/0002-v4l2-fix-build-with-recent-kernels.patch
Ross Burton - Aug. 9, 2013, 2:04 p.m.
On 9 August 2013 14:58, Yevhen Kyriukha <kirgene@gmail.com> wrote:
> Patch fixes "'V4L2_CID_VCENTER_DEPRECATED' undeclared" error.
>
> Signed-off-by: Yevhen Kyriukha <kirgene@gmail.com>

The patch is missing a signed-off-by and upstream-status, please add those.

Ross

Patch

diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31/0002-v4l2-fix-build-with-recent-kernels.patch b/meta/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31/0002-v4l2-fix-build-with-recent-kernels.patch
new file mode 100644
index 0000000..25c2550
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31/0002-v4l2-fix-build-with-recent-kernels.patch
@@ -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
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 8868ba7..570031d 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
@@ -22,7 +22,8 @@  DEPENDS += "gst-plugins-base gconf cairo libpng zlib libid3tag flac \
 
 inherit gettext gconf
 
-SRC_URI += "file://0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch"
+SRC_URI += "file://0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch \
+            file://0002-v4l2-fix-build-with-recent-kernels.patch"
 
 EXTRA_OECONF += "--disable-aalib --disable-esd --disable-shout2 --disable-libcaca --disable-hal --without-check \
                  --disable-orc --disable-examples --disable-taglib"