sys-kernel/linux-headers: remove non-upstream V4L2 control
V4L2_CID_MPEG_VIDEO_H264_SPS_PPS_BEFORE_IDR is not used anymore and has
been replaced by the upstream V4L2_CID_MPEG_VIDEO_PREPEND_SPSPPS_TO_IDR,
and is not used anywhere in Chromium, so we can remove it.
BUG=b:167992324
TEST=emerge-kukui linux-header
Change-Id: I79d03dc47085c395b81123e6c4b5e6d521abfa5c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/chromiumos-overlay/+/2434171
Reviewed-by: Fritz Koenig <frkoenig@chromium.org>
Tested-by: Alexandre Courbot <acourbot@chromium.org>
Commit-Queue: Alexandre Courbot <acourbot@chromium.org>
diff --git a/sys-kernel/linux-headers/files/0005-CHROMIUM-v4l-Add-V4L2_CID_MPEG_VIDEO_H264_SPS_PPS_BE.patch b/sys-kernel/linux-headers/files/0005-CHROMIUM-v4l-Add-V4L2_CID_MPEG_VIDEO_H264_SPS_PPS_BE.patch
deleted file mode 100644
index f8c1202..0000000
--- a/sys-kernel/linux-headers/files/0005-CHROMIUM-v4l-Add-V4L2_CID_MPEG_VIDEO_H264_SPS_PPS_BE.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From a08565df495036b40d712aa3fdcb1d42e8f3cd4b Mon Sep 17 00:00:00 2001
-From: Pawel Osciak <posciak@chromium.org>
-Date: Fri, 19 Aug 2016 18:12:09 +0900
-Subject: [PATCH] CHROMIUM: v4l: Add
- V4L2_CID_MPEG_VIDEO_H264_SPS_PPS_BEFORE_IDR
-
-When set, the V4L2_CID_MPEG_VIDEO_H264_SPS_PPS_BEFORE_IDR control requests
-an H.264 encoder to insert an SPS and PPS pair before each IDR.
-
-Signed-off-by: Pawel Osciak <posciak@chromium.org>
-
-BUG=chromium:639238
-
-[fbuergisser@chromium.org: original patch modified as h264 headers were moved
- to other header files which cause a failure when applying the original patch.
- Keeping part of the original patch for context.]
----
- include/uapi/linux/v4l2-controls.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h
-index e65de7df0866..830eae8f9d0d 100644
---- a/include/uapi/linux/v4l2-controls.h
-+++ b/include/uapi/linux/v4l2-controls.h
-@@ -531,6 +531,7 @@ enum v4l2_mpeg_video_h264_hierarchical_coding_type {
- };
- #define V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_LAYER (V4L2_CID_MPEG_BASE+381)
- #define V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_LAYER_QP (V4L2_CID_MPEG_BASE+382)
-+#define V4L2_CID_MPEG_VIDEO_H264_SPS_PPS_BEFORE_IDR (V4L2_CID_MPEG_BASE+388)
- #define V4L2_CID_MPEG_VIDEO_MPEG4_I_FRAME_QP (V4L2_CID_MPEG_BASE+400)
- #define V4L2_CID_MPEG_VIDEO_MPEG4_P_FRAME_QP (V4L2_CID_MPEG_BASE+401)
- #define V4L2_CID_MPEG_VIDEO_MPEG4_B_FRAME_QP (V4L2_CID_MPEG_BASE+402)
---
-2.22.0.657.g960e92d24f-goog
-
diff --git a/sys-kernel/linux-headers/linux-headers-4.14-r28.ebuild b/sys-kernel/linux-headers/linux-headers-4.14-r29.ebuild
similarity index 100%
rename from sys-kernel/linux-headers/linux-headers-4.14-r28.ebuild
rename to sys-kernel/linux-headers/linux-headers-4.14-r29.ebuild
diff --git a/sys-kernel/linux-headers/linux-headers-4.14.ebuild b/sys-kernel/linux-headers/linux-headers-4.14.ebuild
index b4a7117..76ce575 100644
--- a/sys-kernel/linux-headers/linux-headers-4.14.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-4.14.ebuild
@@ -27,7 +27,6 @@
"${FILESDIR}/0001-CHROMIUM-media-headers-Import-V4L2-headers-from-Chro.patch"
"${FILESDIR}/0002-CHROMIUM-v4l-Add-VP8-low-level-decoder-API-controls.patch"
"${FILESDIR}/0004-CHROMIUM-v4l-Add-VP9-low-level-decoder-API-controls.patch"
- "${FILESDIR}/0005-CHROMIUM-v4l-Add-V4L2_CID_MPEG_VIDEO_H264_SPS_PPS_BE.patch"
"${FILESDIR}/0007-media-videodev2.h-add-IPU3-raw10-color.patch"
"${FILESDIR}/0008-videodev2.h-add-IPU3-meta-buffer-format.patch"
"${FILESDIR}/0009-uapi-intel-ipu3-Add-user-space-ABI-definitions.patch"
