[gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/

[Pacho Ramos]

commit:     97e7760baefab27351eda33af87d674a673fbe1d
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  6 09:11:30 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Tue Dec  6 09:13:27 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97e7760b

games-emulation/vbam: Fix compat with ffmpeg-3 (#574894 by Lars Wendler 
(Polynomial-C)).

Package-Manager: portage-2.3.2

 games-emulation/vbam/Manifest                  |  4 ++++
 games-emulation/vbam/vbam-2.0.0_pre1507.ebuild | 12 ++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest
index 7415663..ba7e08e 100644
--- a/games-emulation/vbam/Manifest
+++ b/games-emulation/vbam/Manifest
@@ -1 +1,5 @@
+DIST vbam-2.0.0_pre1507-ffmpeg3_audio_recording_kludge.patch 3205 SHA256 
88ddcf60842fb0156277ef2533d3b0e4f6a6a5266ec33176c390c89d4819e17e SHA512 
c9a1545967d1ee2fa6510f69183e491df7800639c995ad8f9259daac698471ac02097610008181a045d280d6d3b5a472e7b900bf99f61db1f30c0759e216f6ea
 WHIRLPOOL 
1f40ea9fbc10a95a3dad7e7805e6687f59b21d274d328f7310997d8230d61958df834791289fa54333d1bfaf1cef4cb3492a717ebe30b1ba86171721f742ea33
+DIST vbam-2.0.0_pre1507-ffmpeg3_defines.patch 1848 SHA256 
03f3d7e1c73ef63fe8710e60711b4c1c0e5881d6bdd02bdfc38d71d7730d22f5 SHA512 
fb2b2ab6ae4a07b3509da4ba366c422f1cb0dda8669ad23a4cd312398c73598a47654bba5ff5450d4cf0f553adf917a9549ded5e8b4da806eefb468c4dbdfb38
 WHIRLPOOL 
6f632bc8ed402565c81c95a769568b006e99720c1569bfd0f3a03b9a1466b75e0a4b350dc930b079017085fecf1b02df6a84d2a1ab14e3035a4f6b6096f6838f
+DIST vbam-2.0.0_pre1507-ffmpeg3_encoders_no_s16.patch 1552 SHA256 
56060f51079a7beb51c0d519110799ae1eae164a01db5ada4383d2f11cec6ef7 SHA512 
61623cbcdf77114c371b6add7d86579c262e573c6aa4515f12b2a6e01b9aa83f8330cf9aec5ffde1cac66eeb3e66418687d16811bbaea6d148202a5a9083328c
 WHIRLPOOL 
75a5d268ce55f989e1cfef92062d0d6e911a27186e12d2964516d1ce5d1054005eb2f8433689b2e431b4852e55d0ba5bbcba3be7dedff34a18da344d39f3d5c7
+DIST vbam-2.0.0_pre1507-ffmpeg3_nonfunc_video_encoding.patch 1810 SHA256 
49f969a4b6e11b06cd2f1c26849e8f13dd0e9b610345888abd44f9fe6c146d60 SHA512 
923851a8ace4d1f65eeb2cc3384abc2886fb22460eae2a583b82e19dfd9a3a5fcb4ed044d3a1b1b14d29d83d289daff7690b2511596a4f163bd407c452f7776c
 WHIRLPOOL 
ed95f7477c0ae1fa5a42635942a18b5f6bd87b0e5450b2615af50f95bf37e6d15c8117810850a3f99a3949109dc64d2bf73d679ae42fce9ebc7129d0399c411c
 DIST vbam-2.0.0_pre1507.tar.xz 2169848 SHA256 
08c512dee029118c65043a3b82caa1e96e49b7c522f3c0c4bed2e091846a0d51 SHA512 
9f06fc871c674caf3cc936016b486e98ab1db129edac0ac3615b7b03cfb7b79d9cffa89f436577a9524a128987a6b65bfbbfa0ed602fe17e5dcfbdb56a445c2f
 WHIRLPOOL 
b1f926a9b24b0bc3a801c68e723b474f2ee1e60d9ae9851933935fc0bc234f089e1d565b7ceadcc1e2fe24792e7a54f7fc473a0aa545ee5a15bab5844d0df200

diff --git a/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild 
b/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild
index 186e685..1c1d406 100644
--- a/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild
+++ b/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild
@@ -13,6 +13,12 @@ if [[ ${PV} == 9999 ]]; then
 else
        SRC_URI="https://dev.gentoo.org/~radhermit/distfiles/${P}.tar.xz";
        KEYWORDS="amd64 x86"
+
+       # upstream patches
+       SRC_URI+=" 
https://github.com/visualboyadvance-m/visualboyadvance-m/commit/3f3c3859c1c5f92937bef5d3398a37605e9c16ec.patch
 -> ${PN}-2.0.0_pre1507-ffmpeg3_defines.patch"
+       SRC_URI+=" 
https://github.com/visualboyadvance-m/visualboyadvance-m/commit/029a5fc14b8e5d6f6ce724e66564f9ef89c6a809.patch
 -> ${PN}-2.0.0_pre1507-ffmpeg3_audio_recording_kludge.patch"
+       SRC_URI+=" 
https://github.com/visualboyadvance-m/visualboyadvance-m/commit/a3a07d2f565756771e9c4f0b9574dcffe51c2fa4.patch
 -> ${PN}-2.0.0_pre1507-ffmpeg3_encoders_no_s16.patch"
+       SRC_URI+=" 
https://github.com/visualboyadvance-m/visualboyadvance-m/commit/502de18456ee272c4bf264f2db9bea73a6b0bfd0.patch
 -> ${PN}-2.0.0_pre1507-ffmpeg3_nonfunc_video_encoding.patch"
 fi
 
 DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance"
@@ -58,6 +64,12 @@ src_prepare() {
        sed -i "s:\(DESTINATION\) bin:\1 ${GAMES_BINDIR}:" \
                CMakeLists.txt src/{wx,gtk}/CMakeLists.txt || die
        epatch "${FILESDIR}"/${P}-man.patch
+
+       epatch \
+               "${DISTDIR}/${P}-ffmpeg3_defines.patch" \
+               "${DISTDIR}/${P}-ffmpeg3_audio_recording_kludge.patch" \
+               "${DISTDIR}/${P}-ffmpeg3_encoders_no_s16.patch" \
+               "${DISTDIR}/${P}-ffmpeg3_nonfunc_video_encoding.patch"
 }
 
 src_configure() {