Version bump, fix build with newer versions of libav/ffmpeg (bug #466854).

Package-Manager: portage-2.2.0_alpha179/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

5 files changed, 191 insertions, 9 deletions

diff --git a/games-emulation/vbam/ChangeLog b/games-emulation/vbam/ChangeLog
index 6f09cf128892..6606ec38f44b 100644
--- a/games-emulation/vbam/ChangeLog
+++ b/games-emulation/vbam/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-emulation/vbam
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/vbam/ChangeLog,v 1.20 2013/06/15 09:27:03 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/vbam/ChangeLog,v 1.21 2013/06/15 23:39:10 radhermit Exp $
+
+*vbam-1.8.0.1197 (15 Jun 2013)
+
+  15 Jun 2013; Tim Harder <radhermit@gentoo.org> +vbam-1.8.0.1197.ebuild,
+  +files/vbam-1.8.0.1197-desktop.patch, +files/vbam-1.8.0.1197-libav-9.patch:
+  Version bump, fix build with newer versions of libav/ffmpeg (bug #466854).
 
   15 Jun 2013; Tim Harder <radhermit@gentoo.org> -vbam-1.8.0.1090.ebuild,
   -files/vbam-1.8.0.1009-zlib-1.2.6.patch, -files/vbam-1.8.0.1090-ffmpeg.patch:
diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest
index 652e2c4f4ac3..bead22885bc8 100644
--- a/games-emulation/vbam/Manifest
+++ b/games-emulation/vbam/Manifest
@@ -2,19 +2,23 @@
 Hash: SHA256
 
 AUX vbam-1.8.0.1149-desktop.patch 1400 SHA256 97643063490c76bc796a02c3062a0ba3aa5f1a1a7f6023b12d0cf0558c5a0947 SHA512 dc493ced382090b6b98487229e7d13332c626c2787afeeb4c4849773e87851778b6d1724610b3b345ee8e5fce9550cff3242851a35e3f98e2b76d7f4b8f3d2be WHIRLPOOL 9e4607e22145c7de0e9bd9b16d8210ba4cdb1d1ba972851a48e25de3a494f02d7a92a7cff0900b9f4f7328f2f073ab9f04a99f7b7f9b25cf871cab07a1604610
+AUX vbam-1.8.0.1197-desktop.patch 237 SHA256 3c4d12ec056ab25fac3e44d593f5ca3caf4a58acaa4ce39fda685cc8cb37cb3a SHA512 7c9c0eefb8c41f89f9115854f24dbabc9a9126ace12525fde32a0b9113c41b47c94de68f5a85fe23a5a24257fef0071726e936440ccc368e71dd058cccdbb4bf WHIRLPOOL d3ea145f3461b30636fb580678c68ef7cfa000465270df51b4dd4e732290d1f48053da2d79a3bb1396737c81c3fa71c260e0c13c509f7e55e805a74ca7803265
+AUX vbam-1.8.0.1197-libav-9.patch 1363 SHA256 bfa689f5f4e6f04e369c34d5fa341389f3e9bb5b69ab7e01bd66b11517074c64 SHA512 9b0d1f140f2470c612487e508160debcda2e37fc3fcddb5fe6ccb249dbe2dcee2739cfb63769985eea74a40d9a1adf38c40895e8c699bdb50091c39ca3078a7e WHIRLPOOL b4447886ad8f42fd7272d4280000e42fef35fde8d38ad6080c07ce3f766cbb66da594ac7d9d7f5cdc32f7bdd9b9ae3d4f0bc8f650e77fe65bcd10ee818c838cc
 DIST vbam-1.8.0.1149.tar.xz 824980 SHA256 7eb2c29a416faca9c7ab28cb953c276e76c51b6b45bd5ae83f7f9a32b8c6d252 SHA512 aaf2262780ee723077002c43ca317c81a85bf2350067aa504ad578d1280765f65baac9a8428e595b0c746db1bd37ce29f9bb1758aaef300e7d52b4da45652e46 WHIRLPOOL bc230cb7a485f198a8b3ca050b85b1e167a3b313edf36753c016c8e44a2a10a99a3163c649eb48ffbdb5747fbff35909e30aebd537bcb38c1a72ad0d783e969b
+DIST vbam-1.8.0.1197.tar.xz 842152 SHA256 26fca6a5a19229fa651b2aaeea42566c9a1bbb7ea722e6b15e88699bd30dec7b SHA512 bb900327b67d75d4b99f891994651a9d04e093613ec03f31f19e32541d38d58870d5b4f3c0b1c8f927560df0b3b44b10b5f2f2669846dca69d5420e61276075a WHIRLPOOL acf4b1a4b251cbf8bbbeb7f8f6ea88bc8171132d1c2fa6efba9a761e952e8f68a0e10184db097e4261b0226165f064b9fa18193a4bde4ea8fae852f129f4bdc1
 EBUILD vbam-1.8.0.1149.ebuild 2756 SHA256 3c4e9856caa5aeb1eb9d9becf3ea0a82f0b1c83218e4194ca25a9b5312aa1df8 SHA512 5450530befe22e28f05cde5cd222cc5b5ed04db11fba99eb114559ad1105342fd0cde06574f0bfc351b84ce9a50d107d6f96344c0720e8cef8fd803f6b2e9072 WHIRLPOOL f6d4b84b1224f579496048af23f4ab6d6fb4feecda2a062eb025904a7d3dd865c52d0bf48a89391bdad3241f807d9230ce208b751a166012362f5adc3c561c5e
+EBUILD vbam-1.8.0.1197.ebuild 2892 SHA256 4b1bfb3855ae1b000e070535e826631178f68f73b8edabf5f299029ccbcbf4b4 SHA512 49157d396e9e8d71ad1bb0702bcdb936bc57bbde987fe8437188357d5d1d517d770ca11a9e5ca088c72cde2dc8fcdc450d22521907e3b2e9d86756a264e1317b WHIRLPOOL 04fca498dbbd792d10a0836a7311b8e8acc58ed5d4f42298edc8077c35fbf31d4bd9e74ef8a89c27861041062392f0e068affe6a5734a524412b47791d738f9c
 EBUILD vbam-9999.ebuild 2617 SHA256 232a8b7af8ec35036df00b7f1a24cf6cd1b2f132a3386f658757a992cd1cbaf3 SHA512 91bec6ad299a706f283907b4c6700094047dbf55d36c390bf4226c09823f0ec2acb892202e14de3e17021ee633f38743d4345d0506365374121317de761e7c20 WHIRLPOOL 49e1125fa9d74d758206e020913c2808b31a0365aa711c5fbb91b863328986d450830d92327da08913b79c2379a2f8b598f1a65f5c3a89d93120db201b3edac2
-MISC ChangeLog 3826 SHA256 4e607ae43b3c40aea952ee604897568a3b141e906a73cae408777517b3ddbbe3 SHA512 824da3bb31dbbb35d38f4c6d625c133466f332c131c0974f87b1fa60154576757546ff42c009fd03c23e26b1e30064bb24cf84b0c9ff6a73041d2cbe1de33153 WHIRLPOOL 2b583dbbffc32bd9a28b94cdadeede629c50b34e5fb7aae1a8ce95f8a6dcb5f429e237f1cff3cdb8d15373028ffd243d39ac207af452293161c4adad3b91971f
+MISC ChangeLog 4088 SHA256 1f3d85c46a05dead9f1806d2d1e1518543d99933f1407b6fdf3014e3142f2566 SHA512 4b5d4bd54db0f2f55d01b7194be35637432d88db588c0db06af05418d3d969482eea6b957cc09e3dec96d565d690c03e316c9bbcffafb056531914ed98513cba WHIRLPOOL 8c2612e1abfa8f88f3334e612610cc8d75a6710451b5c773711c96a28384e57ce100e2e8e2fca1c914582007eb59d8c85282c65988e1fa58b1c33d63e785ffa7
 MISC metadata.xml 331 SHA256 d6054d5a8bdfb747166a4b83c1f7db04be3898899323aa316cbef1ab7a6b7daa SHA512 6fad448db04e5a8cf3880de3a34638a7a5791ac3d847318def2163e2cf91637d99eb4adfc2acc8351c62965b8ea95f4f86b1b5d372691565ffbc553250ee1cbd WHIRLPOOL 603a7f5c7378302173ba3758eb57b67489cca71a71af4d15319bfb145b2b332508e7759f44fe6382dccb850a60d1f9e21d43ebf1507e47d61b33c5a21dd809da
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRvDNoAAoJEEqz6FtPBkyjppMIAJZSXtB4/UL4GTyUn8OHJ/MV
-VQu85QUFs5rU7Kf+vlwg+Brj2YDByDsRpqmx90HOtBrftKDcoG9jRWilhOsk6Pzm
-r5Tis7VZCIMTyw9bTXbOW/pD1gn+jwS6vXvxy79f7wHUsMP2KxZecLzimZdSXxv3
-7RtO5Ow387YUUAMJ+keIEqaJYL+UuBMXzL8Hgq00BoCUpoDSPGvOEkaq1A27rBTV
-NjJd11jipLxcZpuTEy861lcHw4FsxSPd06Ri+bwidivvatCXtvzoEWfdf+bH4uGO
-tJHjH0Fmyr94GwKqE5bKBsrEaV7UqI16Iidp/ojB+64UFWc8xeRnWC+vfwzi6iA=
-=qT8z
+iQEcBAEBCAAGBQJRvPsjAAoJEEqz6FtPBkyjK4gH/1mXXGukYWik2DeItAicVssl
+7VEeferYpeActAutQ4St/YLz/HbOpgiLlpQRk2z6sPEmPwFzTvB4xI7PO7x0tSvB
+WRrHKlCI0R3L8Gw9HoKxnko+6ztOgQ0AOuwmtMj0JD62jXdNXBlFkulVNTXO/9/k
+HRx11k/dR9TGBIz2fFg31QjBBLH2IXKQXXo0p8Ma+P0wpgjLVynBGId4sAYC/tG3
+/u3qCWuKWTcWzSxlvhVq0416T1hI3P5hRu9HujD42SO/YpLZlRwp1eIrcBD5gdye
+Nmp2dVqK673t+Wwg4Q5gg2qKxZgtk/4TFTLYnCRHH7ox9hNEv1qIofg0JH+j+68=
+=Xp/Y
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/vbam/files/vbam-1.8.0.1197-desktop.patch b/games-emulation/vbam/files/vbam-1.8.0.1197-desktop.patch
new file mode 100644
index 000000000000..17f73bf25548
--- /dev/null
+++ b/games-emulation/vbam/files/vbam-1.8.0.1197-desktop.patch
@@ -0,0 +1,8 @@
+--- vbam-1.8.0.1197/src/wx/wxvbam.desktop
++++ vbam-1.8.0.1197/src/wx/wxvbam.desktop
+@@ -7,4 +7,4 @@
+ Comment=Nindendo GameBoy Advance Emulator

+ Exec=wxvbam

+ Icon=vbam

+-Categories=Application;Game;Emulator

++Categories=Game;Emulator;

diff --git a/games-emulation/vbam/files/vbam-1.8.0.1197-libav-9.patch b/games-emulation/vbam/files/vbam-1.8.0.1197-libav-9.patch
new file mode 100644
index 000000000000..b954514dbe2f
--- /dev/null
+++ b/games-emulation/vbam/files/vbam-1.8.0.1197-libav-9.patch
@@ -0,0 +1,50 @@
+--- vbam-1.8.0.1197/src/common/ffmpeg.cpp
++++ vbam-1.8.0.1197/src/common/ffmpeg.cpp
+@@ -93,7 +93,11 @@
+ 	return MRET_OK;
+ 
+     AVCodecContext *ctx;
++#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(53,10,0)
+     aud_st = av_new_stream(oc, 1);
++#else
++    aud_st = avformat_new_stream(oc, NULL);
++#endif
+     if(!aud_st) {
+ 	avformat_free_context(oc);
+ 	oc = NULL;
+@@ -112,7 +116,11 @@
+ 	ctx->flags |= CODEC_FLAG_GLOBAL_HEADER;
+ 
+     AVCodec *codec = avcodec_find_encoder(fmt->audio_codec);
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(53,6,0)
+     if(!codec || avcodec_open(ctx, codec)) {
++#else
++    if(!codec || avcodec_open2(ctx, codec, NULL)) {
++#endif
+ 	avformat_free_context(oc);
+ 	oc = NULL;
+ 	return MRET_ERR_NOCODEC;
+@@ -124,7 +132,11 @@
+ MediaRet MediaRecorder::setup_video_stream(const char *fname, int w, int h, int d)
+ {
+     AVCodecContext *ctx;
++#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(53,10,0)
+     vid_st = av_new_stream(oc, 0);
++#else
++    vid_st = avformat_new_stream(oc, NULL);
++#endif
+     if(!vid_st) {
+ 	avformat_free_context(oc);
+ 	oc = NULL;
+@@ -203,7 +215,11 @@
+ 	    ctx->pix_fmt = dp;
+ 	}
+     }
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(53,6,0)
+     if(!codec || avcodec_open(ctx, codec)) {
++#else
++    if(!codec || avcodec_open2(ctx, codec, NULL)) {
++#endif
+ 	avformat_free_context(oc);
+ 	oc = NULL;
+ 	return MRET_ERR_NOCODEC;
diff --git a/games-emulation/vbam/vbam-1.8.0.1197.ebuild b/games-emulation/vbam/vbam-1.8.0.1197.ebuild
new file mode 100644
index 000000000000..614cd204a037
--- /dev/null
+++ b/games-emulation/vbam/vbam-1.8.0.1197.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/vbam/vbam-1.8.0.1197.ebuild,v 1.1 2013/06/15 23:39:10 radhermit Exp $
+
+EAPI=5
+WX_GTK_VER="2.8"
+
+inherit eutils cmake-utils wxwidgets gnome2-utils fdo-mime games
+
+ESVN_REPO_URI="https://vbam.svn.sourceforge.net/svnroot/vbam/trunk"
+
+DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance"
+HOMEPAGE="http://vba-m.ngemu.com"
+SRC_URI="http://dev.gentoo.org/~radhermit/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cairo ffmpeg gtk link lirc nls openal +sdl wxwidgets"
+REQUIRED_USE="|| ( sdl gtk wxwidgets )"
+
+RDEPEND=">=media-libs/libpng-1.4
+	media-libs/libsdl[joystick]
+	link? ( media-libs/libsfml )
+	sys-libs/zlib
+	virtual/glu
+	virtual/opengl
+	ffmpeg? ( virtual/ffmpeg )
+	gtk? ( >=dev-cpp/glibmm-2.4.0:2
+		>=dev-cpp/gtkmm-2.4.0:2.4
+		>=dev-cpp/gtkglextmm-1.2.0 )
+	lirc? ( app-misc/lirc )
+	nls? ( virtual/libintl )
+	wxwidgets? (
+		cairo? ( x11-libs/cairo )
+		openal? ( media-libs/openal )
+		x11-libs/wxGTK:2.8[X,opengl]
+	)"
+DEPEND="${RDEPEND}
+	wxwidgets? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) )
+	x86? ( || ( dev-lang/nasm dev-lang/yasm ) )
+	nls? ( sys-devel/gettext )
+	app-arch/xz-utils
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libav-9.patch
+	epatch "${FILESDIR}"/${P}-desktop.patch
+
+	# fix issue with zlib-1.2.5.1 macros (bug #383179)
+	sed -i '1i#define OF(x) x' src/common/memgzio.c || die
+
+	sed -i "s:\(DESTINATION\) bin:\1 ${GAMES_BINDIR}:" \
+		CMakeLists.txt src/wx/CMakeLists.txt || die
+
+	# fix desktop file QA warnings
+	edos2unix src/gtk/gvbam.desktop src/wx/wxvbam.desktop || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_enable cairo CAIRO)
+		$(cmake-utils_use_enable ffmpeg FFMPEG)
+		$(cmake-utils_use_enable gtk GTK)
+		$(cmake-utils_use_enable link LINK)
+		$(cmake-utils_use_enable lirc LIRC)
+		$(cmake-utils_use_enable nls NLS)
+		$(cmake-utils_use_enable openal OPENAL)
+		$(cmake-utils_use_enable sdl SDL)
+		$(cmake-utils_use_enable wxwidgets WX)
+		$(cmake-utils_use_enable x86 ASM_CORE)
+		$(cmake-utils_use_enable x86 ASM_SCALERS)
+		-DCMAKE_SKIP_RPATH=ON
+		-DDATA_INSTALL_DIR=share/games/${PN}
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use sdl ; then
+		dodoc doc/ReadMe.SDL.txt || die
+		doman debian/vbam.1 || die
+	fi
+
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	if use gtk || use wxwidgets ; then
+		gnome2_icon_savelist
+	fi
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	if use gtk || use wxwidgets ; then
+		gnome2_icon_cache_update
+	fi
+	use gtk && fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	if use gtk || use wxwidgets ; then
+		gnome2_icon_cache_update
+	fi
+	use gtk && fdo-mime_desktop_database_update
+}