Version bump to new snapshot.

Package-Manager: portage-2.2.0_alpha86/cvs/Linux x86_64

4 files changed, 105 insertions, 9 deletions

diff --git a/games-emulation/vbam/ChangeLog b/games-emulation/vbam/ChangeLog
index e7def38663f0..27666bdd1a9d 100644
--- a/games-emulation/vbam/ChangeLog
+++ b/games-emulation/vbam/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-emulation/vbam
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/vbam/ChangeLog,v 1.9 2012/02/18 03:37:58 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/vbam/ChangeLog,v 1.10 2012/02/18 03:44:48 radhermit Exp $
+
+*vbam-1.8.0.1090 (18 Feb 2012)
+
+  18 Feb 2012; Tim Harder <radhermit@gentoo.org> +vbam-1.8.0.1090.ebuild,
+  +files/vbam-1.8.0.1090-ffmpeg.patch:
+  Version bump to new snapshot.
 
   18 Feb 2012; Tim Harder <radhermit@gentoo.org> vbam-1.8.0.1009-r1.ebuild,
   +files/vbam-1.8.0.1009-zlib-1.2.6.patch:
diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest
index aaf49c0be627..a071ece50dfb 100644
--- a/games-emulation/vbam/Manifest
+++ b/games-emulation/vbam/Manifest
@@ -4,18 +4,21 @@ Hash: SHA512
 AUX vbam-1.8.0.1009-desktop.patch 617 RMD160 ad4b37155c087ad17424f08d49dfe77db46f9158 SHA1 8fb592fa3dc60368fc9c2ff51fa2a3b1bc2b0a22 SHA256 85b17f66384de563cefe4809fa95a4b9f5e63ef4f962811ffe8f21b872633790
 AUX vbam-1.8.0.1009-no-nls.patch 1164 RMD160 000aa2142bb3c367b1842ba8ecf722ed057f945e SHA1 137263718de75e6c9fb239515e2829fe2ac3f08b SHA256 8e32294dd094d060dbc39b415ef4a20baa4704876a63ae9cbf2b0bd51203d895
 AUX vbam-1.8.0.1009-zlib-1.2.6.patch 1253 RMD160 8d60cf9c06c2291428aed37d36bddaa6491ab86f SHA1 0d7d8f4de6cff3a04867944fb3438d5b111ba30a SHA256 08ba1b0b123b30e31e1f336ca118972679481ba5a9e54db706c90fae60905548
+AUX vbam-1.8.0.1090-ffmpeg.patch 311 RMD160 e4d5b601d5f048dac04ea3249aeef143192801a0 SHA1 ce3d6d68963b3b1981b816c73293738bc39ef66a SHA256 cd215c049289a394203af417205a9535768c6875f6e151142ce101e0f79964db
 DIST vbam-1.8.0.1009.tar.bz2 779577 RMD160 571b51946dfd0aa85c56701e0279aef866431c64 SHA1 affc48667d140ca232120d1c3f80f311f52dc0bc SHA256 918143ae0d8a4cd30a0af16692e836b57c2d3627e8ab4db5729ff7017b6169cd
+DIST vbam-1.8.0.1090.tar.xz 823216 RMD160 7dbde586a224850cc876d914bb9532b894f4ebc4 SHA1 f4a0513892320bef121344c614e4626de1da68b6 SHA256 998df784fb80188c0cd02502856881fcbfb81e40799504fcef2022f22a1af5c4
 EBUILD vbam-1.8.0.1009-r1.ebuild 1954 RMD160 1a34684fe2de751fead6812d7aa9ce737f5259e2 SHA1 aeb509b274b11568e9271c96260586006d1d7141 SHA256 8d3ddce2c7ccda9459c89525bd017a79e92b15214145f34c41a160fa489d5e85
-MISC ChangeLog 2129 RMD160 893b43e3325764df339a971b0adc5adc114df0ad SHA1 61529d7a1943c0d05e560248a8afdd0425c63b05 SHA256 f83745761de7abf646d089baeac77da112bda218d26c27a212618d1ff7100384
+EBUILD vbam-1.8.0.1090.ebuild 1910 RMD160 d0cced113fdc225fee538ebad54a607d8f51ab46 SHA1 2d2c4f3ee210e2f32ece5bf3647e40a7613a5442 SHA256 87d77c51795897880ae2a9cbbaaf17b1681da907e95b3e564c0c3629e2dc72d7
+MISC ChangeLog 2308 RMD160 8d96d9736fee5239020546035e86a966e1903292 SHA1 77dde8ea19e736b9d369a05608d0c1d03c402195 SHA256 e3c213a04415a3c4e8b42f9d3cbd73f5fe93eac5332290fb8907f41eb6573a55
 MISC metadata.xml 331 RMD160 34d4fd47bec0dcb8f0d08d4a17cab47d506633a5 SHA1 fc463ad416b0cfc238ea427f72ae068b069da90b SHA256 d6054d5a8bdfb747166a4b83c1f7db04be3898899323aa316cbef1ab7a6b7daa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPPx0jAAoJEEqz6FtPBkyjb5oH/AjkHuEcmFjBAnPa8Nql3e89
-cPPJ5/aAtLmqHk57fjIfG+cZ6SX8KNHxaCx6XDr32XmNRtUNDYVaeBUoW9K7t3QZ
-VsIf9lwUPahd1OWvW/ZAlxI65rePV4jZ+/FLguIOE41dO24WyorsSQ6LZxExDDGa
-9PWUJJ743AXS4K9vz9SabwgN/EneRRKya/k1KcdxvmVggK9Utwdn7QsTY7KJTgZk
-IIHoGAz4eB0ll4Phs2w9/pU4dwX8XzjENekd2MgvWOoRrmzy5cfe4d60/NFKadAd
-zn6pfNvrOVXKptu198b3zXoqhqV3gK5+6PUvZlyR2hpx6igwIH9+jdO2GDpcO9s=
-=UZRN
+iQEcBAEBCgAGBQJPPx62AAoJEEqz6FtPBkyjd50H/jNSDQUuyhBmiHMLJU4JjIsv
+XVeH9oCR4JFYLrpt3W4Z+ZOjXB+UiX+TQt81NC0Ba1aR16NDU2vM9xHgmhR5N4yX
+WNOUfF1zdqeHkwAgmPR8VB3ETOzGh5SqGj2ucZLkgKNN4uhH5/Fnb050b68bcOk9
+g+6bQQ6jhgtIZaYSkpKjQ2XIPx4fNPmZFNaTvojyHvnDk0Y3S6fent0ZF2I01ljU
+hkH6Re5Fk/bJ9UpaibPmNGouTVsabbtMh9kagN4SIk0v/UTuYwAw0+LEs8It5mK7
+CjKD9jFZ1AJTeUHKSb5VW65yiGbbB/PGSIj6K2KZ2QbV1DiZABwcgjs91pwjshI=
+=qZgw
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/vbam/files/vbam-1.8.0.1090-ffmpeg.patch b/games-emulation/vbam/files/vbam-1.8.0.1090-ffmpeg.patch
new file mode 100644
index 000000000000..deb212e97113
--- /dev/null
+++ b/games-emulation/vbam/files/vbam-1.8.0.1090-ffmpeg.patch
@@ -0,0 +1,10 @@
+--- vbam-1.8.0.1090.orig/src/common/ffmpeg.cpp
++++ vbam-1.8.0.1090/src/common/ffmpeg.cpp
+@@ -12,6 +12,7 @@
+ #include <libavformat/avformat.h>
+ #include <libswscale/swscale.h>
+ #include <libavcodec/opt.h>
++#include <libavutil/mathematics.h>
+ #ifndef AV_PKT_FLAG_KEY
+ #define AV_PKT_FLAG_KEY PKT_FLAG_KEY
+ #endif
diff --git a/games-emulation/vbam/vbam-1.8.0.1090.ebuild b/games-emulation/vbam/vbam-1.8.0.1090.ebuild
new file mode 100644
index 000000000000..239b5dad2bae
--- /dev/null
+++ b/games-emulation/vbam/vbam-1.8.0.1090.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2012 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.1090.ebuild,v 1.1 2012/02/18 03:44:48 radhermit Exp $
+
+EAPI=3
+
+inherit confutils cmake-utils games eutils
+
+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="ffmpeg gtk link lirc nls +sdl"
+
+RDEPEND=">=media-libs/libpng-1.4
+	media-libs/libsdl[joystick]
+	link? ( media-libs/libsfml )
+	sys-libs/zlib
+	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 )"
+DEPEND="${RDEPEND}
+	x86? ( || ( dev-lang/nasm dev-lang/yasm ) )
+	nls? ( sys-devel/gettext )
+	app-arch/xz-utils
+	dev-util/pkgconfig"
+
+pkg_setup() {
+	confutils_require_any sdl gtk
+	games_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.8.0.1009-zlib-1.2.6.patch
+	epatch "${FILESDIR}"/${P}-ffmpeg.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 -e "s:\(DESTINATION\) bin:\1 ${GAMES_BINDIR}:" CMakeLists.txt || die
+}
+
+src_configure() {
+	local myconf
+	use x86 && myconf="-DENABLE_ASM_SCALERS=ON -DENABLE_ASM_CORE=ON"
+
+	mycmakeargs=(
+		$(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 sdl SDL)
+		${myconf}
+		"-DDATA_INSTALL_DIR=share/games/${PN}"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use sdl ; then
+		dodoc doc/ReadMe.SDL.txt || die
+		doman debian/vbam.1 || die
+	fi
+
+	prepgamesdirs
+}