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

Reply via email to