summaryrefslogtreecommitdiff
path: root/packages/strace/4.24
diff options
context:
space:
mode:
Diffstat (limited to 'packages/strace/4.24')
-rw-r--r--packages/strace/4.24/0000-v4l2-kernel-abi-breakage.patch (renamed from packages/strace/4.24/0001-v4l2-kernel-abi-breakage.patch)14
1 files changed, 8 insertions, 6 deletions
diff --git a/packages/strace/4.24/0001-v4l2-kernel-abi-breakage.patch b/packages/strace/4.24/0000-v4l2-kernel-abi-breakage.patch
index be719e4..5fce43f 100644
--- a/packages/strace/4.24/0001-v4l2-kernel-abi-breakage.patch
+++ b/packages/strace/4.24/0000-v4l2-kernel-abi-breakage.patch
@@ -20,11 +20,14 @@ Date: Sat Aug 18 07:22:47 2018 +0000
Co-Authored-by: Eugene Syromyatnikov <evgsyr@gmail.com>
-diff --git a/xlat/v4l2_control_id_bases.in b/xlat/v4l2_control_id_bases.in
-index a0359be9..f3fd9255 100644
+---
+ xlat/v4l2_control_id_bases.h | 23 +++++++++++++++++++++--
+ xlat/v4l2_control_id_bases.in | 17 ++++++++++++++++-
+ 2 files changed, 37 insertions(+), 3 deletions(-)
+
--- a/xlat/v4l2_control_id_bases.in
+++ b/xlat/v4l2_control_id_bases.in
-@@ -2,7 +2,22 @@ V4L2_CID_BASE (V4L2_CTRL_CLASS_USER | 0x900)
+@@ -2,7 +2,22 @@
V4L2_CID_USER_MEYE_BASE (V4L2_CID_BASE + 0x1000)
V4L2_CID_USER_BTTV_BASE (V4L2_CID_BASE + 0x1010)
V4L2_CID_USER_TI_VPE_BASE (V4L2_CID_BASE + 0x1050)
@@ -48,10 +51,9 @@ index a0359be9..f3fd9255 100644
V4L2_CID_MPEG_BASE (V4L2_CTRL_CLASS_MPEG | 0x900)
V4L2_CID_MPEG_CX2341X_BASE (V4L2_CTRL_CLASS_MPEG | 0x1000)
V4L2_CID_MPEG_MFC51_BASE (V4L2_CTRL_CLASS_MPEG | 0x1100)
-diff -urpN a/xlat/v4l2_control_id_bases.h b/xlat/v4l2_control_id_bases.h
--- a/xlat/v4l2_control_id_bases.h
+++ b/xlat/v4l2_control_id_bases.h
-@@ -31,12 +31,16 @@ DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE
+@@ -31,12 +31,16 @@
#else
# define V4L2_CID_USER_TI_VPE_BASE (V4L2_CID_BASE + 0x1050)
#endif
@@ -70,7 +72,7 @@ diff -urpN a/xlat/v4l2_control_id_bases.h b/xlat/v4l2_control_id_bases.h
#endif
#if defined(V4L2_CID_MPEG_BASE) || (defined(HAVE_DECL_V4L2_CID_MPEG_BASE) && HAVE_DECL_V4L2_CID_MPEG_BASE)
DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE
-@@ -146,6 +150,21 @@ const struct xlat v4l2_control_id_bases[
+@@ -146,6 +150,21 @@
XLAT(V4L2_CID_USER_MEYE_BASE),
XLAT(V4L2_CID_USER_BTTV_BASE),
XLAT(V4L2_CID_USER_TI_VPE_BASE),