Get rid of bmp support, and fix warnings

(Portage version: 2.1_pre4-r1)

4 files changed, 112 insertions, 41 deletions

diff --git a/media-sound/sexypsf/ChangeLog b/media-sound/sexypsf/ChangeLog
index 5cbd6a912e13..cbe1a4948a16 100644
--- a/media-sound/sexypsf/ChangeLog
+++ b/media-sound/sexypsf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/sexypsf
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sexypsf/ChangeLog,v 1.14 2006/01/26 06:32:22 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sexypsf/ChangeLog,v 1.15 2006/02/18 23:42:52 truedfx Exp $
+
+  19 Feb 2006; Harald van Dijk <truedfx@gentoo.org>
+  files/sexypsf-0.4.7-misc.patch, sexypsf-0.4.7.ebuild:
+  Remove bmp support as beep-media-player is going away
+  Get rid of a bunch of warnings
 
   26 Jan 2006; Harald van Dijk <truedfx@gentoo.org> sexypsf-0.4.7.ebuild:
   Fix parallel build issue (bug #119240)
diff --git a/media-sound/sexypsf/Manifest b/media-sound/sexypsf/Manifest
index 86d7ba631f92..85eb4e2958d8 100644
--- a/media-sound/sexypsf/Manifest
+++ b/media-sound/sexypsf/Manifest
@@ -1,22 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 a0f8d2a73a95942536f0e2d1886200e2 ChangeLog 1945
+MD5 27f5da8fb3d5e0b698b2c45bfab8aaa4 ChangeLog 2143
+MD5 ffaa113215ddcecac79374633543e52d metadata.xml 248
+MD5 16e48240eb45b3d014770cf1a4977226 sexypsf-0.4.5.ebuild 1365
+MD5 718f9cbb34b957c7f1045b94c9225c7a sexypsf-0.4.6.ebuild 1402
+MD5 0e48734c36f020b5ee2ad6bd4b7457ff sexypsf-0.4.7.ebuild 1335
 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 54b96fe1f070f435fc279a00a9d00939 files/sexypsf-0.4.7-misc.patch 6241
-MD5 ffaa113215ddcecac79374633543e52d metadata.xml 248
-MD5 16e48240eb45b3d014770cf1a4977226 sexypsf-0.4.5.ebuild 1365
-MD5 718f9cbb34b957c7f1045b94c9225c7a sexypsf-0.4.6.ebuild 1402
-MD5 b8232480090d2f8e3b90f3561d1d267e sexypsf-0.4.7.ebuild 1599
+MD5 a454e4e7081e4953378e79dd3ccce7da files/sexypsf-0.4.7-misc.patch 7760
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFD2G16wnQyISwouHwRAmHhAJ0VIv9PlEiSM4sOK7nkm0qnD7AB2wCfbjb+
-qN1cxis56Utzn+hwGzXLExo=
-=KgA1
+iD8DBQFD97BkwnQyISwouHwRAu5rAJ4oUF9DRqeWmHpKWNAqwMV6aV6cuACeLjPQ
+7OLerLSnt7UgUAzehHPtUWw=
+=cRyf
 -----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 2387ad5691d2..2cbe55b5d6e4 100644
--- a/media-sound/sexypsf/files/sexypsf-0.4.7-misc.patch
+++ b/media-sound/sexypsf/files/sexypsf-0.4.7-misc.patch
@@ -6,6 +6,16 @@
  
 -void sexyd_update(char*,long);
 +void sexyd_update(unsigned char*,long);
+--- sexypsf/Linux/LnxMain.c
++++ sexypsf/Linux/LnxMain.c
+@@ -26,6 +26,7 @@
+ #include <time.h>
+ 
+ #include "driver.h"
++#include "oss.h"
+ #include "Linux.h"
+ 
+ int main(int argc, char *argv[]) {
 --- sexypsf/Linux/Makefile
 +++ sexypsf/Linux/Makefile
 @@ -4,12 +4,10 @@
@@ -27,7 +37,7 @@
  OBJS+= LnxMain.o
  
 -CFLAGS = -Wall -Winline ${OPTIMIZE} -I. -I.. ${FLAGS}
-+CFLAGS += -Wall -Winline -I. -I.. ${FLAGS}
++CFLAGS += -Wall -Winline -Wno-nonnull -I. -I.. ${FLAGS}
  #CFLAGS+= $(shell pkg-config gtk+-2.0 --cflags)
  
  sexypsf:	${OBJS}
@@ -36,9 +46,39 @@
  
  .PHONY: clean sexypsf
  
+--- sexypsf/Linux/oss.c
++++ sexypsf/Linux/oss.c
+@@ -54,6 +54,9 @@
+ 
+ #define OSS_MEM_DEF
+ #include "oss.h"
++
++#include "driver.h"
++
+ static int oss_audio_fd = -1;
+ extern int errno;
+ 
+@@ -66,8 +69,6 @@
+  int pspeed=44100;
+  int pstereo;
+  int format;
+- int fragsize = 0;
+- int myfrag;
+  int oss_speed, oss_stereo;
+ 
+  pstereo=OSS_MODE_STEREO;
+--- sexypsf/Linux/oss.h
++++ sexypsf/Linux/oss.h
+@@ -32,4 +32,6 @@
+ 
+ #define OSS_SPEED_44100	44100
+ 
++void SetupSound(void);
++
+ #endif // _OSS_SOUND_H
 --- sexypsf/Makefile
 +++ sexypsf/Makefile
-@@ -12,18 +12,14 @@
+@@ -12,18 +12,13 @@
  RM = rm -f
  
  LIBS = -shared -lz
@@ -49,10 +89,9 @@
  OBJS =	PsxBios.o PsxCounters.o PsxDma.o Spu.o PsxHw.o PsxMem.o Misc.o	\
  	R3000A.o PsxInterpreter.o PsxHLE.o spu/spu.o
  
-+XMMSCONF = xmms-config
  OBJS+=	xmms/xmms.o
 -FLAGS+=	`gtk-config --cflags`
-+FLAGS+=	`${XMMSCONF} --cflags`
++FLAGS+=	`xmms-config --cflags`
 -
 -ifeq (${CPU}, ix86)
 -	OPTIMIZE += -fomit-frame-pointer -mcpu=i686 -fno-exceptions
@@ -60,12 +99,12 @@
  
  ifeq (${CPU}, ppc)
  	FLAGS+=-DMSB_FIRST
-@@ -33,16 +30,16 @@
+@@ -33,10 +28,10 @@
  	FLAGS+=-DMSB_FIRST
  endif
  
 -CFLAGS = -Wall ${OPTIMIZE} -I. ${FLAGS}
-+CFLAGS += -Wall -I. ${FLAGS}
++CFLAGS += -Wall -Wno-nonnull -I. ${FLAGS}
  
  sexypsf: ${OBJS}
 -	${CC} ${CFLAGS} ${OBJS} -o libsexypsf.so ${LIBS}
@@ -73,13 +112,17 @@
  
  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/Misc.c
++++ sexypsf/Misc.c
+@@ -226,7 +226,7 @@
+ {
+         FILE *fp;
+         EXE_HEADER tmpHead;
+-        char *in,*out=0;
++        unsigned char *in,*out=0;
+ 	u8 head[4];
+         u32 reserved;
+         u32 complen;
 --- sexypsf/PsxInterpreter.c
 +++ sexypsf/PsxInterpreter.c
 @@ -417,7 +417,7 @@
@@ -138,6 +181,15 @@
  	/*
 --- sexypsf/PsxMem.c
 +++ sexypsf/PsxMem.c
+@@ -21,7 +21,7 @@
+ 
+ #include "PsxCommon.h"
+ 
+-void LoadPSXMem(u32 address, s32 length, char *data)
++void LoadPSXMem(u32 address, s32 length, unsigned char *data)
+ {
+  //printf("%08x %08x\n",address,length);
+  while(length>0)
 @@ -56,8 +56,8 @@
  
  	writeok=1;
@@ -197,7 +249,25 @@
  						break;
 --- sexypsf/PsxMem.h
 +++ sexypsf/PsxMem.h
-@@ -55,7 +55,7 @@
+@@ -41,21 +41,21 @@
+ }
+ #endif
+ 
+-s8 *psxM;
++char *psxM;
+ #define psxMu32(mem)	(*(u32*)&psxM[(mem) & 0x1fffff])
+ 
+-s8 *psxP;
++char *psxP;
+-s8 *psxR;
++char *psxR;
+ #define psxRu32(mem)	(*(u32*)&psxR[(mem) & 0x7ffff])
+ 
+-s8 *psxH;
++char *psxH;
+ 
+ #define psxHu8(mem)	(*(u8*) &psxH[(mem) & 0xffff])
+ 
  #define psxHu16(mem)   	(*(u16*)&psxH[(mem) & 0xffff])
  #define psxHu32(mem)   	(*(u32*)&psxH[(mem) & 0xffff])
  
@@ -206,6 +276,14 @@
  
  #define PSXM(mem)		(psxMemLUT[(mem) >> 16] == 0 ? NULL : (void*)(psxMemLUT[(mem) >> 16] + ((mem) & 0xffff)))
  
+@@ -76,6 +76,6 @@
+ void psxMemWrite16(u32 mem, u16 value);
+ void psxMemWrite32(u32 mem, u32 value);
+ 
+-void LoadPSXMem(u32 address, s32 length, char *data);
++void LoadPSXMem(u32 address, s32 length, unsigned char *data);
+ 
+ #endif /* __PSXMEMORY_H__ */
 --- sexypsf/xmms/xmms.c
 +++ sexypsf/xmms/xmms.c
 @@ -101,7 +101,7 @@
diff --git a/media-sound/sexypsf/sexypsf-0.4.7.ebuild b/media-sound/sexypsf/sexypsf-0.4.7.ebuild
index 3b5a0b6a7e3e..074f60362f94 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-2006 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.4 2006/01/26 06:32:23 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sexypsf/sexypsf-0.4.7.ebuild,v 1.5 2006/02/18 23:42:52 truedfx Exp $
 
 inherit eutils
 
@@ -13,10 +13,9 @@ SLOT="0"
 
 #-sparc: 0.4.5: Couldn't load minispf
 KEYWORDS="~amd64 ~ppc -sparc ~x86"
-IUSE="bmp xmms"
+IUSE="xmms"
 
 DEPEND="sys-libs/zlib
-	bmp? ( media-sound/beep-media-player )
 	xmms? ( media-sound/xmms )"
 
 S=${WORKDIR}/${PN}
@@ -36,29 +35,18 @@ src_compile() {
 
 	emake CPU="${CPU}" || die "emake failed"
 
-	if use bmp || use xmms; then
-		if ! use xmms; then
-			local XMMSCONF=beep-config
-		else
-			local XMMSCONF=xmms-config
-		fi
-
+	if use xmms; then
 		cd "${S}"
 		# do make clean to force rebuild with -fPIC
 		make clean || die "make clean failed"
 		# don't generate separate xmms and bmp plugins; they're compatible
-		emake CPU="${CPU}" XMMSCONF="${XMMSCONF}" sexypsf || die "building plugin failed"
+		emake CPU="${CPU}" sexypsf || die "building plugin 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