commit: 7419acce365a5445b1d05b11699ac97761569804
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 3 20:15:57 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Oct 3 21:11:27 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7419acce
media-libs/libmp4v2: EAPI-7 bump, fix tag corruption
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
.../{gcc7.patch => libmp4v2-2.0.0-gcc7.patch} | 11 ++++++++---
.../files/libmp4v2-2.0.0-mp4tags-corruption.patch | 20 ++++++++++++++++++++
...mp4v2-2.0.0.ebuild => libmp4v2-2.0.0-r1.ebuild} | 22 +++++++++++++---------
media-libs/libmp4v2/libmp4v2-2.0.0.ebuild | 4 ++--
4 files changed, 43 insertions(+), 14 deletions(-)
diff --git a/media-libs/libmp4v2/files/gcc7.patch
b/media-libs/libmp4v2/files/libmp4v2-2.0.0-gcc7.patch
similarity index 64%
rename from media-libs/libmp4v2/files/gcc7.patch
rename to media-libs/libmp4v2/files/libmp4v2-2.0.0-gcc7.patch
index fbfae97e58c..156f0fcbaa0 100644
--- a/media-libs/libmp4v2/files/gcc7.patch
+++ b/media-libs/libmp4v2/files/libmp4v2-2.0.0-gcc7.patch
@@ -1,8 +1,13 @@
https://bugs.gentoo.org/show_bug.cgi?id=600892
---- mp4v2-2.0.0/src/rtphint.cpp 2012-05-20 16:11:53.000000000 -0600
-+++ /tmp/rtphint.cpp 2017-05-16 10:25:26.930705191 -0600
-@@ -339,7 +339,7 @@
+Description: Fix pointer comparison (FTBFS on GCC 7)
+Author: Philip Chung <philipchung1...@yahoo.com>
+Bug-Debian: https://bugs.debian.org/853560
+Last-Update: 2017-09-04
+
+--- a/src/rtphint.cpp
++++ b/src/rtphint.cpp
+@@ -339,7 +339,7 @@ void MP4RtpHintTrack::GetPayload(
pSlash = strchr(pSlash, '/');
if (pSlash != NULL) {
pSlash++;
diff --git a/media-libs/libmp4v2/files/libmp4v2-2.0.0-mp4tags-corruption.patch
b/media-libs/libmp4v2/files/libmp4v2-2.0.0-mp4tags-corruption.patch
new file mode 100644
index 00000000000..1c41a41da98
--- /dev/null
+++ b/media-libs/libmp4v2/files/libmp4v2-2.0.0-mp4tags-corruption.patch
@@ -0,0 +1,20 @@
+From: "Matteo F. Vescovi" <m...@debian.org>
+Date: Thu, 5 Nov 2015 15:26:00 +0100
+Subject: Fix_mp4tags_corruption
+
+---
+ util/mp4tags.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/util/mp4tags.cpp b/util/mp4tags.cpp
+index 1b9e866..80e89d4 100644
+--- a/util/mp4tags.cpp
++++ b/util/mp4tags.cpp
+@@ -539,6 +539,7 @@ extern "C" int
+ else {
+ fprintf( stderr, "Art file %s not found\n",
tags[i] );
+ }
++ break;
+ }
+ case OPT_ALBUM_ARTIST:
+ MP4TagsSetAlbumArtist( mdata, tags[i] );
\ No newline at end of file
diff --git a/media-libs/libmp4v2/libmp4v2-2.0.0.ebuild
b/media-libs/libmp4v2/libmp4v2-2.0.0-r1.ebuild
similarity index 53%
copy from media-libs/libmp4v2/libmp4v2-2.0.0.ebuild
copy to media-libs/libmp4v2/libmp4v2-2.0.0-r1.ebuild
index b52cf1e5e63..9f5cac1bf14 100644
--- a/media-libs/libmp4v2/libmp4v2-2.0.0.ebuild
+++ b/media-libs/libmp4v2/libmp4v2-2.0.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=4
-inherit libtool eutils
+EAPI=7
MY_P=${P/lib}
+inherit libtool
DESCRIPTION="Functions for accessing ISO-IEC:14496-1:2001 MPEG-4 standard"
HOMEPAGE="https://code.google.com/p/mp4v2/";
@@ -12,20 +12,24 @@ SRC_URI="https://mp4v2.googlecode.com/files/${MY_P}.tar.bz2";
LICENSE="MPL-1.1"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc
~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="static-libs test utils"
-RDEPEND=""
-DEPEND="sys-apps/sed
+BDEPEND="sys-apps/sed
utils? ( sys-apps/help2man )
test? ( dev-util/dejagnu )"
-DOCS="doc/*.txt README"
+DOCS=( doc/{Authors,BuildSource,Documentation,ReleaseNotes,ToolGuide}.txt
README )
S=${WORKDIR}/${MY_P}
+PATCHES=(
+ "${FILESDIR}/${P}-gcc7.patch"
+ "${FILESDIR}/${P}-mp4tags-corruption.patch"
+)
+
src_prepare() {
- epatch "${FILESDIR}/gcc7.patch"
+ default
elibtoolize
}
@@ -38,5 +42,5 @@ src_configure() {
src_install() {
default
- find "${ED}" -name '*.la' -exec rm -f {} +
+ find "${D}" -name '*.la' -delete || die
}
diff --git a/media-libs/libmp4v2/libmp4v2-2.0.0.ebuild
b/media-libs/libmp4v2/libmp4v2-2.0.0.ebuild
index b52cf1e5e63..cd9550fdec8 100644
--- a/media-libs/libmp4v2/libmp4v2-2.0.0.ebuild
+++ b/media-libs/libmp4v2/libmp4v2-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=4
@@ -25,7 +25,7 @@ DOCS="doc/*.txt README"
S=${WORKDIR}/${MY_P}
src_prepare() {
- epatch "${FILESDIR}/gcc7.patch"
+ epatch "${FILESDIR}/${P}-gcc7.patch"
elibtoolize
}
