[gentoo-commits] repo/gentoo:master commit in: media-video/libav/files/, media-video/libav/

[gentoo-commits] repo/gentoo:master commit in: media-video/libav/files/, media-video/libav/

[Sergei Trofimovich]

commit:     4e0515713cdef6345aeb04bc57df0468df492bed
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 29 19:51:00 2015 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Dec 29 19:51:15 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e051571

media-video/libav: fix for libvpx-1.5.0, bug #565696

Pulled upstream patch as is.

Reported-by: Peter Levine
Bug: https://bugs.gentoo.org/565696

Package-Manager: portage-2.2.26

 .../libav/files/libav-11.3-libvpx-1.5.0.patch      | 47 ++++++++++++++++++++++
 media-video/libav/libav-11.3-r1.ebuild             |  1 +
 2 files changed, 48 insertions(+)

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
new file mode 100644
index 0000000..6844a15
--- /dev/null
+++ b/media-video/libav/files/libav-11.3-libvpx-1.5.0.patch
@@ -0,0 +1,47 @@
+https://bugs.gentoo.org/565696
+
+commit 4d05e9392f84702e3c833efa86e84c7f1cf5f612
+Author: James Zern <jzern@google.com>
+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 <michael@niedermayer.cc>
+    Signed-off-by: James Zern <jzern@google.com>
+    Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
+
+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/libav-11.3-r1.ebuild b/media-video/libav/libav-11.3-r1.ebuild
index 4034d60..ef74325 100644
--- a/media-video/libav/libav-11.3-r1.ebuild
+++ b/media-video/libav/libav-11.3-r1.ebuild
@@ -155,6 +155,7 @@ src_prepare() {
 	epatch_user
 
 	epatch "${WORKDIR}/0001-x86-Put-COPY3_IF_LT-under-HAVE_6REGS.patch"
+	epatch "${FILESDIR}"/${P}-libvpx-1.5.0.patch #565696
 
 	# if we have snapshot then we need to hardcode the version
 	if [[ ${PV%_p*} != ${PV} ]]; then

[gentoo-commits] repo/gentoo:master commit in: media-video/libav/files/, media-video/libav/

[Andreas Hüttel]

commit:     f156c7092d93ca8ffbd5d714581f98793c864c19
Author:     Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 16 17:31:27 2018 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Feb 16 17:31:44 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f156c709

media-video/libav: Fix build with perl-5.26, bug 634646

Closes: https://bugs.gentoo.org/634646
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-video/libav/files/libav-11.8-perl526.patch | 12 ++++++++++++
 media-video/libav/libav-11.8.ebuild              |  3 ++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/media-video/libav/files/libav-11.8-perl526.patch b/media-video/libav/files/libav-11.8-perl526.patch
new file mode 100644
index 00000000000..d9625c653de
--- /dev/null
+++ b/media-video/libav/files/libav-11.8-perl526.patch
@@ -0,0 +1,12 @@
+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;

diff --git a/media-video/libav/libav-11.8.ebuild b/media-video/libav/libav-11.8.ebuild
index 4a42816a630..04dccfd24e3 100644
--- a/media-video/libav/libav-11.8.ebuild
+++ b/media-video/libav/libav-11.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -153,6 +153,7 @@ src_prepare() {
 	epatch_user
 
 	epatch "${FILESDIR}"/libav-11.3-libvpx-1.5.0.patch #565696
+	epatch "${FILESDIR}"/libav-11.8-perl526.patch      #634646
 
 	# if we have snapshot then we need to hardcode the version
 	if [[ ${PV%_p*} != ${PV} ]]; then