summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Huettel <dilfridge@gentoo.org>2018-02-16 18:31:27 +0100
committerAndreas K. Huettel <dilfridge@gentoo.org>2018-02-16 18:31:44 +0100
commitf156c7092d93ca8ffbd5d714581f98793c864c19 (patch)
tree2ed11b644e4fefbffee35556fdaab10d736ca08b /media-video/libav
parentnet-dns/pdns: Version bump (diff)
downloadgentoo-f156c7092d93ca8ffbd5d714581f98793c864c19.tar.gz
gentoo-f156c7092d93ca8ffbd5d714581f98793c864c19.tar.bz2
gentoo-f156c7092d93ca8ffbd5d714581f98793c864c19.zip
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
Diffstat (limited to 'media-video/libav')
-rw-r--r--media-video/libav/files/libav-11.8-perl526.patch12
-rw-r--r--media-video/libav/libav-11.8.ebuild3
2 files changed, 14 insertions, 1 deletions
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 000000000000..d9625c653dec
--- /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 4a42816a6301..04dccfd24e3f 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