Add bmp support

(Portage version: 2.0.53_rc7)

4 files changed, 45 insertions, 20 deletions

diff --git a/media-sound/sexypsf/ChangeLog b/media-sound/sexypsf/ChangeLog
index 37ba6d0199bf..49bb61c52fe6 100644
--- a/media-sound/sexypsf/ChangeLog
+++ b/media-sound/sexypsf/ChangeLog
@@ -1,6 +1,10 @@
 # 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.10 2005/11/02 19:46:39 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sexypsf/ChangeLog,v 1.11 2005/11/06 15:37:42 truedfx Exp $
+
+  06 Nov 2005; Harald van Dijk <truedfx@gentoo.org>
+  files/sexypsf-0.4.7-misc.patch, sexypsf-0.4.7.ebuild:
+  Add bmp support
 
   02 Nov 2005; Harald van Dijk <truedfx@gentoo.org>
   files/sexypsf-0.4.7-misc.patch:
diff --git a/media-sound/sexypsf/Manifest b/media-sound/sexypsf/Manifest
index 2d2ff3b732e3..31dc7ccd15eb 100644
--- a/media-sound/sexypsf/Manifest
+++ b/media-sound/sexypsf/Manifest
@@ -2,21 +2,21 @@
 Hash: SHA1
 
 MD5 c8f434be0752b42f170ff2d8b1387537 ChangeLog 1441
+MD5 ffaa113215ddcecac79374633543e52d metadata.xml 248
+MD5 16e48240eb45b3d014770cf1a4977226 sexypsf-0.4.5.ebuild 1365
+MD5 718f9cbb34b957c7f1045b94c9225c7a sexypsf-0.4.6.ebuild 1402
+MD5 b2bb90b7db4c3e6c959c63b2a6bce05d sexypsf-0.4.7.ebuild 1607
 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 aa6ef135f7fc2509354ec2f552af6364 files/sexypsf-0.4.7-misc.patch 5697
-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
+MD5 2dcbc3cf37c096721d888dab6ad24d7d files/sexypsf-0.4.7-misc.patch 5887
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDaRexwnQyISwouHwRAgdQAJ9vdH+1Bh2YO4LtCxEQhlqvTEXvHQCgsYzC
-laMpAac+ECsHA6Fom1sW6DE=
-=xJ/W
+iD8DBQFDbgwVwnQyISwouHwRAkn1AJ9vBSYOBWcHLsokO0vK/UNjqoSA2wCgs2vq
+Gk1XWjDyCB0nlQgvOvxVI/o=
+=VjKz
 -----END PGP SIGNATURE-----
diff --git a/media-sound/sexypsf/files/sexypsf-0.4.7-misc.patch b/media-sound/sexypsf/files/sexypsf-0.4.7-misc.patch
index d092d698615c..97c666f15714 100644
--- a/media-sound/sexypsf/files/sexypsf-0.4.7-misc.patch
+++ b/media-sound/sexypsf/files/sexypsf-0.4.7-misc.patch
@@ -38,7 +38,7 @@
  
 --- sexypsf/Makefile
 +++ sexypsf/Makefile
-@@ -12,8 +12,7 @@
+@@ -12,18 +12,14 @@
  RM = rm -f
  
  LIBS = -shared -lz
@@ -48,18 +48,19 @@
  
  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`
  
++XMMSCONF = xmms-config
+ OBJS+=	xmms/xmms.o
+-FLAGS+=	`gtk-config --cflags`
++FLAGS+=	`${XMMSCONF} --cflags`
+-
 -ifeq (${CPU}, ix86)
 -	OPTIMIZE += -fomit-frame-pointer -mcpu=i686 -fno-exceptions
 -endif
--
+ 
  ifeq (${CPU}, ppc)
  	FLAGS+=-DMSB_FIRST
- endif	
-@@ -33,10 +28,10 @@
+@@ -33,16 +30,16 @@
  	FLAGS+=-DMSB_FIRST
  endif
  
@@ -72,6 +73,13 @@
  
  install: sexypsf
  	mv libsexypsf.so ${HOME}/.xmms/Plugins
+ 
+ installglobal: sexypsf
+-	mv libsexypsf.so `xmms-config --input-plugin-dir`
++	mv libsexypsf.so `${XMMSCONF} --input-plugin-dir`
+ 
+ .PHONY: clean sexypsf
+ 
 --- sexypsf/PsxInterpreter.c
 +++ sexypsf/PsxInterpreter.c
 @@ -417,7 +417,7 @@
diff --git a/media-sound/sexypsf/sexypsf-0.4.7.ebuild b/media-sound/sexypsf/sexypsf-0.4.7.ebuild
index d6eb0df420d6..8833dbe8a3c3 100644
--- a/media-sound/sexypsf/sexypsf-0.4.7.ebuild
+++ b/media-sound/sexypsf/sexypsf-0.4.7.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sexypsf/sexypsf-0.4.7.ebuild,v 1.2 2005/11/06 15:37:42 truedfx Exp $
 
 inherit eutils
 
@@ -14,9 +14,10 @@ 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"
+IUSE="bmp xmms"
 
 DEPEND="sys-libs/zlib
+	bmp? ( media-sound/beep-media-player )
 	xmms? ( media-sound/xmms )"
 
 S=${WORKDIR}/${PN}
@@ -36,16 +37,28 @@ src_compile() {
 
 	emake CPU="${CPU}" || die "emake failed"
 
-	if use xmms; then
+	if use bmp || use xmms; then
+		if ! use xmms; then
+			local XMMSCONF=beep-config
+		else
+			local XMMSCONF=xmms-config
+		fi
+
 		cd "${S}"
+		# don't generate separate xmms and bmp plugins; they're compatible
 		# do make clean to force rebuild with -fPIC
-		emake CPU="${CPU}" clean sexypsf || die "emake failed"
+		emake CPU="${CPU}" XMMSCONF="${XMMSCONF}" clean sexypsf || die "emake failed"
 	fi
 }
 
 src_install() {
 	dobin Linux/sexypsf
 
+	if use bmp; then
+		exeinto "$(beep-config --input-plugin-dir)"
+		doexe libsexypsf.so
+	fi
+
 	if use xmms; then
 		exeinto "$(xmms-config --input-plugin-dir)"
 		doexe libsexypsf.so