Version bump and marking myself as maintainer

Package-Manager: portage-2.0.53_rc6

6 files changed, 271 insertions, 8 deletions

diff --git a/media-sound/sexypsf/ChangeLog b/media-sound/sexypsf/ChangeLog
index c4806caf9334..01231ef8d4da 100644
--- a/media-sound/sexypsf/ChangeLog
+++ b/media-sound/sexypsf/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/sexypsf
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sexypsf/ChangeLog,v 1.8 2005/08/07 13:14:01 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sexypsf/ChangeLog,v 1.9 2005/10/26 06:39:31 truedfx Exp $
+
+*sexypsf-0.4.7 (26 Oct 2005)
+
+  26 Oct 2005; Harald van Dijk <truedfx@gentoo.org>
+  +files/sexypsf-0.4.7-misc.patch, metadata.xml, +sexypsf-0.4.7.ebuild:
+  Version bump plus gcc4 and 64bit fixes
+  And marking myself as maintainer
 
   07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> sexypsf-0.4.6.ebuild:
   Stable on ppc.
diff --git a/media-sound/sexypsf/Manifest b/media-sound/sexypsf/Manifest
index 12e0864694d7..176b42b81003 100644
--- a/media-sound/sexypsf/Manifest
+++ b/media-sound/sexypsf/Manifest
@@ -1,9 +1,22 @@
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 11262095c7b27eb6b1cc272b56b8c8f0 ChangeLog 1093
-MD5 16e48240eb45b3d014770cf1a4977226 sexypsf-0.4.5.ebuild 1365
-MD5 718f9cbb34b957c7f1045b94c9225c7a sexypsf-0.4.6.ebuild 1402
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 fed481011b1d339e6d4bb1b0b93c4cab ChangeLog 1325
+MD5 41f230a0e2debf8b51025a2d796c6e31 files/digest-sexypsf-0.4.5 61
+MD5 0ed9b80602e1c597dff882701ce72f64 files/digest-sexypsf-0.4.6 61
+MD5 606adf6de0a88f73cd8dd5c087a2d727 files/digest-sexypsf-0.4.7 65
+MD5 ec1912f27a7e4330699ef6addc03a8b0 files/sexypsf-0.4.5-gentoo.patch 1608
 MD5 ff39a6a980f10f48a571b23c330a8951 files/sexypsf-0.4.6-gentoo.patch 1519
 MD5 5e7f5501e9177b1f1c3d2cdc084ad6d1 files/sexypsf-0.4.6-xmms.patch 435
-MD5 ec1912f27a7e4330699ef6addc03a8b0 files/sexypsf-0.4.5-gentoo.patch 1608
-MD5 0ed9b80602e1c597dff882701ce72f64 files/digest-sexypsf-0.4.6 61
-MD5 41f230a0e2debf8b51025a2d796c6e31 files/digest-sexypsf-0.4.5 61
+MD5 42d54999ca76a0748d4d58f2fa294b15 files/sexypsf-0.4.7-misc.patch 4880
+MD5 ffaa113215ddcecac79374633543e52d metadata.xml 248
+MD5 16e48240eb45b3d014770cf1a4977226 sexypsf-0.4.5.ebuild 1365
+MD5 718f9cbb34b957c7f1045b94c9225c7a sexypsf-0.4.6.ebuild 1402
+MD5 500871540437fcf49ecbdbc168c2a155 sexypsf-0.4.7.ebuild 1274
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDXyTJwnQyISwouHwRAuxEAJ9FzSh8IWZsSLvPVUsRwxZg2luDVgCcCA1U
+SGot00tPUdDZr0S5iEHnBl0=
+=72a3
+-----END PGP SIGNATURE-----
diff --git a/media-sound/sexypsf/files/digest-sexypsf-0.4.7 b/media-sound/sexypsf/files/digest-sexypsf-0.4.7
new file mode 100644
index 000000000000..f21e9adf764b
--- /dev/null
+++ b/media-sound/sexypsf/files/digest-sexypsf-0.4.7
@@ -0,0 +1 @@
+MD5 89bc4d8a2ab66641282657ab3631bc29 sexypsf-0.4.7.tar.bz2 83001
diff --git a/media-sound/sexypsf/files/sexypsf-0.4.7-misc.patch b/media-sound/sexypsf/files/sexypsf-0.4.7-misc.patch
new file mode 100644
index 000000000000..ec74766111d7
--- /dev/null
+++ b/media-sound/sexypsf/files/sexypsf-0.4.7-misc.patch
@@ -0,0 +1,183 @@
+--- sexypsf/driver.h
++++ sexypsf/driver.h
+@@ -23,4 +23,4 @@
+ PSFINFO *sexy_getpsfinfo(char *path);
+ void sexy_freepsfinfo(PSFINFO *info);
+ 
+-void sexyd_update(char*,long);
++void sexyd_update(unsigned char*,long);
+--- sexypsf/Linux/Makefile
++++ sexypsf/Linux/Makefile
+@@ -4,12 +4,10 @@
+ 
+ all: sexypsf
+ 
+-CC = gcc 
+ RM = rm -f
+ STRIP = strip
+ 
+-OPTIMIZE = -O2 -fomit-frame-pointer -finline-functions -ffast-math
+-FLAGS = -g  -D__LINUX__ -DPSS_STYLE=1 
++FLAGS = -D__LINUX__ -DPSS_STYLE=1 
+ #-DTIMEO
+ LIBS = -lz
+ 
+@@ -20,11 +18,11 @@
+ 
+ OBJS+= LnxMain.o
+ 
+-CFLAGS = -Wall -Winline ${OPTIMIZE} -I. -I.. ${FLAGS}
++CFLAGS += -Wall -Winline -I. -I.. ${FLAGS}
+ #CFLAGS+= $(shell pkg-config gtk+-2.0 --cflags)
+ 
+ sexypsf:	${OBJS}
+-		${CC} ${CFLAGS} ${OBJS} -o sexypsf ${LIBS}
++		${CC} ${LDFLAGS} ${OBJS} -o sexypsf ${LIBS}
+ 
+ .PHONY: clean sexypsf
+ 
+--- sexypsf/Makefile
++++ sexypsf/Makefile
+@@ -12,8 +12,7 @@
+ RM = rm -f
+ 
+ LIBS = -shared -lz
+-OPTIMIZE = -O2 -finline-functions -ffast-math
+-FLAGS = -DPSS_STYLE=1 -DSPSFVERSION="\"${VERSION}\""
++FLAGS = -DPSS_STYLE=1 -DSPSFVERSION="\"${VERSION}\"" -fPIC
+ 
+ OBJS =	PsxBios.o PsxCounters.o PsxDma.o Spu.o PsxHw.o PsxMem.o Misc.o	\
+ 	R3000A.o PsxInterpreter.o PsxHLE.o spu/spu.o
+@@ -21,10 +20,6 @@
+ OBJS+=	xmms/xmms.o
+ FLAGS+=	`gtk-config --cflags`
+ 
+-ifeq (${CPU}, ix86)
+-	OPTIMIZE += -fomit-frame-pointer -mcpu=i686 -fno-exceptions
+-endif
+-
+ ifeq (${CPU}, ppc)
+ 	FLAGS+=-DMSB_FIRST
+ endif	
+@@ -33,10 +28,10 @@
+ 	FLAGS+=-DMSB_FIRST
+ endif
+ 
+-CFLAGS = -Wall ${OPTIMIZE} -I. ${FLAGS}
++CFLAGS += -Wall -I. ${FLAGS}
+ 
+ sexypsf: ${OBJS}
+-	${CC} ${CFLAGS} ${OBJS} -o libsexypsf.so ${LIBS}
++	${CC} ${LDFLAGS} ${OBJS} -o libsexypsf.so ${LIBS}
+ 
+ install: sexypsf
+ 	mv libsexypsf.so ${HOME}/.xmms/Plugins
+--- sexypsf/PsxInterpreter.c
++++ sexypsf/PsxInterpreter.c
+@@ -417,7 +417,7 @@
+ * Load higher 16 bits of the first word in GPR with imm  *
+ * Format:  OP rt, immediate                              *
+ *********************************************************/
+-static void psxLUI() { if (!_Rt_) return; _u32(_rRt_) = psxRegs.code << 16; } // Upper halfword of Rt = Im
++static void psxLUI() { if (!_Rt_) return; _rRt_ = psxRegs.code << 16; } // Upper halfword of Rt = Im
+ 
+ /*********************************************************
+ * Move from HI/LO to GPR                                 *
+@@ -491,7 +491,7 @@
+ 
+ static void psxLBU() {
+ 	if (_Rt_) {
+-		_u32(_rRt_) = psxMemRead8(_oB_);
++		_rRt_ = psxMemRead8(_oB_);
+ 	} else {
+ 		psxMemRead8(_oB_); 
+ 	}
+@@ -507,7 +507,7 @@
+ 
+ static void psxLHU() {
+ 	if (_Rt_) {
+-		_u32(_rRt_) = psxMemRead16(_oB_);
++		_rRt_ = psxMemRead16(_oB_);
+ 	} else {
+ 		psxMemRead16(_oB_);
+ 	}
+@@ -515,7 +515,7 @@
+ 
+ static void psxLW() {
+ 	if (_Rt_) {
+-		_u32(_rRt_) = psxMemRead32(_oB_);
++		_rRt_ = psxMemRead32(_oB_);
+ 	} else {
+ 		psxMemRead32(_oB_);
+ 	}
+@@ -530,7 +530,7 @@
+ 	u32 mem = psxMemRead32(addr & ~3);
+ 
+ 	if (!_Rt_) return;
+-	_u32(_rRt_) =	( _u32(_rRt_) & LWL_MASK[shift]) | 
++	_rRt_ =	( _u32(_rRt_) & LWL_MASK[shift]) | 
+ 					( mem << LWL_SHIFT[shift]);
+ 
+ 	/*
+@@ -552,7 +552,7 @@
+ 	u32 mem = psxMemRead32(addr & ~3);
+ 
+ 	if (!_Rt_) return;
+-	_u32(_rRt_) =	( _u32(_rRt_) & LWR_MASK[shift]) | 
++	_rRt_ =	( _u32(_rRt_) & LWR_MASK[shift]) | 
+ 					( mem >> LWR_SHIFT[shift]);
+ 
+ 	/*
+--- sexypsf/PsxMem.c
++++ sexypsf/PsxMem.c
+@@ -56,8 +56,8 @@
+ 
+ 	writeok=1;
+ 
+-	psxMemLUT = (u32*)malloc(0x10000 * 4);
+-	memset(psxMemLUT, 0, 0x10000 * 4);
++	psxMemLUT = malloc(0x10000 * sizeof *psxMemLUT);
++	memset(psxMemLUT, 0, 0x10000 * sizeof *psxMemLUT);
+ 
+ 	psxM = (char*)malloc(0x00200000);
+ 	psxP = (char*)malloc(0x00010000);
+@@ -67,7 +67,7 @@
+ 		printf("Error allocating memory"); return -1;
+ 	}
+ 
+-	for (i=0; i<0x80; i++) psxMemLUT[i + 0x0000] = (u32)&psxM[(i & 0x1f) << 16];
++	for (i=0; i<0x80; i++) psxMemLUT[i + 0x0000] = &psxM[(i & 0x1f) << 16];
+ 
+ 	memcpy(psxMemLUT + 0x8000, psxMemLUT, 0x80 * 4);
+ 	memcpy(psxMemLUT + 0xa000, psxMemLUT, 0x80 * 4);
+@@ -222,7 +222,7 @@
+ 					case 0x1e988:
+ 						if (writeok == 1) break;
+ 						writeok = 1;
+-						for (i=0; i<0x80; i++) psxMemLUT[i + 0x0000] = (u32)&psxM[(i & 0x1f) << 16];
++						for (i=0; i<0x80; i++) psxMemLUT[i + 0x0000] = &psxM[(i & 0x1f) << 16];
+ 						memcpy(psxMemLUT + 0x8000, psxMemLUT, 0x80 * 4);
+ 						memcpy(psxMemLUT + 0xa000, psxMemLUT, 0x80 * 4);
+ 						break;
+--- sexypsf/PsxMem.h
++++ sexypsf/PsxMem.h
+@@ -55,7 +55,7 @@
+ #define psxHu16(mem)   	(*(u16*)&psxH[(mem) & 0xffff])
+ #define psxHu32(mem)   	(*(u32*)&psxH[(mem) & 0xffff])
+ 
+-u32 *psxMemLUT;
++char **psxMemLUT;
+ 
+ #define PSXM(mem)		(psxMemLUT[(mem) >> 16] == 0 ? NULL : (void*)(psxMemLUT[(mem) >> 16] + ((mem) & 0xffff)))
+ 
+--- sexypsf/xmms/xmms.c
++++ sexypsf/xmms/xmms.c
+@@ -101,7 +101,7 @@
+ }
+ 
+ static pthread_t dethread;
+-void sexyd_update(char *Buffer, long count)
++void sexyd_update(unsigned char *Buffer, long count)
+ {
+  int mask = ~((((16 / 8) * 2)) - 1);
+  if(count)
diff --git a/media-sound/sexypsf/metadata.xml b/media-sound/sexypsf/metadata.xml
index e1774e3d9ad7..4f1a1aa0c9f9 100644
--- a/media-sound/sexypsf/metadata.xml
+++ b/media-sound/sexypsf/metadata.xml
@@ -2,4 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sound</herd>
+<maintainer>
+<email>truedfx@gentoo.org</email>
+<name>Harald van Dijk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/sexypsf/sexypsf-0.4.7.ebuild b/media-sound/sexypsf/sexypsf-0.4.7.ebuild
new file mode 100644
index 000000000000..d6eb0df420d6
--- /dev/null
+++ b/media-sound/sexypsf/sexypsf-0.4.7.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sexypsf/sexypsf-0.4.7.ebuild,v 1.1 2005/10/26 06:39:31 truedfx Exp $
+
+inherit eutils
+
+DESCRIPTION="sexyPSF is an open-source PSF1 (Playstation music) file player"
+HOMEPAGE="http://projects.raphnet.net/#sexypsf"
+SRC_URI="http://projects.raphnet.net/sexypsf/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+#-amd64: 0.4.6: Segfault on playback using sexypsf.
+#-sparc: 0.4.5: Couldn't load minispf
+KEYWORDS="-amd64 ~ppc -sparc ~x86"
+IUSE="xmms"
+
+DEPEND="sys-libs/zlib
+	xmms? ( media-sound/xmms )"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-misc.patch
+}
+
+src_compile() {
+	cd "${S}"/Linux
+
+	# ppc and sparc are big-endian while all other keywords are
+	# little-endian (as far as I know)
+	use ppc64 || use ppc || use sparc && CPU="MSBFIRST" || CPU="LSBFIRST"
+
+	emake CPU="${CPU}" || die "emake failed"
+
+	if use xmms; then
+		cd "${S}"
+		# do make clean to force rebuild with -fPIC
+		emake CPU="${CPU}" clean sexypsf || die "emake failed"
+	fi
+}
+
+src_install() {
+	dobin Linux/sexypsf
+
+	if use xmms; then
+		exeinto "$(xmms-config --input-plugin-dir)"
+		doexe libsexypsf.so
+	fi
+
+	dodoc Docs/*
+}