Version bump to 1.17 and apply patch to fix compilation with gcc-4, patch by Maercelo Goes <vanquirius AT gentoo DOT org>; bug #117536

(Portage version: 2.1_pre3-r1)

5 files changed, 173 insertions, 5 deletions

diff --git a/games-emulation/psemu-peopssoftgpu/ChangeLog b/games-emulation/psemu-peopssoftgpu/ChangeLog
index e2c8e776a484..0fad92ff0aae 100644
--- a/games-emulation/psemu-peopssoftgpu/ChangeLog
+++ b/games-emulation/psemu-peopssoftgpu/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for games-emulation/psemu-peopssoftgpu
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/psemu-peopssoftgpu/ChangeLog,v 1.8 2005/04/03 07:47:52 vapier Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/psemu-peopssoftgpu/ChangeLog,v 1.9 2006/01/07 04:56:52 halcy0n Exp $
+
+*psemu-peopssoftgpu-1.17 (07 Jan 2006)
+
+  07 Jan 2006; Mark Loeser <halcy0n@gentoo.org>
+  +files/psemu-peopssoftgpu-1.17-gcc41.patch,
+  +psemu-peopssoftgpu-1.17.ebuild:
+  Version bump to 1.17 and apply patch to fix compilation with gcc-4, patch by
+  Maercelo Goes <vanquirius AT gentoo DOT org>; bug #117536
 
   03 Apr 2005; Mike Frysinger <vapier@gentoo.org>
   +files/psemu-peopssoftgpu-1.16-fix-noxf86vm.patch,
diff --git a/games-emulation/psemu-peopssoftgpu/Manifest b/games-emulation/psemu-peopssoftgpu/Manifest
index 72f38e4971bc..67f0bd4e7866 100644
--- a/games-emulation/psemu-peopssoftgpu/Manifest
+++ b/games-emulation/psemu-peopssoftgpu/Manifest
@@ -1,9 +1,12 @@
 MD5 586f180d5618796d47427934b1033341 ChangeLog 2211
-MD5 e8f592e299f6a03cd257e93e8ae34b9f psemu-peopssoftgpu-1.15.ebuild 1536
-MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 30fa48f19560db9b3b08cb2dc9ee626e psemu-peopssoftgpu-1.16.ebuild 1745
 MD5 d7d6d0e073fab50e7fc57d7efe5dcf31 files/1.15-makefile-cflags.patch 971
 MD5 2bb8283c0041934b8dcf50003f408ea0 files/digest-psemu-peopssoftgpu-1.15 67
 MD5 933706295eaebb39f5550e2b22a5481d files/digest-psemu-peopssoftgpu-1.16 67
+MD5 81e6778a0e51c93d107d977ce1532e0c files/digest-psemu-peopssoftgpu-1.17 67
 MD5 f54e65dfac77ff2d214c40aef60db289 files/psemu-peopssoftgpu-1.16-fix-noxf86vm.patch 463
 MD5 c3c327560ff175c4d8813f5b3f68eee9 files/psemu-peopssoftgpu-1.16-makefile-cflags.patch 406
+MD5 29e28aa0b708711bb8c80e586ec0f9dd files/psemu-peopssoftgpu-1.17-gcc41.patch 2212
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 e8f592e299f6a03cd257e93e8ae34b9f psemu-peopssoftgpu-1.15.ebuild 1536
+MD5 fd0a6e6f1392d0f6a6f7bf9bdc45a35d psemu-peopssoftgpu-1.16.ebuild 1784
+MD5 43e6e94293332d75fcf680dfdaff7507 psemu-peopssoftgpu-1.17.ebuild 1796
diff --git a/games-emulation/psemu-peopssoftgpu/files/digest-psemu-peopssoftgpu-1.17 b/games-emulation/psemu-peopssoftgpu/files/digest-psemu-peopssoftgpu-1.17
new file mode 100644
index 000000000000..bf3dff14c171
--- /dev/null
+++ b/games-emulation/psemu-peopssoftgpu/files/digest-psemu-peopssoftgpu-1.17
@@ -0,0 +1 @@
+MD5 0d00afad769fd48bf6185cf72db36053 PeopsSoftGpu117.tar.gz 680025
diff --git a/games-emulation/psemu-peopssoftgpu/files/psemu-peopssoftgpu-1.17-gcc41.patch b/games-emulation/psemu-peopssoftgpu/files/psemu-peopssoftgpu-1.17-gcc41.patch
new file mode 100644
index 000000000000..d21da4e900dd
--- /dev/null
+++ b/games-emulation/psemu-peopssoftgpu/files/psemu-peopssoftgpu-1.17-gcc41.patch
@@ -0,0 +1,84 @@
+diff -ur src-orig/draw.c src/draw.c
+--- src-orig/draw.c	2006-01-06 03:19:55.000000000 -0500
++++ src/draw.c	2006-01-06 03:20:33.000000000 -0500
+@@ -4400,6 +4400,7 @@
+ 
+ #ifdef USE_XF86VM
+ 
++#undef BOOL
+ #include <X11/extensions/xf86vmode.h>
+ static XF86VidModeModeInfo **modes=0;
+ static int           iOldMode=0;
+@@ -5705,7 +5706,13 @@
+ #else
+      pDstR=(unsigned long *)(pDst-(ddx+dga2Fix));
+ #endif
+-     for(x=0;x<ddx2;x++) *((unsigned long*)pDst)++=*pDstR++;
++     for(x=0;x<ddx2;x++)
++      {
++       *((unsigned long*)pDst) = *pDstR;
++	pDst += sizeof (unsigned long);
++	pDstR += sizeof (unsigned long);
++      }
++
+     }
+    else
+     {
+Only in src-orig/: draw.c.orig
+diff -ur src-orig/gpu.h src/gpu.h
+--- src-orig/gpu.h	2006-01-06 03:19:55.000000000 -0500
++++ src/gpu.h	2006-01-06 03:19:33.000000000 -0500
+@@ -63,4 +63,4 @@
+ 
+ /////////////////////////////////////////////////////////////////////////////
+ 
+-#endif // _GPU_INTERNALS_H
+\ No newline at end of file
++#endif // _GPU_INTERNALS_H
+diff -ur src-orig/menu.h src/menu.h
+--- src-orig/menu.h	2006-01-06 03:19:55.000000000 -0500
++++ src/menu.h	2006-01-06 03:19:33.000000000 -0500
+@@ -33,4 +33,4 @@
+ void BuildDispMenu(int iInc);
+ void SwitchDispMenu(int iStep);
+ 
+-#endif // _GPU_MENU_H_
+\ No newline at end of file
++#endif // _GPU_MENU_H_
+diff -ur src-orig/prim.c src/prim.c
+--- src-orig/prim.c	2006-01-06 03:19:55.000000000 -0500
++++ src/prim.c	2006-01-06 03:19:33.000000000 -0500
+@@ -269,10 +269,12 @@
+ 

+ // x -466 1023 180 1023

+ // y   20 -228 222 -100

+-

++
++/*

+ // 0 __1

+ //  \ / \

+ //   2___3

++*/
+ 
+ __inline BOOL CheckCoord4()
+ {

+diff -ur src-orig/prim.h src/prim.h
+--- src-orig/prim.h	2006-01-06 03:19:55.000000000 -0500
++++ src/prim.h	2006-01-06 03:19:33.000000000 -0500
+@@ -30,4 +30,4 @@
+ void UploadScreen (long Position);
+ void PrepareFullScreenUpload (long Position);
+ 
+-#endif // _PRIMDRAW_H_
+\ No newline at end of file
++#endif // _PRIMDRAW_H_
+diff -ur src-orig/psemu.h src/psemu.h
+--- src-orig/psemu.h	2006-01-06 03:19:55.000000000 -0500
++++ src/psemu.h	2006-01-06 03:19:33.000000000 -0500
+@@ -33,4 +33,4 @@
+ #define PSE_LT_SPU	4
+ 
+ 
+-#endif // _PSEMU_PLUGIN_DEFS_H
+\ No newline at end of file
++#endif // _PSEMU_PLUGIN_DEFS_H
diff --git a/games-emulation/psemu-peopssoftgpu/psemu-peopssoftgpu-1.17.ebuild b/games-emulation/psemu-peopssoftgpu/psemu-peopssoftgpu-1.17.ebuild
new file mode 100644
index 000000000000..0d593889b2d8
--- /dev/null
+++ b/games-emulation/psemu-peopssoftgpu/psemu-peopssoftgpu-1.17.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/psemu-peopssoftgpu/psemu-peopssoftgpu-1.17.ebuild,v 1.1 2006/01/07 04:56:52 halcy0n Exp $
+
+inherit eutils games
+
+DESCRIPTION="P.E.Op.S Software GPU plugin"
+HOMEPAGE="http://sourceforge.net/projects/peops/"
+SRC_URI="mirror://sourceforge/peops/PeopsSoftGpu${PV//.}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+IUSE="sdl"
+
+RDEPEND="=x11-libs/gtk+-1*
+	sdl? ( media-libs/libsdl )
+	virtual/x11"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	x86? ( dev-lang/nasm )
+	amd64? ( dev-lang/nasm )"
+
+S=${WORKDIR}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	edos2unix src/makes/mk.fpse
+	epatch "${FILESDIR}"/${PN}-1.16-makefile-cflags.patch
+	epatch "${FILESDIR}"/${PN}-1.16-fix-noxf86vm.patch
+	epatch "${FILESDIR}"/${P}-gcc41.patch
+
+	if [[ ${ARCH} != "x86" ]] ; then
+		cd src
+		sed -i \
+			-e "s/^CPU = i386/CPU = ${ARCH}/g" \
+			-e '/^XF86VM =/s:TRUE:FALSE:' makes/mk.x11 \
+			|| die "sed non-x86 failed"
+		if use sdl ; then
+			sed -i \
+				-e "s/OBJECTS.*i386.o//g" \
+				-e "s/-D__i386__//g" makes/mk.fpse \
+				|| die "sed sdl failed"
+		fi
+	fi
+}
+
+src_compile() {
+	cd src
+	emake OPTFLAGS="${CFLAGS}" || die "x11 build failed"
+
+	# FIXME: this breaks if src_compile is called twice
+	if use sdl ; then
+		sed -i \
+			-e 's:mk.x11:mk.fpse:g' Makefile \
+			|| die "sed failed"
+		make clean || die "make clean failed"
+		emake OPTFLAGS="${CFLAGS}" || die "sdl build failed"
+	fi
+}
+
+src_install() {
+	dodoc *.txt
+	insinto "${GAMES_LIBDIR}/psemu/cfg"
+	doins gpuPeopsSoftX.cfg
+	exeinto "${GAMES_LIBDIR}/psemu/plugins"
+	doexe src/libgpuPeops* || die "doexe failed"
+	exeinto "${GAMES_LIBDIR}/psemu/cfg"
+	doexe src/cfgPeopsSoft || die "doexe failed"
+	prepgamesdirs
+}