From 2667c1c6d40d90929a480700a1e0429e94103bbd Mon Sep 17 00:00:00 2001 From: Christian Birchinger Date: Fri, 19 Sep 2008 14:54:20 +0000 Subject: Version bump. This version includes support for amd64 and contains a fix to work with recent libvorbis 1.2.x releases. (Portage version: 2.1.4.4) --- .../daphne/files/daphne-1.0-typefix.patch | 45 ++++++++++++++++++++++ .../daphne/files/daphne-1.0-vorbisfilefix.patch | 12 ++++++ 2 files changed, 57 insertions(+) create mode 100644 games-emulation/daphne/files/daphne-1.0-typefix.patch create mode 100644 games-emulation/daphne/files/daphne-1.0-vorbisfilefix.patch (limited to 'games-emulation/daphne/files') diff --git a/games-emulation/daphne/files/daphne-1.0-typefix.patch b/games-emulation/daphne/files/daphne-1.0-typefix.patch new file mode 100644 index 000000000000..eaa97e46accf --- /dev/null +++ b/games-emulation/daphne/files/daphne-1.0-typefix.patch @@ -0,0 +1,45 @@ +diff -ruN v_1_0.orig/src/ldp-in/ldv1000.cpp v_1_0/src/ldp-in/ldv1000.cpp +--- v_1_0.orig/src/ldp-in/ldv1000.cpp 2008-01-29 18:04:34.000000000 +0100 ++++ v_1_0/src/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 +--- v_1_0.orig/src/vldp2/libvo/video_out_null.c 2008-01-29 18:04:43.000000000 +0100 ++++ v_1_0/src/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-vorbisfilefix.patch b/games-emulation/daphne/files/daphne-1.0-vorbisfilefix.patch new file mode 100644 index 000000000000..715040243314 --- /dev/null +++ b/games-emulation/daphne/files/daphne-1.0-vorbisfilefix.patch @@ -0,0 +1,12 @@ +diff -ruN v_1_0.orig/src/ldp-out/ldp-vldp-audio.cpp v_1_0/src/ldp-out/ldp-vldp-audio.cpp +--- v_1_0.orig/src/ldp-out/ldp-vldp-audio.cpp 2008-01-29 18:04:07.000000000 +0100 ++++ v_1_0/src/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) -- cgit v1.2.3-65-gdbad