| 1 |
commit: 4e0515713cdef6345aeb04bc57df0468df492bed |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Dec 29 19:51:00 2015 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Dec 29 19:51:15 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e051571 |
| 7 |
|
| 8 |
media-video/libav: fix for libvpx-1.5.0, bug #565696 |
| 9 |
|
| 10 |
Pulled upstream patch as is. |
| 11 |
|
| 12 |
Reported-by: Peter Levine |
| 13 |
Bug: https://bugs.gentoo.org/565696 |
| 14 |
|
| 15 |
Package-Manager: portage-2.2.26 |
| 16 |
|
| 17 |
.../libav/files/libav-11.3-libvpx-1.5.0.patch | 47 ++++++++++++++++++++++ |
| 18 |
media-video/libav/libav-11.3-r1.ebuild | 1 + |
| 19 |
2 files changed, 48 insertions(+) |
| 20 |
|
| 21 |
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 |
| 22 |
new file mode 100644 |
| 23 |
index 0000000..6844a15 |
| 24 |
--- /dev/null |
| 25 |
+++ b/media-video/libav/files/libav-11.3-libvpx-1.5.0.patch |
| 26 |
@@ -0,0 +1,47 @@ |
| 27 |
+https://bugs.gentoo.org/565696 |
| 28 |
+ |
| 29 |
+commit 4d05e9392f84702e3c833efa86e84c7f1cf5f612 |
| 30 |
+Author: James Zern <jzern@××××××.com> |
| 31 |
+Date: Mon Oct 19 22:44:11 2015 -0700 |
| 32 |
+ |
| 33 |
+ libvpxenc: remove some unused ctrl id mappings |
| 34 |
+ |
| 35 |
+ VP8E_UPD_ENTROPY, VP8E_UPD_REFERENCE, VP8E_USE_REFERENCE were removed |
| 36 |
+ from libvpx and the remaining values were never used here |
| 37 |
+ |
| 38 |
+ Reviewed-by: Michael Niedermayer <michael@×××××××××××.cc> |
| 39 |
+ Signed-off-by: James Zern <jzern@××××××.com> |
| 40 |
+ Signed-off-by: Luca Barbato <lu_zero@g.o> |
| 41 |
+ |
| 42 |
+diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c |
| 43 |
+index 563117f..d1e2523 100644 |
| 44 |
+--- a/libavcodec/libvpxenc.c |
| 45 |
++++ b/libavcodec/libvpxenc.c |
| 46 |
+@@ -71,23 +71,15 @@ typedef struct VP8EncoderContext { |
| 47 |
+ |
| 48 |
+ /** String mappings for enum vp8e_enc_control_id */ |
| 49 |
+ static const char *const ctlidstr[] = { |
| 50 |
+- [VP8E_UPD_ENTROPY] = "VP8E_UPD_ENTROPY", |
| 51 |
+- [VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE", |
| 52 |
+- [VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE", |
| 53 |
+- [VP8E_SET_ROI_MAP] = "VP8E_SET_ROI_MAP", |
| 54 |
+- [VP8E_SET_ACTIVEMAP] = "VP8E_SET_ACTIVEMAP", |
| 55 |
+- [VP8E_SET_SCALEMODE] = "VP8E_SET_SCALEMODE", |
| 56 |
++ [VP8E_SET_ARNR_MAXFRAMES] = "VP8E_SET_ARNR_MAXFRAMES", |
| 57 |
++ [VP8E_SET_ARNR_STRENGTH] = "VP8E_SET_ARNR_STRENGTH", |
| 58 |
++ [VP8E_SET_ARNR_TYPE] = "VP8E_SET_ARNR_TYPE", |
| 59 |
+ [VP8E_SET_CPUUSED] = "VP8E_SET_CPUUSED", |
| 60 |
++ [VP8E_SET_CQ_LEVEL] = "VP8E_SET_CQ_LEVEL", |
| 61 |
+ [VP8E_SET_ENABLEAUTOALTREF] = "VP8E_SET_ENABLEAUTOALTREF", |
| 62 |
+ [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY", |
| 63 |
+- [VP8E_SET_SHARPNESS] = "VP8E_SET_SHARPNESS", |
| 64 |
+ [VP8E_SET_STATIC_THRESHOLD] = "VP8E_SET_STATIC_THRESHOLD", |
| 65 |
+ [VP8E_SET_TOKEN_PARTITIONS] = "VP8E_SET_TOKEN_PARTITIONS", |
| 66 |
+- [VP8E_GET_LAST_QUANTIZER] = "VP8E_GET_LAST_QUANTIZER", |
| 67 |
+- [VP8E_SET_ARNR_MAXFRAMES] = "VP8E_SET_ARNR_MAXFRAMES", |
| 68 |
+- [VP8E_SET_ARNR_STRENGTH] = "VP8E_SET_ARNR_STRENGTH", |
| 69 |
+- [VP8E_SET_ARNR_TYPE] = "VP8E_SET_ARNR_TYPE", |
| 70 |
+- [VP8E_SET_CQ_LEVEL] = "VP8E_SET_CQ_LEVEL", |
| 71 |
+ }; |
| 72 |
+ |
| 73 |
+ static av_cold void log_encoder_error(AVCodecContext *avctx, const char *desc) |
| 74 |
|
| 75 |
diff --git a/media-video/libav/libav-11.3-r1.ebuild b/media-video/libav/libav-11.3-r1.ebuild |
| 76 |
index 4034d60..ef74325 100644 |
| 77 |
--- a/media-video/libav/libav-11.3-r1.ebuild |
| 78 |
+++ b/media-video/libav/libav-11.3-r1.ebuild |
| 79 |
@@ -155,6 +155,7 @@ src_prepare() { |
| 80 |
epatch_user |
| 81 |
|
| 82 |
epatch "${WORKDIR}/0001-x86-Put-COPY3_IF_LT-under-HAVE_6REGS.patch" |
| 83 |
+ epatch "${FILESDIR}"/${P}-libvpx-1.5.0.patch #565696 |
| 84 |
|
| 85 |
# if we have snapshot then we need to hardcode the version |
| 86 |
if [[ ${PV%_p*} != ${PV} ]]; then |
Archives