From e17bff799c48d662493946d538276c4a09e2ae3b Mon Sep 17 00:00:00 2001 From: Hanno Böck Date: Tue, 28 May 2013 10:34:08 +0000 Subject: games-emulation/desmume: Version bump, port to EAPI 5, remove some old versions. (Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key 0xA5880072BBB51E42) --- games-emulation/desmume/ChangeLog | 13 ++++++- games-emulation/desmume/desmume-0.9.4.ebuild | 39 -------------------- games-emulation/desmume/desmume-0.9.5.ebuild | 40 -------------------- games-emulation/desmume/desmume-0.9.7.ebuild | 43 ---------------------- games-emulation/desmume/desmume-0.9.9.ebuild | 36 ++++++++++++++++++ .../desmume/files/desmume-0.9.4-gcc44.patch | 11 ------ .../desmume/files/desmume-0.9.5-sse2-fix.diff | 11 ------ .../files/desmume-add-missing-potfiles.diff | 6 --- .../desmume/files/desmume-fix-gcc-warning.diff | 22 ----------- 9 files changed, 47 insertions(+), 174 deletions(-) delete mode 100644 games-emulation/desmume/desmume-0.9.4.ebuild delete mode 100644 games-emulation/desmume/desmume-0.9.5.ebuild delete mode 100644 games-emulation/desmume/desmume-0.9.7.ebuild create mode 100644 games-emulation/desmume/desmume-0.9.9.ebuild delete mode 100644 games-emulation/desmume/files/desmume-0.9.4-gcc44.patch delete mode 100644 games-emulation/desmume/files/desmume-0.9.5-sse2-fix.diff delete mode 100644 games-emulation/desmume/files/desmume-add-missing-potfiles.diff delete mode 100644 games-emulation/desmume/files/desmume-fix-gcc-warning.diff (limited to 'games-emulation') diff --git a/games-emulation/desmume/ChangeLog b/games-emulation/desmume/ChangeLog index 3a01b921d75e..80182458c9df 100644 --- a/games-emulation/desmume/ChangeLog +++ b/games-emulation/desmume/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for games-emulation/desmume -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/desmume/ChangeLog,v 1.19 2012/06/23 21:58:43 hanno Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-emulation/desmume/ChangeLog,v 1.20 2013/05/28 10:34:08 hanno Exp $ + +*desmume-0.9.9 (28 May 2013) + + 28 May 2013; Hanno Boeck -desmume-0.9.4.ebuild, + -desmume-0.9.5.ebuild, -desmume-0.9.7.ebuild, +desmume-0.9.9.ebuild, + -files/desmume-0.9.4-gcc44.patch, -files/desmume-0.9.5-sse2-fix.diff, + -files/desmume-add-missing-potfiles.diff, + -files/desmume-fix-gcc-warning.diff: + Version bump, port to EAPI 5, remove some old versions. *desmume-0.9.8 (23 Jun 2012) diff --git a/games-emulation/desmume/desmume-0.9.4.ebuild b/games-emulation/desmume/desmume-0.9.4.ebuild deleted file mode 100644 index b4d799d36c61..000000000000 --- a/games-emulation/desmume/desmume-0.9.4.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/desmume/desmume-0.9.4.ebuild,v 1.4 2011/03/01 07:31:40 mr_bones_ Exp $ - -EAPI="2" - -inherit eutils games - -DESCRIPTION="Nintendo DS emulator" -HOMEPAGE="http://desmume.org/" -SRC_URI="mirror://sourceforge/desmume/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -DEPEND=">=x11-libs/gtk+-2.8.0:2 - gnome-base/libglade - x11-libs/gtkglext - virtual/opengl - sys-libs/zlib - dev-libs/zziplib - media-libs/libsdl[joystick]" -RDEPEND="${DEPEND}" - -src_prepare() { - epatch "${FILESDIR}/${P}-gcc44.patch" -} - -src_configure() { - egamesconf --datadir=/usr/share || die "egamesconf failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake failed" - dodoc AUTHORS ChangeLog README README.LIN - prepgamesdirs -} diff --git a/games-emulation/desmume/desmume-0.9.5.ebuild b/games-emulation/desmume/desmume-0.9.5.ebuild deleted file mode 100644 index 69a30bc3ca17..000000000000 --- a/games-emulation/desmume/desmume-0.9.5.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/desmume/desmume-0.9.5.ebuild,v 1.4 2011/03/01 07:31:40 mr_bones_ Exp $ - -EAPI="2" - -inherit eutils games - -DESCRIPTION="Nintendo DS emulator" -HOMEPAGE="http://desmume.org/" -SRC_URI="mirror://sourceforge/desmume/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -DEPEND=">=x11-libs/gtk+-2.8.0:2 - gnome-base/libglade - x11-libs/gtkglext - virtual/opengl - sys-libs/zlib - dev-libs/zziplib - media-libs/libsdl[joystick] - x11-libs/agg" -RDEPEND="${DEPEND}" - -src_prepare() { - epatch "${FILESDIR}/${P}-sse2-fix.diff" -} - -src_configure() { - egamesconf --datadir=/usr/share || die "egamesconf failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake failed" - dodoc AUTHORS ChangeLog README README.LIN - prepgamesdirs -} diff --git a/games-emulation/desmume/desmume-0.9.7.ebuild b/games-emulation/desmume/desmume-0.9.7.ebuild deleted file mode 100644 index 4c65d14541a4..000000000000 --- a/games-emulation/desmume/desmume-0.9.7.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/desmume/desmume-0.9.7.ebuild,v 1.1 2011/11/12 21:01:35 hanno Exp $ - -EAPI="2" - -inherit eutils games - -DESCRIPTION="Nintendo DS emulator" -HOMEPAGE="http://desmume.org/" -SRC_URI="mirror://sourceforge/desmume/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -DEPEND=">=x11-libs/gtk+-2.8.0:2 - gnome-base/libglade - x11-libs/gtkglext - virtual/opengl - sys-libs/zlib - dev-libs/zziplib - media-libs/libsdl[joystick] - x11-libs/agg" -RDEPEND="${DEPEND}" - -src_prepare() { - # https://sourceforge.net/tracker/?func=detail&aid=3436660&group_id=164579&atid=832291 - epatch "${FILESDIR}/desmume-add-missing-potfiles.diff" - # https://sourceforge.net/tracker/?func=detail&aid=3436995&group_id=164579&atid=832291 - epatch "${FILESDIR}/desmume-fix-gcc-warning.diff" -} - -src_configure() { - egamesconf --datadir=/usr/share || die "egamesconf failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake failed" - dodoc AUTHORS ChangeLog README README.LIN - prepgamesdirs -} diff --git a/games-emulation/desmume/desmume-0.9.9.ebuild b/games-emulation/desmume/desmume-0.9.9.ebuild new file mode 100644 index 000000000000..133a224e8076 --- /dev/null +++ b/games-emulation/desmume/desmume-0.9.9.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/games-emulation/desmume/desmume-0.9.9.ebuild,v 1.1 2013/05/28 10:34:08 hanno Exp $ + +EAPI="5" + +inherit games + +DESCRIPTION="Nintendo DS emulator" +HOMEPAGE="http://desmume.org/" +SRC_URI="mirror://sourceforge/desmume/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="" + +DEPEND=">=x11-libs/gtk+-2.8.0:2 + gnome-base/libglade + x11-libs/gtkglext + virtual/opengl + sys-libs/zlib + dev-libs/zziplib + media-libs/libsdl[joystick] + x11-libs/agg" +RDEPEND="${DEPEND}" + +src_configure() { + egamesconf --datadir=/usr/share || die "egamesconf failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake failed" + dodoc AUTHORS ChangeLog README README.LIN + prepgamesdirs +} diff --git a/games-emulation/desmume/files/desmume-0.9.4-gcc44.patch b/games-emulation/desmume/files/desmume-0.9.4-gcc44.patch deleted file mode 100644 index d95a16c8aae1..000000000000 --- a/games-emulation/desmume/files/desmume-0.9.4-gcc44.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- desmume-0.9.4/src/texcache.h 2009-07-08 11:11:01.000000000 +0300 -+++ desmume-0.9.4-gcc44/src/texcache.h 2009-07-24 20:21:16.000000000 +0300 -@@ -43,7 +43,7 @@ - - void TexCache_Reset(); - --template -+template - void TexCache_SetTexture(u32 format, u32 texpal); - - void TexCache_Invalidate(); diff --git a/games-emulation/desmume/files/desmume-0.9.5-sse2-fix.diff b/games-emulation/desmume/files/desmume-0.9.5-sse2-fix.diff deleted file mode 100644 index 1f9d48ad857d..000000000000 --- a/games-emulation/desmume/files/desmume-0.9.5-sse2-fix.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- trunk/desmume/src/matrix.h 2009/12/12 10:34:06 3145 -+++ trunk/desmume/src/matrix.h 2009/12/12 16:30:55 3146 -@@ -115,7 +115,7 @@ - - //switched SSE2 functions - //------------- --#ifdef ENABLE_SSE -+#ifdef ENABLE_SSE2 - - template - FORCEINLINE void memset_u16_le(void* dst, u16 val) diff --git a/games-emulation/desmume/files/desmume-add-missing-potfiles.diff b/games-emulation/desmume/files/desmume-add-missing-potfiles.diff deleted file mode 100644 index 7ce2f8758086..000000000000 --- a/games-emulation/desmume/files/desmume-add-missing-potfiles.diff +++ /dev/null @@ -1,6 +0,0 @@ ---- desmume-0.9.7/po/POTFILES.skip 2011-01-27 11:27:00.000000000 +0100 -+++ desmume-0.9.7-1/po/POTFILES.skip 2011-11-11 21:10:30.550725740 +0100 -@@ -1,2 +1,3 @@ - src/wx/PadSimple/GUI/ConfigDlg.cpp - src/wxdlg/wxdlg3dViewer.cpp -+src/wxdlg/wxcontrolsconfigdialog.cpp diff --git a/games-emulation/desmume/files/desmume-fix-gcc-warning.diff b/games-emulation/desmume/files/desmume-fix-gcc-warning.diff deleted file mode 100644 index 409640264c7a..000000000000 --- a/games-emulation/desmume/files/desmume-fix-gcc-warning.diff +++ /dev/null @@ -1,22 +0,0 @@ ---- desmume-0.9.7/src/GPU.cpp 2011-01-27 11:27:00.000000000 +0100 -+++ desmume-0.9.7-fix-warning/src/GPU.cpp 2011-11-11 21:17:10.826721602 +0100 -@@ -1184,16 +1184,16 @@ - case BGType_AffineExt_256x1: - // 256 colors - pal = MMU.ARM9_VMEM + gpu->core * 0x400; -- apply_rot_fun >(gpu,X,Y,PA,PB,PC,PD,LG, gpu->BG_bmp_ram[num], NULL, pal); -+ apply_rot_fun >(gpu,X,Y,PA,PB,PC,PD,LG, gpu->BG_bmp_ram[num], 0, pal); - return; - case BGType_AffineExt_Direct: - // direct colors / BMP -- apply_rot_fun >(gpu,X,Y,PA,PB,PC,PD,LG, gpu->BG_bmp_ram[num], NULL, NULL); -+ apply_rot_fun >(gpu,X,Y,PA,PB,PC,PD,LG, gpu->BG_bmp_ram[num], 0, NULL); - return; - case BGType_Large8bpp: - // large screen 256 colors - pal = MMU.ARM9_VMEM + gpu->core * 0x400; -- apply_rot_fun >(gpu,X,Y,PA,PB,PC,PD,LG, gpu->BG_bmp_large_ram[num], NULL, pal); -+ apply_rot_fun >(gpu,X,Y,PA,PB,PC,PD,LG, gpu->BG_bmp_large_ram[num], 0, pal); - return; - default: break; - } -- cgit v1.2.3-65-gdbad