summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-sound/sexypsf
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'media-sound/sexypsf')
-rw-r--r--media-sound/sexypsf/Manifest1
-rw-r--r--media-sound/sexypsf/files/sexypsf-0.4.7-misc.patch297
-rw-r--r--media-sound/sexypsf/metadata.xml5
-rw-r--r--media-sound/sexypsf/sexypsf-0.4.7.ebuild44
4 files changed, 347 insertions, 0 deletions
diff --git a/media-sound/sexypsf/Manifest b/media-sound/sexypsf/Manifest
new file mode 100644
index 000000000000..baa9764ca609
--- /dev/null
+++ b/media-sound/sexypsf/Manifest
@@ -0,0 +1 @@
+DIST sexypsf-0.4.7.tar.bz2 83001 RMD160 dc190758a9d457971da0d7b3d788ba0f3d25c88d SHA1 2229ece9b19e321c720d55afe3c77562a38aeab0 SHA256 6a6b4abb8b1cb919eb2d4cd23ae72cc2ec1360590831c131e58fcf99fe2b31aa
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..bd1c21ce503b
--- /dev/null
+++ b/media-sound/sexypsf/files/sexypsf-0.4.7-misc.patch
@@ -0,0 +1,297 @@
+--- 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/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 @@
+
+ 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 -Wno-nonnull -I. -I.. ${FLAGS}
+ #CFLAGS+= $(shell pkg-config gtk+-2.0 --cflags)
+
+ sexypsf: ${OBJS}
+- ${CC} ${CFLAGS} ${OBJS} -o sexypsf ${LIBS}
++ ${CC} ${LDFLAGS} ${CFLAGS} ${OBJS} -o sexypsf ${LIBS}
+
+ .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,13 @@
+ 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
+
+ OBJS+= xmms/xmms.o
+-FLAGS+= `gtk-config --cflags`
++FLAGS+= `xmms-config --cflags`
+-
+-ifeq (${CPU}, ix86)
+- OPTIMIZE += -fomit-frame-pointer -mcpu=i686 -fno-exceptions
+-endif
+
+ ifeq (${CPU}, ppc)
+ FLAGS+=-DMSB_FIRST
+@@ -33,10 +28,10 @@
+ FLAGS+=-DMSB_FIRST
+ endif
+
+-CFLAGS = -Wall ${OPTIMIZE} -I. ${FLAGS}
++CFLAGS += -Wall -Wno-nonnull -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/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 @@
+ * 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
+@@ -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;
+
+- psxMemLUT = (u32*)malloc(0x10000 * 4);
++ psxMemLUT = malloc(0x10000 * sizeof *psxMemLUT);
+- memset(psxMemLUT, 0, 0x10000 * 4);
++ memset(psxMemLUT, 0, 0x10000 * sizeof *psxMemLUT);
+
+ psxM = (char*)malloc(0x00200000);
+ psxP = (char*)malloc(0x00010000);
+@@ -67,16 +67,16 @@
+ 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 + 0x8000, psxMemLUT, 0x80 * sizeof *psxMemLUT);
+- memcpy(psxMemLUT + 0xa000, psxMemLUT, 0x80 * 4);
++ memcpy(psxMemLUT + 0xa000, psxMemLUT, 0x80 * sizeof *psxMemLUT);
+
+- for (i=0; i<0x01; i++) psxMemLUT[i + 0x1f00] = (u32)&psxP[i << 16];
++ for (i=0; i<0x01; i++) psxMemLUT[i + 0x1f00] = &psxP[i << 16];
+
+- for (i=0; i<0x01; i++) psxMemLUT[i + 0x1f80] = (u32)&psxH[i << 16];
++ for (i=0; i<0x01; i++) psxMemLUT[i + 0x1f80] = &psxH[i << 16];
+
+- for (i=0; i<0x08; i++) psxMemLUT[i + 0xbfc0] = (u32)&psxR[i << 16];
++ for (i=0; i<0x08; i++) psxMemLUT[i + 0xbfc0] = &psxR[i << 16];
+
+ return 0;
+ }
+@@ -215,16 +215,16 @@
+ case 0x800: case 0x804:
+ if (writeok == 0) break;
+ writeok = 0;
+- memset(psxMemLUT + 0x0000, 0, 0x80 * 4);
++ memset(psxMemLUT + 0x0000, 0, 0x80 * sizeof *psxMemLUT);
+- memset(psxMemLUT + 0x8000, 0, 0x80 * 4);
++ memset(psxMemLUT + 0x8000, 0, 0x80 * sizeof *psxMemLUT);
+- memset(psxMemLUT + 0xa000, 0, 0x80 * 4);
++ memset(psxMemLUT + 0xa000, 0, 0x80 * sizeof *psxMemLUT);
+ break;
+ 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 + 0x8000, psxMemLUT, 0x80 * sizeof *psxMemLUT);
+- memcpy(psxMemLUT + 0xa000, psxMemLUT, 0x80 * 4);
++ memcpy(psxMemLUT + 0xa000, psxMemLUT, 0x80 * sizeof *psxMemLUT);
+ break;
+ default:
+ break;
+--- sexypsf/PsxMem.h
++++ sexypsf/PsxMem.h
+@@ -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])
+
+-u32 *psxMemLUT;
++char **psxMemLUT;
+
+ #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 @@
+ }
+
+ 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
new file mode 100644
index 000000000000..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/sexypsf/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</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..f16ce62000a6
--- /dev/null
+++ b/media-sound/sexypsf/sexypsf-0.4.7.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils flag-o-matic
+
+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"
+
+#-sparc: 0.4.5: Couldn't load minispf
+KEYWORDS="amd64 ppc -sparc x86"
+IUSE=""
+
+DEPEND="sys-libs/zlib"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}"/${P}-misc.patch
+
+ # ppc and sparc are big-endian while all other keywords are
+ # little-endian (as far as I know)
+ use ppc64 || use ppc || use sparc &&
+ sed -i -e "s:-D__LINUX__:& -DMSB_FIRST:" "${S}"/Linux/Makefile
+ # what about using the correct macro and avoid to cause severe damages to
+ # innocent ears?
+ sed -i -e "s:AFMT_S16_LE:AFMT_S16_NE:" "${S}"/Linux/oss.c
+}
+
+src_compile() {
+ cd "${S}"/Linux
+ emake || die "emake failed"
+}
+
+src_install() {
+ dobin Linux/sexypsf
+ dodoc Docs/*
+}