1 |
commit: 8c6cbd5792afee41a77f740ec53459de27bd6650 |
2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jun 19 16:15:50 2017 +0000 |
4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jun 19 16:16:06 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c6cbd57 |
7 |
|
8 |
media-libs/libmp4v2: Fix build with gcc7, patch by Collin Day in bug #600892 |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
11 |
|
12 |
media-libs/libmp4v2/files/gcc7.patch | 13 +++++++++++++ |
13 |
media-libs/libmp4v2/libmp4v2-2.0.0.ebuild | 5 +++-- |
14 |
2 files changed, 16 insertions(+), 2 deletions(-) |
15 |
|
16 |
diff --git a/media-libs/libmp4v2/files/gcc7.patch b/media-libs/libmp4v2/files/gcc7.patch |
17 |
new file mode 100644 |
18 |
index 00000000000..fbfae97e58c |
19 |
--- /dev/null |
20 |
+++ b/media-libs/libmp4v2/files/gcc7.patch |
21 |
@@ -0,0 +1,13 @@ |
22 |
+https://bugs.gentoo.org/show_bug.cgi?id=600892 |
23 |
+ |
24 |
+--- mp4v2-2.0.0/src/rtphint.cpp 2012-05-20 16:11:53.000000000 -0600 |
25 |
++++ /tmp/rtphint.cpp 2017-05-16 10:25:26.930705191 -0600 |
26 |
+@@ -339,7 +339,7 @@ |
27 |
+ pSlash = strchr(pSlash, '/'); |
28 |
+ if (pSlash != NULL) { |
29 |
+ pSlash++; |
30 |
+- if (pSlash != '\0') { |
31 |
++ if (*pSlash != '\0') { |
32 |
+ length = (uint32_t)strlen(pRtpMap) - (pSlash - pRtpMap); |
33 |
+ *ppEncodingParams = (char *)MP4Calloc(length + 1); |
34 |
+ strncpy(*ppEncodingParams, pSlash, length); |
35 |
|
36 |
diff --git a/media-libs/libmp4v2/libmp4v2-2.0.0.ebuild b/media-libs/libmp4v2/libmp4v2-2.0.0.ebuild |
37 |
index de5efb03d9e..b45b0b997ee 100644 |
38 |
--- a/media-libs/libmp4v2/libmp4v2-2.0.0.ebuild |
39 |
+++ b/media-libs/libmp4v2/libmp4v2-2.0.0.ebuild |
40 |
@@ -1,8 +1,8 @@ |
41 |
-# Copyright 1999-2012 Gentoo Foundation |
42 |
+# Copyright 1999-2017 Gentoo Foundation |
43 |
# Distributed under the terms of the GNU General Public License v2 |
44 |
|
45 |
EAPI=4 |
46 |
-inherit libtool |
47 |
+inherit libtool eutils |
48 |
|
49 |
MY_P=${P/lib} |
50 |
|
51 |
@@ -25,6 +25,7 @@ DOCS="doc/*.txt README" |
52 |
S=${WORKDIR}/${MY_P} |
53 |
|
54 |
src_prepare() { |
55 |
+ epatch "${FILESDIR}/gcc7.patch" |
56 |
elibtoolize |
57 |
} |