From 957235cf19a691360c720f7913672adda4258ed0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 7 Oct 2018 11:03:14 +0100 Subject: gentoo resync : 07.10.2018 --- media-libs/libmp4v2/Manifest | 6 ++- media-libs/libmp4v2/files/gcc7.patch | 13 ------ .../libmp4v2/files/libmp4v2-2.0.0-gcc7.patch | 18 +++++++++ .../files/libmp4v2-2.0.0-mp4tags-corruption.patch | 20 ++++++++++ media-libs/libmp4v2/libmp4v2-2.0.0-r1.ebuild | 46 ++++++++++++++++++++++ media-libs/libmp4v2/libmp4v2-2.0.0.ebuild | 4 +- 6 files changed, 90 insertions(+), 17 deletions(-) delete mode 100644 media-libs/libmp4v2/files/gcc7.patch create mode 100644 media-libs/libmp4v2/files/libmp4v2-2.0.0-gcc7.patch create mode 100644 media-libs/libmp4v2/files/libmp4v2-2.0.0-mp4tags-corruption.patch create mode 100644 media-libs/libmp4v2/libmp4v2-2.0.0-r1.ebuild (limited to 'media-libs/libmp4v2') diff --git a/media-libs/libmp4v2/Manifest b/media-libs/libmp4v2/Manifest index 25b6b84dc910..167d729cc6f5 100644 --- a/media-libs/libmp4v2/Manifest +++ b/media-libs/libmp4v2/Manifest @@ -1,6 +1,8 @@ -AUX gcc7.patch 624 BLAKE2B dac53de5e62c1e074451930e221f71e73cde5f98e075b89b16a3e5628078881df7ac5e3a692c8e34e5475888adfcb1eeabcadd5f9f6f6a7da2ed84dd34e10876 SHA512 2a5ed4c573fb9b5b3fa95d66c4863e831734a32278394fa6ee2c3d4e2972ca330ffd3b9f2dc88f8b7665ee5798795e4413bdf9d840dbf45a9ed17e8add71056d +AUX libmp4v2-2.0.0-gcc7.patch 747 BLAKE2B 5bed55f8c9e9593261d9738871de162fdfaec6239078e3ffc0fc85352e60687ba93e37f63edd8fbaf576ffa5966aef07fd58171366ec60ac5969a80eb92f6016 SHA512 18433209711b88cf4a09dcf6ad26d7d717d6593d9b006258e80aac85fee01da17bbf7e67e60c75c82e18652eaddcdb2d945dec52f2f75aa0f236bd5328aab760 +AUX libmp4v2-2.0.0-mp4tags-corruption.patch 641 BLAKE2B 2e375382dd8bab2e7a006fe9f80c8d44ee1e2b00ccf9b4a4250782437fe49b6be25e2badb9bff774b5568d175111953f7cdc064d0a1eff8425632eb2221a7ef0 SHA512 479615f92556beb36b2a489c228b1f7b64f8d59d5d0131e414fa82e3961b46c9b99fb6671d8c54c996de58472660ffc4e999a3ff7ce03f6c00b04365947e471a DIST mp4v2-1.9.1.tar.bz2 432943 BLAKE2B 529ecc3ebd9192ab61febd0512704b5867abf29dc9755c5e61100522ebecc25189000886b152115c12fedbfbe5cc38bb36adb9281e6e60bbf43e86605432aae0 SHA512 28b6f96c1d44a1601980113767c38f5b5b058e1a1fae25c18632163e948c18fc884af9d146bb68e771303ab3c5c8ef9437f4fffa7d770d29157f2d455ee4b1c8 DIST mp4v2-2.0.0.tar.bz2 495672 BLAKE2B 966c90b443bd6f7a81c96fd12f95b00c3ec89cd476aa0fff3e0450b315d54543578ef953c5e3f28d52ca800a0768c601dddc8e99a32ff512767cd65c12832bd5 SHA512 15eb882f33d72d4209053b54c883b67715f539c33096705a0e7bc79015b93f6f3ac80ae29c65a0ffe9eab1bf0dedf07198bdee23fa6eafcd6ccb34f984484be0 EBUILD libmp4v2-1.9.1-r1.ebuild 942 BLAKE2B 5e19a4fabe3ce152f34767003a423d898e39d110f58b7a35d540198dc0182578c7121ed339a3ccbb8dd238333b4d5d1470f0521b625bbb40ad279114d626ab54 SHA512 112c12d3642e06e8a7d0a7ca027840cf39cece7ad20ba555f645b86c8538be8647a313d474cb1019c47b77d235735603194378711778b159a7ea4518e39ae1b3 -EBUILD libmp4v2-2.0.0.ebuild 960 BLAKE2B df78bc60350053fcbdcedce411318bd40a2a156ce53aeaca059fd37a4ba1c3ea9aea9de5ca5d79ff47e004faa5b8ba0a301ef1d001ab34ec9e0d47089f655e2e SHA512 b712567ee122d5aa2642749c21d7c683429b743a7469f24f325efe319354f1a343f579a0efda51e492525a950f39182e50d427efa4101d77bbbfa404e14fc10b +EBUILD libmp4v2-2.0.0-r1.ebuild 1071 BLAKE2B 0635266a4893ebb9a9f32728408b6eb8f8d8bf14a046c73fa9ee26941965dc2c0d89b2e15ecc61b553996c8544b3cc5b7eed40f3d2649e34eb0bfae24f7dbb92 SHA512 88e05306846b77fe3bcc18ed132c696ec1e14215fb7c01ccc257abd54279510a60cc7c04f648e560de81c3308f97ca8df5cf76c3f621ba0dd77bd8f16df565d2 +EBUILD libmp4v2-2.0.0.ebuild 962 BLAKE2B 7970f6a4fd28c7e76a7f4cdccdb75425949aa98c1dea1b265867d55bb2e6409a2c4b70acdda101649710345899951cd084f1f286cd0fa7f6422be2222ef4955b SHA512 c38f286376dd1e82da888c6b1833485b3c2dc0c657974b58e717d20d05cee6512b9da70d33f9ead9cb43daf128a00f55a57a934cee62dc00e4f209cee1aed7fc MISC metadata.xml 402 BLAKE2B ed37dabc480f00cf0f23df37f1e1f9203d81415f9c030f307f1265f9550f5e6a2466de8387b0f16eb7c40dd6e3705bff031df7b264594a7319751ba83c1c7d6b SHA512 63643195e04ecdb3a79a862991760894a4fc52aa073ee1aba1efba4babdd926002fe271d04f82e4e40dbf4cad2fa77fd7853620fe11badb14cc83d27c342ad70 diff --git a/media-libs/libmp4v2/files/gcc7.patch b/media-libs/libmp4v2/files/gcc7.patch deleted file mode 100644 index fbfae97e58c0..000000000000 --- a/media-libs/libmp4v2/files/gcc7.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 @@ - pSlash = strchr(pSlash, '/'); - if (pSlash != NULL) { - pSlash++; -- if (pSlash != '\0') { -+ if (*pSlash != '\0') { - length = (uint32_t)strlen(pRtpMap) - (pSlash - pRtpMap); - *ppEncodingParams = (char *)MP4Calloc(length + 1); - strncpy(*ppEncodingParams, pSlash, length); diff --git a/media-libs/libmp4v2/files/libmp4v2-2.0.0-gcc7.patch b/media-libs/libmp4v2/files/libmp4v2-2.0.0-gcc7.patch new file mode 100644 index 000000000000..156f0fcbaa0d --- /dev/null +++ b/media-libs/libmp4v2/files/libmp4v2-2.0.0-gcc7.patch @@ -0,0 +1,18 @@ +https://bugs.gentoo.org/show_bug.cgi?id=600892 + +Description: Fix pointer comparison (FTBFS on GCC 7) +Author: Philip Chung +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++; +- if (pSlash != '\0') { ++ if (*pSlash != '\0') { + length = (uint32_t)strlen(pRtpMap) - (pSlash - pRtpMap); + *ppEncodingParams = (char *)MP4Calloc(length + 1); + strncpy(*ppEncodingParams, pSlash, length); 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 000000000000..1c41a41da988 --- /dev/null +++ b/media-libs/libmp4v2/files/libmp4v2-2.0.0-mp4tags-corruption.patch @@ -0,0 +1,20 @@ +From: "Matteo F. Vescovi" +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-r1.ebuild b/media-libs/libmp4v2/libmp4v2-2.0.0-r1.ebuild new file mode 100644 index 000000000000..9f5cac1bf140 --- /dev/null +++ b/media-libs/libmp4v2/libmp4v2-2.0.0-r1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +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/" +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" +IUSE="static-libs test utils" + +BDEPEND="sys-apps/sed + utils? ( sys-apps/help2man ) + test? ( dev-util/dejagnu )" + +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() { + default + elibtoolize +} + +src_configure() { + econf \ + --disable-gch \ + $(use_enable utils util) \ + $(use_enable static-libs static) +} + +src_install() { + default + 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 b52cf1e5e630..cd9550fdec8e 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 } -- cgit v1.2.3