diff options
2 files changed, 46 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31/0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch b/meta/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31/0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch new file mode 100644 index 0000000000..bd0de583a5 --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31/0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch | |||
@@ -0,0 +1,45 @@ | |||
1 | From ccb01de8096a32d86d47b0d92ec3416c57ee4d25 Mon Sep 17 00:00:00 2001 | ||
2 | From: Bruce Ashfield <bruce.ashfield@windriver.com> | ||
3 | Date: Thu, 22 Aug 2013 12:15:54 -0400 | ||
4 | Subject: [PATCH] v4l2_calls: define V4L2_CID_HCENTER and V4L2_CID_VCENTER | ||
5 | |||
6 | kernel commit 24b9f5017 [[media] V4L: Remove deprecated image centering controls] | ||
7 | removed the definitions of V4L2_CID_HCENTER and V4L2_CID_VCENTER after three | ||
8 | years of depreciation. | ||
9 | |||
10 | The ioctl values are still free, and the case statement which processess them | ||
11 | in v4l2 userspace falls through to the proper replacement. So in the short | ||
12 | term, we can explicitly define them using the old absolute values, and everything | ||
13 | will work. | ||
14 | |||
15 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> | ||
16 | --- | ||
17 | sys/v4l2/v4l2_calls.c | 9 +++++++-- | ||
18 | 1 file changed, 7 insertions(+), 2 deletions(-) | ||
19 | |||
20 | diff --git a/sys/v4l2/v4l2_calls.c b/sys/v4l2/v4l2_calls.c | ||
21 | index 309bfb6..3c64544 100644 | ||
22 | --- a/sys/v4l2/v4l2_calls.c | ||
23 | +++ b/sys/v4l2/v4l2_calls.c | ||
24 | @@ -54,11 +54,16 @@ | ||
25 | #include "gst/gst-i18n-plugin.h" | ||
26 | |||
27 | /* Those are ioctl calls */ | ||
28 | + | ||
29 | +/* V4L2_CID_HCENTER has been removed from the mainline kernel, but | ||
30 | + the ioctl space is still present. Since these values fall through | ||
31 | + to their replacement, it is safe (in the short term) to re-use the | ||
32 | + old values explictily */ | ||
33 | #ifndef V4L2_CID_HCENTER | ||
34 | -#define V4L2_CID_HCENTER V4L2_CID_HCENTER_DEPRECATED | ||
35 | +#define V4L2_CID_HCENTER V4L2_CID_BASE+22 | ||
36 | #endif | ||
37 | #ifndef V4L2_CID_VCENTER | ||
38 | -#define V4L2_CID_VCENTER V4L2_CID_VCENTER_DEPRECATED | ||
39 | +#define V4L2_CID_VCENTER V4L2_CID_BASE+23 | ||
40 | #endif | ||
41 | |||
42 | GST_DEBUG_CATEGORY_EXTERN (v4l2_debug); | ||
43 | -- | ||
44 | 1.7.10.4 | ||
45 | |||
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 daffcf1f4a..d18e1555a0 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 | |||
@@ -23,6 +23,7 @@ DEPENDS += "gst-plugins-base gconf cairo libpng zlib libid3tag flac \ | |||
23 | inherit gettext gconf | 23 | inherit gettext gconf |
24 | 24 | ||
25 | SRC_URI += "file://0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch" | 25 | SRC_URI += "file://0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch" |
26 | SRC_URI += "file://0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch" | ||
26 | 27 | ||
27 | EXTRA_OECONF += "--disable-aalib --disable-esd --disable-shout2 --disable-libcaca --disable-hal --without-check \ | 28 | EXTRA_OECONF += "--disable-aalib --disable-esd --disable-shout2 --disable-libcaca --disable-hal --without-check \ |
28 | --disable-examples --disable-taglib" | 29 | --disable-examples --disable-taglib" |