From 0cf2f20608308acdf3cb922c3736446bbd8f3388 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:58:29 +0100 Subject: gentoo resync : 14.07.2018 --- .../daphne/files/daphne-1.0-gcc43.patch | 12 ------ .../daphne/files/daphne-1.0-ldflags.patch | 22 ---------- .../daphne/files/daphne-1.0-system-lmpeg2.patch | 41 ------------------- .../daphne/files/daphne-1.0-typefix.patch | 47 ---------------------- .../daphne/files/daphne-1.0-underlink.patch | 8 ---- .../daphne/files/daphne-1.0-vorbisfilefix.patch | 14 ------- games-emulation/daphne/files/daphne-1.0-zlib.patch | 13 ------ 7 files changed, 157 deletions(-) delete mode 100644 games-emulation/daphne/files/daphne-1.0-gcc43.patch delete mode 100644 games-emulation/daphne/files/daphne-1.0-ldflags.patch delete mode 100644 games-emulation/daphne/files/daphne-1.0-system-lmpeg2.patch delete mode 100644 games-emulation/daphne/files/daphne-1.0-typefix.patch delete mode 100644 games-emulation/daphne/files/daphne-1.0-underlink.patch delete mode 100644 games-emulation/daphne/files/daphne-1.0-vorbisfilefix.patch delete mode 100644 games-emulation/daphne/files/daphne-1.0-zlib.patch (limited to 'games-emulation/daphne/files') diff --git a/games-emulation/daphne/files/daphne-1.0-gcc43.patch b/games-emulation/daphne/files/daphne-1.0-gcc43.patch deleted file mode 100644 index 07c505c27814..000000000000 --- a/games-emulation/daphne/files/daphne-1.0-gcc43.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/Makefile.old 2009-01-19 16:22:07.000000000 +0100 -+++ b/Makefile 2009-01-19 16:22:17.000000000 +0100 -@@ -33,7 +33,7 @@ - endif - - # Platform specific cflags defined in the Makefile.vars file --export CFLAGS = ${PFLAGS} ${DEFINE_STATIC_VLDP} -Wall -Winline -Werror -+export CFLAGS = ${PFLAGS} ${DEFINE_STATIC_VLDP} -Wall -Winline - - OBJS = ldp-out/*.o cpu/*.o game/*.o io/*.o timer/*.o ldp-in/*.o video/*.o \ - sound/*.o daphne.o cpu/x86/*.o scoreboard/*.o ${VLDP_OBJS} - diff --git a/games-emulation/daphne/files/daphne-1.0-ldflags.patch b/games-emulation/daphne/files/daphne-1.0-ldflags.patch deleted file mode 100644 index 245e8f5e216b..000000000000 --- a/games-emulation/daphne/files/daphne-1.0-ldflags.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/Makefile.old 2010-10-05 08:48:46.000000000 +0200 -+++ b/Makefile 2010-10-05 08:49:10.000000000 +0200 -@@ -43,7 +43,7 @@ - .SUFFIXES: .cpp - - all: ${LOCAL_OBJS} sub -- ${CXX} ${DFLAGS} ${OBJS} -o ${EXE} ${LIBS} -+ ${CXX} $(LDFLAGS) ${DFLAGS} ${OBJS} -o ${EXE} ${LIBS} - - sub: - cd ldp-out && $(MAKE) ---- a/vldp2/Makefile.linux.old 2010-10-05 09:29:52.000000000 +0200 -+++ b/vldp2/Makefile.linux 2010-10-05 09:30:13.000000000 +0200 -@@ -33,7 +33,7 @@ - all: vldp2 - - vldp2: ${OBJS} -- ${CC} -shared -o ${LIBNAME} ${OBJS} ${LIBS} -+ ${CC} $(LDFLAGS) -shared -o ${LIBNAME} ${OBJS} ${LIBS} - cp ${LIBNAME} ../../. - - clean: diff --git a/games-emulation/daphne/files/daphne-1.0-system-lmpeg2.patch b/games-emulation/daphne/files/daphne-1.0-system-lmpeg2.patch deleted file mode 100644 index e82d2ecf0d40..000000000000 --- a/games-emulation/daphne/files/daphne-1.0-system-lmpeg2.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -ur v_1_0.old/src/vldp2/Makefile.am v_1_0/src/vldp2/Makefile.am ---- a/vldp2/Makefile.am 2009-12-29 18:04:15.000000000 +0200 -+++ b/vldp2/Makefile.am 2009-12-29 18:10:42.000000000 +0200 -@@ -1,3 +1,3 @@ --SUBDIRS = autotools include libmpeg2 libvo doc src vc++ test -+SUBDIRS = autotools - - EXTRA_DIST = bootstrap -diff -ur v_1_0.old/src/vldp2/Makefile.in v_1_0/src/vldp2/Makefile.in ---- a/vldp2/Makefile.in 2009-12-29 18:04:15.000000000 +0200 -+++ b/vldp2/Makefile.in 2009-12-29 18:10:51.000000000 +0200 -@@ -128,7 +128,7 @@ - sharedstatedir = @sharedstatedir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --SUBDIRS = autotools include libmpeg2 libvo doc src vc++ test -+SUBDIRS = autotools - - EXTRA_DIST = bootstrap - subdir = . -diff -ur v_1_0.old/src/vldp2/Makefile.linux v_1_0/src/vldp2/Makefile.linux ---- a/vldp2/Makefile.linux 2009-12-29 18:04:15.000000000 +0200 -+++ b/vldp2/Makefile.linux 2009-12-29 18:13:12.000000000 +0200 -@@ -14,14 +14,9 @@ - DFLAGS = -O3 -march=i686 -fomit-frame-pointer -funroll-loops - - CFLAGS = ${DFLAGS} `sdl-config --cflags` -I./include --LIBS = `sdl-config --libs` -+LIBS = `sdl-config --libs` -lmpeg2 - --OBJS = vldp/vldp.o vldp/vldp_internal.o vldp/mpegscan.o \ -- libmpeg2/cpu_accel.o libmpeg2/alloc.o libmpeg2/cpu_state.o \ -- libmpeg2/decode.o libmpeg2/header.o libmpeg2/motion_comp.o \ -- libmpeg2/idct.o libmpeg2/idct_mmx.o libmpeg2/motion_comp_mmx.o \ -- libmpeg2/slice.o \ -- libvo/video_out.o libvo/video_out_null.o -+OBJS = vldp/vldp.o vldp/vldp_internal.o vldp/mpegscan.o - - LIBNAME = libvldp2.so - - diff --git a/games-emulation/daphne/files/daphne-1.0-typefix.patch b/games-emulation/daphne/files/daphne-1.0-typefix.patch deleted file mode 100644 index 790d93a3af87..000000000000 --- a/games-emulation/daphne/files/daphne-1.0-typefix.patch +++ /dev/null @@ -1,47 +0,0 @@ -amd64 does not like int pointers - -diff -ruN v_1_0.orig/src/ldp-in/ldv1000.cpp v_1_0/src/ldp-in/ldv1000.cpp ---- a/ldp-in/ldv1000.cpp 2008-01-29 18:04:34.000000000 +0100 -+++ b/ldp-in/ldv1000.cpp 2008-09-19 14:29:40.000000000 +0200 -@@ -607,9 +607,9 @@ - - void ldv1000_event_callback(void *eventType) - { -- g_ldv1000_last_event = (unsigned int) eventType; -+ g_ldv1000_last_event = (unsigned long) eventType; - -- switch ((unsigned int) eventType) -+ switch ((unsigned long) eventType) - { - case LDV1000_EVENT_VSYNC_END: - #ifdef DEBUG -diff -ruN v_1_0.orig/src/vldp2/libvo/video_out_null.c v_1_0/src/vldp2/libvo/video_out_null.c ---- a/vldp2/libvo/video_out_null.c 2008-01-29 18:04:43.000000000 +0100 -+++ b/vldp2/libvo/video_out_null.c 2008-09-19 14:30:03.000000000 +0200 -@@ -82,7 +82,7 @@ - // this is the potentially expensive callback that gets the hardware overlay - // ready to be displayed, so we do this before we sleep - // NOTE : if this callback fails, we don't want to display the frame due to double buffering considerations -- if (g_in_info->prepare_frame(&g_yuv_buf[(int) id])) -+ if (g_in_info->prepare_frame(&g_yuv_buf[(long) id])) - { - #ifndef VLDP_BENCHMARK - -@@ -133,7 +133,7 @@ - #endif - // draw the frame - // we are using the pointer 'id' as an index, kind of risky, but convenient :) -- g_in_info->display_frame(&g_yuv_buf[(int) id]); -+ g_in_info->display_frame(&g_yuv_buf[(long) id]); - #ifndef VLDP_BENCHMARK - } // end if we didn't get a new command to interrupt the frame being displayed - #endif -@@ -272,7 +272,7 @@ - uint8_t ** buf, void ** id) - { - static buffer_index = 0; -- *id = (int *) buffer_index; // THIS IS A LITTLE TRICKY -+ *id = (long *) buffer_index; // THIS IS A LITTLE TRICKY - // We are setting an integer value to a pointer ... - // Because it is convenient to let the pointer hold the value of this integer for us - // Hopefully it doesn't cause any trouble later ;) diff --git a/games-emulation/daphne/files/daphne-1.0-underlink.patch b/games-emulation/daphne/files/daphne-1.0-underlink.patch deleted file mode 100644 index dd4c3d1467e2..000000000000 --- a/games-emulation/daphne/files/daphne-1.0-underlink.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/Makefile.vars.linux_x86.old 2011-09-21 12:27:42.480566742 +0200 -+++ b/Makefile.vars.linux_x86 2011-09-21 12:27:57.490564959 +0200 -@@ -24,4 +24,4 @@ - -DUSE_MMX -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DUSE_OPENGL - - # platform-specific lib flags --LIBS = `sdl-config --libs` -ldl -lz -logg -lvorbis -lvorbisfile -lGLEW -+LIBS = `sdl-config --libs` -ldl -lz -logg -lvorbis -lvorbisfile -lGLEW -lGL -lm diff --git a/games-emulation/daphne/files/daphne-1.0-vorbisfilefix.patch b/games-emulation/daphne/files/daphne-1.0-vorbisfilefix.patch deleted file mode 100644 index 05a0403a8af4..000000000000 --- a/games-emulation/daphne/files/daphne-1.0-vorbisfilefix.patch +++ /dev/null @@ -1,14 +0,0 @@ -Fix no sound issue with >=media-libs/libvorbis-1.2.0 - -diff -ruN v_1_0.orig/src/ldp-out/ldp-vldp-audio.cpp v_1_0/src/ldp-out/ldp-vldp-audio.cpp ---- a/ldp-out/ldp-vldp-audio.cpp 2008-01-29 18:04:07.000000000 +0100 -+++ b/ldp-out/ldp-vldp-audio.cpp 2008-09-19 13:43:10.000000000 +0200 -@@ -146,7 +146,7 @@ - switch (whence) - { - case SEEK_SET: -- if (offset < g_audio_filesize) -+ if (offset <= g_audio_filesize) - { - // make sure offset is positive so we don't get into trouble - if (offset >= 0) diff --git a/games-emulation/daphne/files/daphne-1.0-zlib.patch b/games-emulation/daphne/files/daphne-1.0-zlib.patch deleted file mode 100644 index d94af3b174f4..000000000000 --- a/games-emulation/daphne/files/daphne-1.0-zlib.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/io/unzip.h 2011-09-21 12:13:28.911668053 +0200 -+++ b/io/unzip.h 2011-09-21 12:14:53.074658064 +0200 -@@ -57,6 +57,10 @@ - #include "zlib.h" - #endif - -+#ifndef OF -+#define OF _Z_OF -+#endif -+ - #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP) - /* like the STRICT of WIN32, we define a pointer that cannot be converted - from (void*) without cast */ -- cgit v1.2.3