| 1 |
commit: f156c7092d93ca8ffbd5d714581f98793c864c19 |
| 2 |
Author: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Feb 16 17:31:27 2018 +0000 |
| 4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Feb 16 17:31:44 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f156c709 |
| 7 |
|
| 8 |
media-video/libav: Fix build with perl-5.26, bug 634646 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/634646 |
| 11 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 12 |
|
| 13 |
media-video/libav/files/libav-11.8-perl526.patch | 12 ++++++++++++ |
| 14 |
media-video/libav/libav-11.8.ebuild | 3 ++- |
| 15 |
2 files changed, 14 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/media-video/libav/files/libav-11.8-perl526.patch b/media-video/libav/files/libav-11.8-perl526.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..d9625c653de |
| 20 |
--- /dev/null |
| 21 |
+++ b/media-video/libav/files/libav-11.8-perl526.patch |
| 22 |
@@ -0,0 +1,12 @@ |
| 23 |
+diff -ruN libav-11.8.orig/doc/texi2pod.pl libav-11.8/doc/texi2pod.pl |
| 24 |
+--- libav-11.8.orig/doc/texi2pod.pl 2016-09-06 18:09:14.000000000 +0200 |
| 25 |
++++ libav-11.8/doc/texi2pod.pl 2018-02-16 18:25:11.823113370 +0100 |
| 26 |
+@@ -379,7 +379,7 @@ |
| 27 |
+ # @* is also impossible in .pod; we discard it and any newline that |
| 28 |
+ # follows it. Similarly, our macro @gol must be discarded. |
| 29 |
+ |
| 30 |
+- s/\@anchor{(?:[^\}]*)\}//g; |
| 31 |
++ s/\@anchor\{(?:[^\}]*)\}//g; |
| 32 |
+ s/\(?\@xref\{(?:[^\}]*)\}(?:[^.<]|(?:<[^<>]*>))*\.\)?//g; |
| 33 |
+ s/\s+\(\@pxref\{(?:[^\}]*)\}\)//g; |
| 34 |
+ s/;\s+\@pxref\{(?:[^\}]*)\}//g; |
| 35 |
|
| 36 |
diff --git a/media-video/libav/libav-11.8.ebuild b/media-video/libav/libav-11.8.ebuild |
| 37 |
index 4a42816a630..04dccfd24e3 100644 |
| 38 |
--- a/media-video/libav/libav-11.8.ebuild |
| 39 |
+++ b/media-video/libav/libav-11.8.ebuild |
| 40 |
@@ -1,4 +1,4 @@ |
| 41 |
-# Copyright 1999-2017 Gentoo Foundation |
| 42 |
+# Copyright 1999-2018 Gentoo Foundation |
| 43 |
# Distributed under the terms of the GNU General Public License v2 |
| 44 |
|
| 45 |
EAPI=5 |
| 46 |
@@ -153,6 +153,7 @@ src_prepare() { |
| 47 |
epatch_user |
| 48 |
|
| 49 |
epatch "${FILESDIR}"/libav-11.3-libvpx-1.5.0.patch #565696 |
| 50 |
+ epatch "${FILESDIR}"/libav-11.8-perl526.patch #634646 |
| 51 |
|
| 52 |
# if we have snapshot then we need to hardcode the version |
| 53 |
if [[ ${PV%_p*} != ${PV} ]]; then |
Archives