summaryrefslogtreecommitdiff
path: root/scummvm/scummvm-0.6.1b
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-11-09 00:36:47 +0000
committerChris Larson <clarson@kergoth.com>2004-11-09 00:36:47 +0000
commitf96441b9faf769c9ecdd4d338b605ea3d0cc4010 (patch)
treeedb17ec2c4ea13c5acb1c7350957a249a820e28d /scummvm/scummvm-0.6.1b
parentb6588aa6851fb220cedc387d21c51513ef8d67f4 (diff)
Disable bk EOLN_NATIVE conversions on all files in packages FILESPATHs, to prevent it screwing up patches.
BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA
Diffstat (limited to 'scummvm/scummvm-0.6.1b')
-rw-r--r--scummvm/scummvm-0.6.1b/mouse.patch36
-rw-r--r--scummvm/scummvm-0.6.1b/tremor.patch32
2 files changed, 68 insertions, 0 deletions
diff --git a/scummvm/scummvm-0.6.1b/mouse.patch b/scummvm/scummvm-0.6.1b/mouse.patch
index e69de29bb2..1697ac811d 100644
--- a/scummvm/scummvm-0.6.1b/mouse.patch
+++ b/scummvm/scummvm-0.6.1b/mouse.patch
@@ -0,0 +1,36 @@
+--- ./backends/sdl/sdl-common.cpp~mouse.patch 2004-03-05 07:23:04.000000000 +1030
++++ ./backends/sdl/sdl-common.cpp 2004-05-16 07:53:24.000000000 +0930
+@@ -866,6 +866,9 @@
+ return true;
+
+ case SDL_MOUSEBUTTONDOWN:
++#ifdef QTOPIA
++ event->event_code = EVENT_LBUTTONDOWN;
++#else
+ if (ev.button.button == SDL_BUTTON_LEFT)
+ event->event_code = EVENT_LBUTTONDOWN;
+ else if (ev.button.button == SDL_BUTTON_RIGHT)
+@@ -878,18 +881,23 @@
+ #endif
+ else
+ break;
++#endif
+
+ fillMouseEvent(*event, ev.button.x, ev.button.y);
+
+ return true;
+
+ case SDL_MOUSEBUTTONUP:
++#ifdef QTOPIA
++ event->event_code = EVENT_LBUTTONUP;
++#else
+ if (ev.button.button == SDL_BUTTON_LEFT)
+ event->event_code = EVENT_LBUTTONUP;
+ else if (ev.button.button == SDL_BUTTON_RIGHT)
+ event->event_code = EVENT_RBUTTONUP;
+ else
+ break;
++#endif
+ fillMouseEvent(*event, ev.button.x, ev.button.y);
+
+ return true;
diff --git a/scummvm/scummvm-0.6.1b/tremor.patch b/scummvm/scummvm-0.6.1b/tremor.patch
index e69de29bb2..3acf302ec8 100644
--- a/scummvm/scummvm-0.6.1b/tremor.patch
+++ b/scummvm/scummvm-0.6.1b/tremor.patch
@@ -0,0 +1,32 @@
+--- ./sound/vorbis.cpp.old 2004-05-16 04:23:59.000000000 +0930
++++ ./sound/vorbis.cpp 2004-05-16 04:24:23.000000000 +0930
+@@ -29,7 +29,7 @@
+ #include "sound/audiostream.h"
+ #include "sound/audiocd.h"
+
+-#include <vorbis/vorbisfile.h>
++#include <tremor/ivorbisfile.h>
+
+
+ AudioStream *makeVorbisStream(OggVorbis_File *file, int duration);
+--- ./configure.old 2004-05-16 04:46:47.000000000 +0930
++++ ./configure 2004-05-16 04:50:42.000000000 +0930
+@@ -560,15 +560,15 @@
+ if test "$_vorbis" = auto ; then
+ _vorbis=no
+ cat > $TMPC << EOF
+-#include <vorbis/codec.h>
++#include <tremor/ivorbiscodec.h>
+ int main(void) { vorbis_packet_blocksize(0,0); return 0; }
+ EOF
+ cc_check $LDFLAGS $CXXFLAGS $OGG_CFLAGS $OGG_LIBS $VORBIS_CFLAGS $VORBIS_LIBS \
+- -lvorbis -logg -lm && _vorbis=yes
++ -lvorbisidec -logg -lm && _vorbis=yes
+ fi
+ if test "$_vorbis" = yes ; then
+ _def_vorbis='#define USE_VORBIS'
+- LIBS="$LIBS $OGG_LIBS $VORBIS_LIBS -lvorbisfile -lvorbis -logg"
++ LIBS="$LIBS $OGG_LIBS $VORBIS_LIBS -lvorbisidec -logg"
+ INCLUDES="$INCLUDES $OGG_CFLAGS $VORBIS_CFLAGS"
+ else
+ _def_vorbis='#undef USE_VORBIS'