ChangeLog

6 files changed, 141 insertions, 1 deletions

diff --git a/media-sound/sexypsf/ChangeLog b/media-sound/sexypsf/ChangeLog
index 27d23b8b1293..98b0d0fdb446 100644
--- a/media-sound/sexypsf/ChangeLog
+++ b/media-sound/sexypsf/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/sexypsf
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sexypsf/ChangeLog,v 1.5 2004/07/20 01:02:18 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sexypsf/ChangeLog,v 1.6 2004/10/07 23:50:44 eradicator Exp $
+
+*sexypsf-0.4.6 (07 Oct 2004)
+
+  07 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/sexypsf-0.4.6-gentoo.patch, +files/sexypsf-0.4.6-xmms.patch,
+  +sexypsf-0.4.6.ebuild:
+  Version bump.
 
   19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> sexypsf-0.4.5.ebuild:
   -sparc -amd64
diff --git a/media-sound/sexypsf/Manifest b/media-sound/sexypsf/Manifest
index 6f2408af2dd6..d055bd5be9d8 100644
--- a/media-sound/sexypsf/Manifest
+++ b/media-sound/sexypsf/Manifest
@@ -1,5 +1,7 @@
 MD5 06493e839382347df44653aec7faae19 ChangeLog 708
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 16e48240eb45b3d014770cf1a4977226 sexypsf-0.4.5.ebuild 1365
+MD5 8482d84553f80c0e21f2105a50b29c22 sexypsf-0.4.6.ebuild 1379
 MD5 41f230a0e2debf8b51025a2d796c6e31 files/digest-sexypsf-0.4.5 61
 MD5 ec1912f27a7e4330699ef6addc03a8b0 files/sexypsf-0.4.5-gentoo.patch 1608
+MD5 0ed9b80602e1c597dff882701ce72f64 files/digest-sexypsf-0.4.6 61
diff --git a/media-sound/sexypsf/files/digest-sexypsf-0.4.6 b/media-sound/sexypsf/files/digest-sexypsf-0.4.6
new file mode 100644
index 000000000000..51156680b9d0
--- /dev/null
+++ b/media-sound/sexypsf/files/digest-sexypsf-0.4.6
@@ -0,0 +1 @@
+MD5 83fd68258efc2f7d319d033a263e4183 sexypsf046.tar.gz 92289
diff --git a/media-sound/sexypsf/files/sexypsf-0.4.6-gentoo.patch b/media-sound/sexypsf/files/sexypsf-0.4.6-gentoo.patch
new file mode 100644
index 000000000000..3be76d5935b3
--- /dev/null
+++ b/media-sound/sexypsf/files/sexypsf-0.4.6-gentoo.patch
@@ -0,0 +1,54 @@
+diff -Naur sexypsf.orig/Linux/Makefile sexypsf/Linux/Makefile
+--- sexypsf.orig/Linux/Makefile	2004-09-01 22:18:44.000000000 -0700
++++ sexypsf/Linux/Makefile	2004-10-07 16:42:22.932199622 -0700
+@@ -8,8 +8,7 @@
+ RM = rm -f
+ STRIP = strip
+ 
+-OPTIMIZE = -O2 -fomit-frame-pointer -finline-functions -ffast-math
+-FLAGS = -g  -D__LINUX__ -DPSS_STYLE=1 
++FLAGS = -g  -D__LINUX__ -DPSS_STYLE=1  -fPIC
+ #-DTIMEO
+ LIBS = -lz
+ 
+@@ -20,7 +19,7 @@
+ 
+ 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}
+diff -Naur sexypsf.orig/xmms/Makefile sexypsf/xmms/Makefile
+--- sexypsf.orig/xmms/Makefile	2004-09-01 13:43:13.000000000 -0700
++++ sexypsf/xmms/Makefile	2004-10-07 16:43:08.155808251 -0700
+@@ -12,7 +12,6 @@
+ RM = rm -f
+ #LD = ld -shared
+ LIBS = -lz -shared $(shell gtk-config --libs)
+-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 \
+@@ -22,10 +21,6 @@
+ 
+ OBJS+= xmms.o
+ 
+-ifeq (${CPU}, ix86)
+-	OPTIMIZE += -fomit-frame-pointer -mcpu=i686 -fno-exceptions
+-endif
+-
+ ifeq (${CPU}, ppc)
+ 	FLAGS+=-DMSB_FIRST
+ endif	
+@@ -34,7 +29,7 @@
+ 	FLAGS+=-DMSB_FIRST
+ endif
+ 
+-CFLAGS = -Wall ${OPTIMIZE} -I. -I.. -I/usr/include/g++ ${FLAGS}
++CFLAGS = -Wall -I. -I.. -I/usr/include/g++ ${FLAGS}
+ CFLAGS+= $(shell gtk-config --cflags)
+ 
+ #ifdef LD
diff --git a/media-sound/sexypsf/files/sexypsf-0.4.6-xmms.patch b/media-sound/sexypsf/files/sexypsf-0.4.6-xmms.patch
new file mode 100644
index 000000000000..dbafadf01742
--- /dev/null
+++ b/media-sound/sexypsf/files/sexypsf-0.4.6-xmms.patch
@@ -0,0 +1,12 @@
+diff -Naur sexypsf.orig/xmms/xmms.c sexypsf/xmms/xmms.c
+--- sexypsf.orig/xmms/xmms.c	2004-09-01 22:36:11.000000000 -0700
++++ sexypsf/xmms/xmms.c	2004-10-07 16:47:33.549594720 -0700
+@@ -101,7 +101,7 @@
+ }
+ 
+ static pthread_t dethread;
+-void sexyd_update(char *Buffer, int count)
++void sexyd_update(unsigned char *Buffer, long count)
+ {
+  if(count)
+   sexy_ip.add_vis_pcm(sexy_ip.output->written_time(), FMT_S16_NE, 2, count/4, Buffer);
diff --git a/media-sound/sexypsf/sexypsf-0.4.6.ebuild b/media-sound/sexypsf/sexypsf-0.4.6.ebuild
new file mode 100644
index 000000000000..938b8186b770
--- /dev/null
+++ b/media-sound/sexypsf/sexypsf-0.4.6.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sexypsf/sexypsf-0.4.6.ebuild,v 1.1 2004/10/07 23:50:44 eradicator Exp $
+
+IUSE="xmms"
+
+inherit eutils
+
+MY_P="${PN}${PV//./}"
+S="${WORKDIR}/${PN}"
+
+DESCRIPTION="sexyPSF is an open-source PSF (Playstation music) file player"
+HOMEPAGE="http://xod.fobby.net/${PN}/"
+SRC_URI="http://xod.fobby.net/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+#-amd64: 0.4.6: Segfault on playback using sexypsf.
+#-sparc: 0.4.5: Couldn't load minispf
+KEYWORDS="~x86 ~ppc -amd64 -sparc"
+
+DEPEND="sys-libs/zlib
+	xmms? ( media-sound/xmms )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.patch
+	epatch ${FILESDIR}/${P}-xmms.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
+
+	if use xmms; then
+		cd ${S}/xmms
+		emake CPU="${CPU}" || die
+	fi
+}
+
+src_install() {
+	cd ${S}/Linux
+	dobin sexypsf
+
+	if use xmms; then
+		cd ${S}/xmms
+		exeinto `xmms-config --input-plugin-dir`
+		doexe libsexypsf.so
+	fi
+
+	dodoc ${S}/Docs/*
+}
+
+pkg_postinst() {
+	ewarn "The xmms plugin seems to be unstable.  It does not play minipsf files,"
+	ewarn "but the command line works fine with them."
+}