diff -Nru gst-plugins-good0.10-0.10.31/debian/changelog gst-plugins-good0.10-0.10.31/debian/changelog --- gst-plugins-good0.10-0.10.31/debian/changelog 2013-02-11 11:18:29.000000000 +0000 +++ gst-plugins-good0.10-0.10.31/debian/changelog 2013-06-14 09:58:09.000000000 +0000 @@ -1,3 +1,10 @@ +gst-plugins-good0.10 (0.10.31-3+nmu1ubuntu3) saucy; urgency=low + + * d/p/0001-v4l2-fix-compilation-against-newer-kernel-headers-as.patch: + Cherry-pick upstream patch to fix building against newer v4l2 headers. + + -- Iain Lane Fri, 14 Jun 2013 10:58:09 +0100 + gst-plugins-good0.10 (0.10.31-3+nmu1ubuntu2) raring; urgency=low * debian/patches/0001-fix-v4l2_munmap.patch: Cherry-pick a commit from diff -Nru gst-plugins-good0.10-0.10.31/debian/patches/0001-v4l2-fix-compilation-against-newer-kernel-headers-as.patch gst-plugins-good0.10-0.10.31/debian/patches/0001-v4l2-fix-compilation-against-newer-kernel-headers-as.patch --- gst-plugins-good0.10-0.10.31/debian/patches/0001-v4l2-fix-compilation-against-newer-kernel-headers-as.patch 1970-01-01 00:00:00.000000000 +0000 +++ gst-plugins-good0.10-0.10.31/debian/patches/0001-v4l2-fix-compilation-against-newer-kernel-headers-as.patch 2013-06-14 09:55:41.000000000 +0000 @@ -0,0 +1,26 @@ +From 8e633d2059cb835448021cf79becb487aff10975 Mon Sep 17 00:00:00 2001 +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(+) + +Index: b/sys/v4l2/v4l2_calls.c +=================================================================== +--- a/sys/v4l2/v4l2_calls.c ++++ b/sys/v4l2/v4l2_calls.c +@@ -294,8 +294,12 @@ + 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 -Nru gst-plugins-good0.10-0.10.31/debian/patches/series gst-plugins-good0.10-0.10.31/debian/patches/series --- gst-plugins-good0.10-0.10.31/debian/patches/series 2013-02-11 11:17:45.000000000 +0000 +++ gst-plugins-good0.10-0.10.31/debian/patches/series 2013-06-14 09:55:36.000000000 +0000 @@ -6,3 +6,4 @@ git_ring_buffer_null_check.patch git_new_v4l_building.patch 0001-fix-v4l2_munmap.patch +0001-v4l2-fix-compilation-against-newer-kernel-headers-as.patch