| 1 |
commit: 995c66f7fa91d6bd5c2980e6a7296745e597a295 |
| 2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Fri Jul 5 19:41:57 2019 +0000 |
| 4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 20 19:37:55 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=995c66f7 |
| 7 |
|
| 8 |
media-sound/sexypsf: remove unused patch(es) |
| 9 |
|
| 10 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/12390 |
| 12 |
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> |
| 13 |
|
| 14 |
media-sound/sexypsf/files/sexypsf-0.4.7-misc.patch | 297 --------------------- |
| 15 |
1 file changed, 297 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-sound/sexypsf/files/sexypsf-0.4.7-misc.patch b/media-sound/sexypsf/files/sexypsf-0.4.7-misc.patch |
| 18 |
deleted file mode 100644 |
| 19 |
index bd1c21ce503..00000000000 |
| 20 |
--- a/media-sound/sexypsf/files/sexypsf-0.4.7-misc.patch |
| 21 |
+++ /dev/null |
| 22 |
@@ -1,297 +0,0 @@ |
| 23 |
---- sexypsf/driver.h |
| 24 |
-+++ sexypsf/driver.h |
| 25 |
-@@ -23,4 +23,4 @@ |
| 26 |
- PSFINFO *sexy_getpsfinfo(char *path); |
| 27 |
- void sexy_freepsfinfo(PSFINFO *info); |
| 28 |
- |
| 29 |
--void sexyd_update(char*,long); |
| 30 |
-+void sexyd_update(unsigned char*,long); |
| 31 |
---- sexypsf/Linux/LnxMain.c |
| 32 |
-+++ sexypsf/Linux/LnxMain.c |
| 33 |
-@@ -26,6 +26,7 @@ |
| 34 |
- #include <time.h> |
| 35 |
- |
| 36 |
- #include "driver.h" |
| 37 |
-+#include "oss.h" |
| 38 |
- #include "Linux.h" |
| 39 |
- |
| 40 |
- int main(int argc, char *argv[]) { |
| 41 |
---- sexypsf/Linux/Makefile |
| 42 |
-+++ sexypsf/Linux/Makefile |
| 43 |
-@@ -4,12 +4,10 @@ |
| 44 |
- |
| 45 |
- all: sexypsf |
| 46 |
- |
| 47 |
--CC = gcc |
| 48 |
- RM = rm -f |
| 49 |
- STRIP = strip |
| 50 |
- |
| 51 |
--OPTIMIZE = -O2 -fomit-frame-pointer -finline-functions -ffast-math |
| 52 |
--FLAGS = -g -D__LINUX__ -DPSS_STYLE=1 |
| 53 |
-+FLAGS = -D__LINUX__ -DPSS_STYLE=1 |
| 54 |
- #-DTIMEO |
| 55 |
- LIBS = -lz |
| 56 |
- |
| 57 |
-@@ -20,11 +18,11 @@ |
| 58 |
- |
| 59 |
- OBJS+= LnxMain.o |
| 60 |
- |
| 61 |
--CFLAGS = -Wall -Winline ${OPTIMIZE} -I. -I.. ${FLAGS} |
| 62 |
-+CFLAGS += -Wall -Winline -Wno-nonnull -I. -I.. ${FLAGS} |
| 63 |
- #CFLAGS+= $(shell pkg-config gtk+-2.0 --cflags) |
| 64 |
- |
| 65 |
- sexypsf: ${OBJS} |
| 66 |
-- ${CC} ${CFLAGS} ${OBJS} -o sexypsf ${LIBS} |
| 67 |
-+ ${CC} ${LDFLAGS} ${CFLAGS} ${OBJS} -o sexypsf ${LIBS} |
| 68 |
- |
| 69 |
- .PHONY: clean sexypsf |
| 70 |
- |
| 71 |
---- sexypsf/Linux/oss.c |
| 72 |
-+++ sexypsf/Linux/oss.c |
| 73 |
-@@ -54,6 +54,9 @@ |
| 74 |
- |
| 75 |
- #define OSS_MEM_DEF |
| 76 |
- #include "oss.h" |
| 77 |
-+ |
| 78 |
-+#include "driver.h" |
| 79 |
-+ |
| 80 |
- static int oss_audio_fd = -1; |
| 81 |
- extern int errno; |
| 82 |
- |
| 83 |
-@@ -66,8 +69,6 @@ |
| 84 |
- int pspeed=44100; |
| 85 |
- int pstereo; |
| 86 |
- int format; |
| 87 |
-- int fragsize = 0; |
| 88 |
-- int myfrag; |
| 89 |
- int oss_speed, oss_stereo; |
| 90 |
- |
| 91 |
- pstereo=OSS_MODE_STEREO; |
| 92 |
---- sexypsf/Linux/oss.h |
| 93 |
-+++ sexypsf/Linux/oss.h |
| 94 |
-@@ -32,4 +32,6 @@ |
| 95 |
- |
| 96 |
- #define OSS_SPEED_44100 44100 |
| 97 |
- |
| 98 |
-+void SetupSound(void); |
| 99 |
-+ |
| 100 |
- #endif // _OSS_SOUND_H |
| 101 |
---- sexypsf/Makefile |
| 102 |
-+++ sexypsf/Makefile |
| 103 |
-@@ -12,18 +12,13 @@ |
| 104 |
- RM = rm -f |
| 105 |
- |
| 106 |
- LIBS = -shared -lz |
| 107 |
--OPTIMIZE = -O2 -finline-functions -ffast-math |
| 108 |
--FLAGS = -DPSS_STYLE=1 -DSPSFVERSION="\"${VERSION}\"" |
| 109 |
-+FLAGS = -DPSS_STYLE=1 -DSPSFVERSION="\"${VERSION}\"" -fPIC |
| 110 |
- |
| 111 |
- OBJS = PsxBios.o PsxCounters.o PsxDma.o Spu.o PsxHw.o PsxMem.o Misc.o \ |
| 112 |
- R3000A.o PsxInterpreter.o PsxHLE.o spu/spu.o |
| 113 |
- |
| 114 |
- OBJS+= xmms/xmms.o |
| 115 |
--FLAGS+= `gtk-config --cflags` |
| 116 |
-+FLAGS+= `xmms-config --cflags` |
| 117 |
-- |
| 118 |
--ifeq (${CPU}, ix86) |
| 119 |
-- OPTIMIZE += -fomit-frame-pointer -mcpu=i686 -fno-exceptions |
| 120 |
--endif |
| 121 |
- |
| 122 |
- ifeq (${CPU}, ppc) |
| 123 |
- FLAGS+=-DMSB_FIRST |
| 124 |
-@@ -33,10 +28,10 @@ |
| 125 |
- FLAGS+=-DMSB_FIRST |
| 126 |
- endif |
| 127 |
- |
| 128 |
--CFLAGS = -Wall ${OPTIMIZE} -I. ${FLAGS} |
| 129 |
-+CFLAGS += -Wall -Wno-nonnull -I. ${FLAGS} |
| 130 |
- |
| 131 |
- sexypsf: ${OBJS} |
| 132 |
-- ${CC} ${CFLAGS} ${OBJS} -o libsexypsf.so ${LIBS} |
| 133 |
-+ ${CC} ${LDFLAGS} ${OBJS} -o libsexypsf.so ${LIBS} |
| 134 |
- |
| 135 |
- install: sexypsf |
| 136 |
- mv libsexypsf.so ${HOME}/.xmms/Plugins |
| 137 |
---- sexypsf/Misc.c |
| 138 |
-+++ sexypsf/Misc.c |
| 139 |
-@@ -226,7 +226,7 @@ |
| 140 |
- { |
| 141 |
- FILE *fp; |
| 142 |
- EXE_HEADER tmpHead; |
| 143 |
-- char *in,*out=0; |
| 144 |
-+ unsigned char *in,*out=0; |
| 145 |
- u8 head[4]; |
| 146 |
- u32 reserved; |
| 147 |
- u32 complen; |
| 148 |
---- sexypsf/PsxInterpreter.c |
| 149 |
-+++ sexypsf/PsxInterpreter.c |
| 150 |
-@@ -417,7 +417,7 @@ |
| 151 |
- * Load higher 16 bits of the first word in GPR with imm * |
| 152 |
- * Format: OP rt, immediate * |
| 153 |
- *********************************************************/ |
| 154 |
--static void psxLUI() { if (!_Rt_) return; _u32(_rRt_) = psxRegs.code << 16; } // Upper halfword of Rt = Im |
| 155 |
-+static void psxLUI() { if (!_Rt_) return; _rRt_ = psxRegs.code << 16; } // Upper halfword of Rt = Im |
| 156 |
- |
| 157 |
- /********************************************************* |
| 158 |
- * Move from HI/LO to GPR * |
| 159 |
-@@ -491,7 +491,7 @@ |
| 160 |
- |
| 161 |
- static void psxLBU() { |
| 162 |
- if (_Rt_) { |
| 163 |
-- _u32(_rRt_) = psxMemRead8(_oB_); |
| 164 |
-+ _rRt_ = psxMemRead8(_oB_); |
| 165 |
- } else { |
| 166 |
- psxMemRead8(_oB_); |
| 167 |
- } |
| 168 |
-@@ -507,7 +507,7 @@ |
| 169 |
- |
| 170 |
- static void psxLHU() { |
| 171 |
- if (_Rt_) { |
| 172 |
-- _u32(_rRt_) = psxMemRead16(_oB_); |
| 173 |
-+ _rRt_ = psxMemRead16(_oB_); |
| 174 |
- } else { |
| 175 |
- psxMemRead16(_oB_); |
| 176 |
- } |
| 177 |
-@@ -515,7 +515,7 @@ |
| 178 |
- |
| 179 |
- static void psxLW() { |
| 180 |
- if (_Rt_) { |
| 181 |
-- _u32(_rRt_) = psxMemRead32(_oB_); |
| 182 |
-+ _rRt_ = psxMemRead32(_oB_); |
| 183 |
- } else { |
| 184 |
- psxMemRead32(_oB_); |
| 185 |
- } |
| 186 |
-@@ -530,7 +530,7 @@ |
| 187 |
- u32 mem = psxMemRead32(addr & ~3); |
| 188 |
- |
| 189 |
- if (!_Rt_) return; |
| 190 |
-- _u32(_rRt_) = ( _u32(_rRt_) & LWL_MASK[shift]) | |
| 191 |
-+ _rRt_ = ( _u32(_rRt_) & LWL_MASK[shift]) | |
| 192 |
- ( mem << LWL_SHIFT[shift]); |
| 193 |
- |
| 194 |
- /* |
| 195 |
-@@ -552,7 +552,7 @@ |
| 196 |
- u32 mem = psxMemRead32(addr & ~3); |
| 197 |
- |
| 198 |
- if (!_Rt_) return; |
| 199 |
-- _u32(_rRt_) = ( _u32(_rRt_) & LWR_MASK[shift]) | |
| 200 |
-+ _rRt_ = ( _u32(_rRt_) & LWR_MASK[shift]) | |
| 201 |
- ( mem >> LWR_SHIFT[shift]); |
| 202 |
- |
| 203 |
- /* |
| 204 |
---- sexypsf/PsxMem.c |
| 205 |
-+++ sexypsf/PsxMem.c |
| 206 |
-@@ -21,7 +21,7 @@ |
| 207 |
- |
| 208 |
- #include "PsxCommon.h" |
| 209 |
- |
| 210 |
--void LoadPSXMem(u32 address, s32 length, char *data) |
| 211 |
-+void LoadPSXMem(u32 address, s32 length, unsigned char *data) |
| 212 |
- { |
| 213 |
- //printf("%08x %08x\n",address,length); |
| 214 |
- while(length>0) |
| 215 |
-@@ -56,8 +56,8 @@ |
| 216 |
- |
| 217 |
- writeok=1; |
| 218 |
- |
| 219 |
-- psxMemLUT = (u32*)malloc(0x10000 * 4); |
| 220 |
-+ psxMemLUT = malloc(0x10000 * sizeof *psxMemLUT); |
| 221 |
-- memset(psxMemLUT, 0, 0x10000 * 4); |
| 222 |
-+ memset(psxMemLUT, 0, 0x10000 * sizeof *psxMemLUT); |
| 223 |
- |
| 224 |
- psxM = (char*)malloc(0x00200000); |
| 225 |
- psxP = (char*)malloc(0x00010000); |
| 226 |
-@@ -67,16 +67,16 @@ |
| 227 |
- printf("Error allocating memory"); return -1; |
| 228 |
- } |
| 229 |
- |
| 230 |
-- for (i=0; i<0x80; i++) psxMemLUT[i + 0x0000] = (u32)&psxM[(i & 0x1f) << 16]; |
| 231 |
-+ for (i=0; i<0x80; i++) psxMemLUT[i + 0x0000] = &psxM[(i & 0x1f) << 16]; |
| 232 |
- |
| 233 |
-- memcpy(psxMemLUT + 0x8000, psxMemLUT, 0x80 * 4); |
| 234 |
-+ memcpy(psxMemLUT + 0x8000, psxMemLUT, 0x80 * sizeof *psxMemLUT); |
| 235 |
-- memcpy(psxMemLUT + 0xa000, psxMemLUT, 0x80 * 4); |
| 236 |
-+ memcpy(psxMemLUT + 0xa000, psxMemLUT, 0x80 * sizeof *psxMemLUT); |
| 237 |
- |
| 238 |
-- for (i=0; i<0x01; i++) psxMemLUT[i + 0x1f00] = (u32)&psxP[i << 16]; |
| 239 |
-+ for (i=0; i<0x01; i++) psxMemLUT[i + 0x1f00] = &psxP[i << 16]; |
| 240 |
- |
| 241 |
-- for (i=0; i<0x01; i++) psxMemLUT[i + 0x1f80] = (u32)&psxH[i << 16]; |
| 242 |
-+ for (i=0; i<0x01; i++) psxMemLUT[i + 0x1f80] = &psxH[i << 16]; |
| 243 |
- |
| 244 |
-- for (i=0; i<0x08; i++) psxMemLUT[i + 0xbfc0] = (u32)&psxR[i << 16]; |
| 245 |
-+ for (i=0; i<0x08; i++) psxMemLUT[i + 0xbfc0] = &psxR[i << 16]; |
| 246 |
- |
| 247 |
- return 0; |
| 248 |
- } |
| 249 |
-@@ -215,16 +215,16 @@ |
| 250 |
- case 0x800: case 0x804: |
| 251 |
- if (writeok == 0) break; |
| 252 |
- writeok = 0; |
| 253 |
-- memset(psxMemLUT + 0x0000, 0, 0x80 * 4); |
| 254 |
-+ memset(psxMemLUT + 0x0000, 0, 0x80 * sizeof *psxMemLUT); |
| 255 |
-- memset(psxMemLUT + 0x8000, 0, 0x80 * 4); |
| 256 |
-+ memset(psxMemLUT + 0x8000, 0, 0x80 * sizeof *psxMemLUT); |
| 257 |
-- memset(psxMemLUT + 0xa000, 0, 0x80 * 4); |
| 258 |
-+ memset(psxMemLUT + 0xa000, 0, 0x80 * sizeof *psxMemLUT); |
| 259 |
- break; |
| 260 |
- case 0x1e988: |
| 261 |
- if (writeok == 1) break; |
| 262 |
- writeok = 1; |
| 263 |
-- for (i=0; i<0x80; i++) psxMemLUT[i + 0x0000] = (u32)&psxM[(i & 0x1f) << 16]; |
| 264 |
-+ for (i=0; i<0x80; i++) psxMemLUT[i + 0x0000] = &psxM[(i & 0x1f) << 16]; |
| 265 |
-- memcpy(psxMemLUT + 0x8000, psxMemLUT, 0x80 * 4); |
| 266 |
-+ memcpy(psxMemLUT + 0x8000, psxMemLUT, 0x80 * sizeof *psxMemLUT); |
| 267 |
-- memcpy(psxMemLUT + 0xa000, psxMemLUT, 0x80 * 4); |
| 268 |
-+ memcpy(psxMemLUT + 0xa000, psxMemLUT, 0x80 * sizeof *psxMemLUT); |
| 269 |
- break; |
| 270 |
- default: |
| 271 |
- break; |
| 272 |
---- sexypsf/PsxMem.h |
| 273 |
-+++ sexypsf/PsxMem.h |
| 274 |
-@@ -41,21 +41,21 @@ |
| 275 |
- } |
| 276 |
- #endif |
| 277 |
- |
| 278 |
--s8 *psxM; |
| 279 |
-+char *psxM; |
| 280 |
- #define psxMu32(mem) (*(u32*)&psxM[(mem) & 0x1fffff]) |
| 281 |
- |
| 282 |
--s8 *psxP; |
| 283 |
-+char *psxP; |
| 284 |
--s8 *psxR; |
| 285 |
-+char *psxR; |
| 286 |
- #define psxRu32(mem) (*(u32*)&psxR[(mem) & 0x7ffff]) |
| 287 |
- |
| 288 |
--s8 *psxH; |
| 289 |
-+char *psxH; |
| 290 |
- |
| 291 |
- #define psxHu8(mem) (*(u8*) &psxH[(mem) & 0xffff]) |
| 292 |
- |
| 293 |
- #define psxHu16(mem) (*(u16*)&psxH[(mem) & 0xffff]) |
| 294 |
- #define psxHu32(mem) (*(u32*)&psxH[(mem) & 0xffff]) |
| 295 |
- |
| 296 |
--u32 *psxMemLUT; |
| 297 |
-+char **psxMemLUT; |
| 298 |
- |
| 299 |
- #define PSXM(mem) (psxMemLUT[(mem) >> 16] == 0 ? NULL : (void*)(psxMemLUT[(mem) >> 16] + ((mem) & 0xffff))) |
| 300 |
- |
| 301 |
-@@ -76,6 +76,6 @@ |
| 302 |
- void psxMemWrite16(u32 mem, u16 value); |
| 303 |
- void psxMemWrite32(u32 mem, u32 value); |
| 304 |
- |
| 305 |
--void LoadPSXMem(u32 address, s32 length, char *data); |
| 306 |
-+void LoadPSXMem(u32 address, s32 length, unsigned char *data); |
| 307 |
- |
| 308 |
- #endif /* __PSXMEMORY_H__ */ |
| 309 |
---- sexypsf/xmms/xmms.c |
| 310 |
-+++ sexypsf/xmms/xmms.c |
| 311 |
-@@ -101,7 +101,7 @@ |
| 312 |
- } |
| 313 |
- |
| 314 |
- static pthread_t dethread; |
| 315 |
--void sexyd_update(char *Buffer, long count) |
| 316 |
-+void sexyd_update(unsigned char *Buffer, long count) |
| 317 |
- { |
| 318 |
- int mask = ~((((16 / 8) * 2)) - 1); |
| 319 |
- if(count) |
Archives