commit: 6ec283cc09751de50cb70f74e8943019a68499ad Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Sat Feb 16 19:37:05 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Feb 21 10:29:10 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ec283cc
media-video/libav: remove unused patch(es) Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/11075 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../libav/files/libav-11.3-libvpx-1.5.0.patch | 47 ---------------------- media-video/libav/files/libav-11.8-perl526.patch | 12 ------ 2 files changed, 59 deletions(-) diff --git a/media-video/libav/files/libav-11.3-libvpx-1.5.0.patch b/media-video/libav/files/libav-11.3-libvpx-1.5.0.patch deleted file mode 100644 index 6844a152b7a..00000000000 --- a/media-video/libav/files/libav-11.3-libvpx-1.5.0.patch +++ /dev/null @@ -1,47 +0,0 @@ -https://bugs.gentoo.org/565696 - -commit 4d05e9392f84702e3c833efa86e84c7f1cf5f612 -Author: James Zern <[email protected]> -Date: Mon Oct 19 22:44:11 2015 -0700 - - libvpxenc: remove some unused ctrl id mappings - - VP8E_UPD_ENTROPY, VP8E_UPD_REFERENCE, VP8E_USE_REFERENCE were removed - from libvpx and the remaining values were never used here - - Reviewed-by: Michael Niedermayer <[email protected]> - Signed-off-by: James Zern <[email protected]> - Signed-off-by: Luca Barbato <[email protected]> - -diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c -index 563117f..d1e2523 100644 ---- a/libavcodec/libvpxenc.c -+++ b/libavcodec/libvpxenc.c -@@ -71,23 +71,15 @@ typedef struct VP8EncoderContext { - - /** String mappings for enum vp8e_enc_control_id */ - static const char *const ctlidstr[] = { -- [VP8E_UPD_ENTROPY] = "VP8E_UPD_ENTROPY", -- [VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE", -- [VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE", -- [VP8E_SET_ROI_MAP] = "VP8E_SET_ROI_MAP", -- [VP8E_SET_ACTIVEMAP] = "VP8E_SET_ACTIVEMAP", -- [VP8E_SET_SCALEMODE] = "VP8E_SET_SCALEMODE", -+ [VP8E_SET_ARNR_MAXFRAMES] = "VP8E_SET_ARNR_MAXFRAMES", -+ [VP8E_SET_ARNR_STRENGTH] = "VP8E_SET_ARNR_STRENGTH", -+ [VP8E_SET_ARNR_TYPE] = "VP8E_SET_ARNR_TYPE", - [VP8E_SET_CPUUSED] = "VP8E_SET_CPUUSED", -+ [VP8E_SET_CQ_LEVEL] = "VP8E_SET_CQ_LEVEL", - [VP8E_SET_ENABLEAUTOALTREF] = "VP8E_SET_ENABLEAUTOALTREF", - [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY", -- [VP8E_SET_SHARPNESS] = "VP8E_SET_SHARPNESS", - [VP8E_SET_STATIC_THRESHOLD] = "VP8E_SET_STATIC_THRESHOLD", - [VP8E_SET_TOKEN_PARTITIONS] = "VP8E_SET_TOKEN_PARTITIONS", -- [VP8E_GET_LAST_QUANTIZER] = "VP8E_GET_LAST_QUANTIZER", -- [VP8E_SET_ARNR_MAXFRAMES] = "VP8E_SET_ARNR_MAXFRAMES", -- [VP8E_SET_ARNR_STRENGTH] = "VP8E_SET_ARNR_STRENGTH", -- [VP8E_SET_ARNR_TYPE] = "VP8E_SET_ARNR_TYPE", -- [VP8E_SET_CQ_LEVEL] = "VP8E_SET_CQ_LEVEL", - }; - - static av_cold void log_encoder_error(AVCodecContext *avctx, const char *desc) diff --git a/media-video/libav/files/libav-11.8-perl526.patch b/media-video/libav/files/libav-11.8-perl526.patch deleted file mode 100644 index d9625c653de..00000000000 --- a/media-video/libav/files/libav-11.8-perl526.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN libav-11.8.orig/doc/texi2pod.pl libav-11.8/doc/texi2pod.pl ---- libav-11.8.orig/doc/texi2pod.pl 2016-09-06 18:09:14.000000000 +0200 -+++ libav-11.8/doc/texi2pod.pl 2018-02-16 18:25:11.823113370 +0100 -@@ -379,7 +379,7 @@ - # @* is also impossible in .pod; we discard it and any newline that - # follows it. Similarly, our macro @gol must be discarded. - -- s/\@anchor{(?:[^\}]*)\}//g; -+ s/\@anchor\{(?:[^\}]*)\}//g; - s/\(?\@xref\{(?:[^\}]*)\}(?:[^.<]|(?:<[^<>]*>))*\.\)?//g; - s/\s+\(\@pxref\{(?:[^\}]*)\}\)//g; - s/;\s+\@pxref\{(?:[^\}]*)\}//g;
