From a47d7f73a40e5d1c1576a818e08a7b45ee9ccb38 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Thu, 8 Aug 2013 17:00:11 +0200 Subject: [PATCH] gst-plugins-good: fix build with new kernel headers In function 'gst_v4l2_fill_lists': error: 'V4L2_CID_HCENTER_DEPRECATED' undeclared (first use in this function) error: 'V4L2_CID_VCENTER_DEPRECATED' undeclared (first use in this function) https://jira.digi.com/browse/DEL-585 Signed-off-by: Javier Viguera --- ...tion-against-newer-kernel-headers-as.patch | 25 +++++++++++++++++++ .../gst-plugins-good_0.10.31.bbappend | 6 +++++ 2 files changed, 31 insertions(+) create mode 100644 meta-digi-dey/recipes-multimedia/gst-plugins/gst-plugins-good/0001-v4l2-fix-compilation-against-newer-kernel-headers-as.patch diff --git a/meta-digi-dey/recipes-multimedia/gst-plugins/gst-plugins-good/0001-v4l2-fix-compilation-against-newer-kernel-headers-as.patch b/meta-digi-dey/recipes-multimedia/gst-plugins/gst-plugins-good/0001-v4l2-fix-compilation-against-newer-kernel-headers-as.patch new file mode 100644 index 000000000..78c58a275 --- /dev/null +++ b/meta-digi-dey/recipes-multimedia/gst-plugins/gst-plugins-good/0001-v4l2-fix-compilation-against-newer-kernel-headers-as.patch @@ -0,0 +1,25 @@ +From: Bastien Nocera +Date: Mon, 18 Mar 2013 14:59:35 +0000 +Subject: [PATCH] v4l2: fix compilation against newer kernel headers as on FC19 + +--- + sys/v4l2/v4l2_calls.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/sys/v4l2/v4l2_calls.c b/sys/v4l2/v4l2_calls.c +index 309bfb6..ca10bc4 100644 +--- a/sys/v4l2/v4l2_calls.c ++++ b/sys/v4l2/v4l2_calls.c +@@ -294,8 +294,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 diff --git a/meta-digi-dey/recipes-multimedia/gst-plugins/gst-plugins-good_0.10.31.bbappend b/meta-digi-dey/recipes-multimedia/gst-plugins/gst-plugins-good_0.10.31.bbappend index 935ca8831..17b082c3c 100644 --- a/meta-digi-dey/recipes-multimedia/gst-plugins/gst-plugins-good_0.10.31.bbappend +++ b/meta-digi-dey/recipes-multimedia/gst-plugins/gst-plugins-good_0.10.31.bbappend @@ -3,6 +3,12 @@ PRINC := "${@int(PRINC) + 1}" PR_append = "+${DISTRO}" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI += " \ + file://0001-v4l2-fix-compilation-against-newer-kernel-headers-as.patch \ +" + PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" PACKAGECONFIG[x11] = ",--disable-gconf --disable-x --disable-xshm --disable-xvideo,"