commit: a46628d5c2a1f48915d24a37a9f7af6092c091f7 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Mon Sep 5 08:00:34 2016 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Mon Sep 5 08:00:46 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a46628d5
media-sound/mixxx: Fixed compilation with ffmpeg-3.x Package-Manager: portage-2.3.0 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> media-sound/mixxx/Manifest | 2 ++ media-sound/mixxx/mixxx-2.0.0-r1.ebuild | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest index ca29669..cb3150a 100644 --- a/media-sound/mixxx/Manifest +++ b/media-sound/mixxx/Manifest @@ -1,3 +1,5 @@ DIST mixxx-1.10.1-src.tar.gz 15948956 SHA256 eab49a95336dacee9a9e4c2ad22a0436e9c0b341930e9a03e3b46619d7a9f365 SHA512 eff18cba96d781830d33a35cf74dcac0dc33c9d2c16e9533d171d2acc2fd0ad602f5bb46d62212e224e61357332a5d9ed078ca86532f39ee01057eb3aaf09af3 WHIRLPOOL 39fda17c512030da1c4de4e495ad22ff9fda9b5aeccfcdd3a7f35d08ebed79c2e6655bef409a43bfd25a072a01e3512669a566048f40b46c9d1c3143f58f821c DIST mixxx-1.11.0-src.tar.gz 24473835 SHA256 00961b5d6c1e6d6686d76e55de474b943bbeff4e59b163dddd3d9940dc1b0331 SHA512 a42c2e3a648986e401f9812315942b5c68e0bc4f47ce867eb043d64f9d7836860e414b04b5e5da52b0541da5069d231774f30e965bcf3bd0db09f6bca74876c2 WHIRLPOOL 9ab4de6bfa5840500f04a4e7d523b6546e0ef08ade017f14b73425e205f039a6da11604f2b0e902085ff3062fff451385f984735029592d4b10ac3d4e0c985b1 +DIST mixxx-2.0.0-ffmpeg30.patch 714 SHA256 a5b6e8fd94ae6572efbff79529dcdb8ec2fc78a2c8fc0864d222516c8dc7b272 SHA512 60788ecab1fa92b825815fff5dfdfefe02fb097e46f7f55f318bb8a8677da42e4601cce51eaaec51988990eebb72d59346d1ec45ed76cac3c8a7f9a9d1e8cf54 WHIRLPOOL 8c780336a5f86ba8134603c1f5e3dd310006f62abe228edb2390e611f2734b0ee7c0bfe5cd91de7fab28e56809804c95fd26da6d198513fc705263e8ceca1612 +DIST mixxx-2.0.0-ffmpeg31.patch 2844 SHA256 d03109463fa1191ca07bc2be6b6503c4b57272e97064f99aae812e132737f905 SHA512 7207ad72d0ea851b1425ff7472aafe5f828ca70aad0821a1ef1eb54845527532489ac7913f6584e3af5fb53bf3459abc173fbf482f83be8a22358d28b1b5cf74 WHIRLPOOL 9284dd52c4ffe04ca7977dc4ee1b6c3a6396375a48dcb9673f39a5ceb2698021f93984d57a774b36b3dfaffa15f9ca603eeae169fa146e9951da0a587fed34dd DIST mixxx-2.0.0-src.tar.gz 25300881 SHA256 e1b8f33bba35046608578095ed3209967034579252d84c99e6bc03ec030f676d SHA512 8878c0f785e4c5f67724deeca61154d2587969a81d28aef8fa9d526aec8419a218ce2a7ef88d6fcf468d30fa13d31ac9a56ca9082431a35b7e4e040a7ccfbb1a WHIRLPOOL d3e4cf26846b54380f9b11eed26b90cf031a902ca82f20e71f85fb495f99179e8d783f2ba92b51d21fcc77d4779b7bcc16d8456a68e890cfe77daa57f0d3b431 diff --git a/media-sound/mixxx/mixxx-2.0.0-r1.ebuild b/media-sound/mixxx/mixxx-2.0.0-r1.ebuild index a884469..c44d0f7 100644 --- a/media-sound/mixxx/mixxx-2.0.0-r1.ebuild +++ b/media-sound/mixxx/mixxx-2.0.0-r1.ebuild @@ -10,6 +10,10 @@ DESCRIPTION="A advanced Digital DJ tool based on Qt" HOMEPAGE="http://www.mixxx.org/"; SRC_URI="http://downloads.${PN}.org/${P}/${P}-src.tar.gz"; +# Upstream patches +SRC_URI+=" https://github.com/mixxxdj/mixxx/commit/51d95ba58d99309f439cb7e2d1285cfb33aa0f63.patch -> ${PN}-2.0.0-ffmpeg30.patch" +SRC_URI+=" https://github.com/mixxxdj/mixxx/commit/869e07067b15e09bf7ef886a8772afdfb79cbc3c.patch -> ${PN}-2.0.0-ffmpeg31.patch" + LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" @@ -76,7 +80,8 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}"/${PN}-2.0.0-docs.patch - #"${FILESDIR}"/${PN}-2.0.0-system-libs.patch + "${DISTDIR}"/${P}-ffmpeg30.patch + "${DISTDIR}"/${P}-ffmpeg31.patch ) src_prepare() {
