diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch | |
parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch')
-rw-r--r-- | meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch deleted file mode 100644 index bd0de583a..000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch +++ /dev/null @@ -1,45 +0,0 @@ -From ccb01de8096a32d86d47b0d92ec3416c57ee4d25 Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield <bruce.ashfield@windriver.com> -Date: Thu, 22 Aug 2013 12:15:54 -0400 -Subject: [PATCH] v4l2_calls: define V4L2_CID_HCENTER and V4L2_CID_VCENTER - -kernel commit 24b9f5017 [[media] V4L: Remove deprecated image centering controls] -removed the definitions of V4L2_CID_HCENTER and V4L2_CID_VCENTER after three -years of depreciation. - -The ioctl values are still free, and the case statement which processess them -in v4l2 userspace falls through to the proper replacement. So in the short -term, we can explicitly define them using the old absolute values, and everything -will work. - -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ---- - sys/v4l2/v4l2_calls.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/sys/v4l2/v4l2_calls.c b/sys/v4l2/v4l2_calls.c -index 309bfb6..3c64544 100644 ---- a/sys/v4l2/v4l2_calls.c -+++ b/sys/v4l2/v4l2_calls.c -@@ -54,11 +54,16 @@ - #include "gst/gst-i18n-plugin.h" - - /* Those are ioctl calls */ -+ -+/* V4L2_CID_HCENTER has been removed from the mainline kernel, but -+ the ioctl space is still present. Since these values fall through -+ to their replacement, it is safe (in the short term) to re-use the -+ old values explictily */ - #ifndef V4L2_CID_HCENTER --#define V4L2_CID_HCENTER V4L2_CID_HCENTER_DEPRECATED -+#define V4L2_CID_HCENTER V4L2_CID_BASE+22 - #endif - #ifndef V4L2_CID_VCENTER --#define V4L2_CID_VCENTER V4L2_CID_VCENTER_DEPRECATED -+#define V4L2_CID_VCENTER V4L2_CID_BASE+23 - #endif - - GST_DEBUG_CATEGORY_EXTERN (v4l2_debug); --- -1.7.10.4 - |