From accfd4775d50f41cd7a2e964e0b3681b0e69bf4c Mon Sep 17 00:00:00 2001 From: Tim Harder Date: Wed, 5 Feb 2014 09:57:45 +0000 Subject: Version bump. (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3) --- games-emulation/vbam/ChangeLog | 10 +- .../vbam/files/vbam-1.8.0.1228-header.patch | 10 ++ games-emulation/vbam/vbam-1.8.0.1228.ebuild | 113 +++++++++++++++++++++ games-emulation/vbam/vbam-9999.ebuild | 15 +-- 4 files changed, 140 insertions(+), 8 deletions(-) create mode 100644 games-emulation/vbam/files/vbam-1.8.0.1228-header.patch create mode 100644 games-emulation/vbam/vbam-1.8.0.1228.ebuild (limited to 'games-emulation') diff --git a/games-emulation/vbam/ChangeLog b/games-emulation/vbam/ChangeLog index 6606ec38f44b..414334ca2b2d 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.21 2013/06/15 23:39:10 radhermit Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-emulation/vbam/ChangeLog,v 1.22 2014/02/05 09:57:45 radhermit Exp $ + +*vbam-1.8.0.1228 (05 Feb 2014) + + 05 Feb 2014; Tim Harder +vbam-1.8.0.1228.ebuild, + vbam-9999.ebuild, +files/vbam-1.8.0.1228-header.patch: + Version bump. *vbam-1.8.0.1197 (15 Jun 2013) diff --git a/games-emulation/vbam/files/vbam-1.8.0.1228-header.patch b/games-emulation/vbam/files/vbam-1.8.0.1228-header.patch new file mode 100644 index 000000000000..81c73892dee0 --- /dev/null +++ b/games-emulation/vbam/files/vbam-1.8.0.1228-header.patch @@ -0,0 +1,10 @@ +--- vbam-1.8.0.1228/src/Util.h ++++ vbam-1.8.0.1228/src/Util.h +@@ -23,6 +23,7 @@ + bool utilIsZipFile(const char *); + void utilStripDoubleExtension(const char *, char *); + IMAGE_TYPE utilFindType(const char *); ++IMAGE_TYPE utilFindType(const char *, char (&)[2048]); + uint8_t *utilLoad(const char *, bool (*)(const char*), uint8_t *, int &); + + void utilPutDword(uint8_t *, uint32_t); diff --git a/games-emulation/vbam/vbam-1.8.0.1228.ebuild b/games-emulation/vbam/vbam-1.8.0.1228.ebuild new file mode 100644 index 000000000000..59779c72f2d0 --- /dev/null +++ b/games-emulation/vbam/vbam-1.8.0.1228.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2014 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.1228.ebuild,v 1.1 2014/02/05 09:57:45 radhermit Exp $ + +EAPI=5 +WX_GTK_VER="3.0" + +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:${WX_GTK_VER}[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}-header.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 +} diff --git a/games-emulation/vbam/vbam-9999.ebuild b/games-emulation/vbam/vbam-9999.ebuild index b00e55144c52..6e6567106231 100644 --- a/games-emulation/vbam/vbam-9999.ebuild +++ b/games-emulation/vbam/vbam-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/vbam/vbam-9999.ebuild,v 1.5 2013/06/15 09:26:01 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/vbam/vbam-9999.ebuild,v 1.6 2014/02/05 09:57:45 radhermit Exp $ -EAPI=4 -WX_GTK_VER="2.8" +EAPI=5 +WX_GTK_VER="3.0" inherit cmake-utils wxwidgets subversion gnome2-utils fdo-mime games @@ -33,7 +33,7 @@ RDEPEND=">=media-libs/libpng-1.4 wxwidgets? ( cairo? ( x11-libs/cairo ) openal? ( media-libs/openal ) - x11-libs/wxGTK:2.8[X,opengl] + x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )" DEPEND="${RDEPEND} wxwidgets? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) ) @@ -42,11 +42,14 @@ DEPEND="${RDEPEND} virtual/pkgconfig" src_prepare() { - # Fix issue with zlib-1.2.5.1 macros (bug #383179) + # 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() { -- cgit v1.2.3-65-gdbad