From 709c4d66e0b107ca606941b988bad717c0b45d9b Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Tue, 17 Mar 2009 14:32:59 -0400 Subject: rename packages/ to recipes/ per earlier agreement See links below for more details: http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326 http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816 Signed-off-by: Denys Dmytriyenko Acked-by: Mike Westerhof Acked-by: Philip Balister Acked-by: Khem Raj Acked-by: Marcin Juszkiewicz Acked-by: Koen Kooi Acked-by: Frans Meulenbroeks --- packages/scummvm/files/gcc-4.x.x-accept.patch | 11 -------- packages/scummvm/files/makefile-nostrip.patch | 13 --------- packages/scummvm/files/mouse.patch | 36 ------------------------ packages/scummvm/files/no-strip.patch | 22 --------------- packages/scummvm/files/om-gta01/openmoko-scummvm | 19 ------------- packages/scummvm/files/openmoko/openmoko-scummvm | 19 ------------- packages/scummvm/files/openmoko/scummvm.desktop | 12 -------- packages/scummvm/files/scummvm-targetcheck.patch | 17 ----------- packages/scummvm/files/scummvm.desktop | 12 -------- packages/scummvm/files/sh3-arch-0.9.0+.patch | 18 ------------ packages/scummvm/files/sh3-linux-new-arch.patch | 18 ------------ packages/scummvm/files/tail-obselete-fix.patch | 11 -------- packages/scummvm/files/tremor.patch | 32 --------------------- 13 files changed, 240 deletions(-) delete mode 100644 packages/scummvm/files/gcc-4.x.x-accept.patch delete mode 100644 packages/scummvm/files/makefile-nostrip.patch delete mode 100644 packages/scummvm/files/mouse.patch delete mode 100644 packages/scummvm/files/no-strip.patch delete mode 100755 packages/scummvm/files/om-gta01/openmoko-scummvm delete mode 100644 packages/scummvm/files/openmoko/openmoko-scummvm delete mode 100644 packages/scummvm/files/openmoko/scummvm.desktop delete mode 100644 packages/scummvm/files/scummvm-targetcheck.patch delete mode 100644 packages/scummvm/files/scummvm.desktop delete mode 100644 packages/scummvm/files/sh3-arch-0.9.0+.patch delete mode 100644 packages/scummvm/files/sh3-linux-new-arch.patch delete mode 100644 packages/scummvm/files/tail-obselete-fix.patch delete mode 100644 packages/scummvm/files/tremor.patch (limited to 'packages/scummvm/files') diff --git a/packages/scummvm/files/gcc-4.x.x-accept.patch b/packages/scummvm/files/gcc-4.x.x-accept.patch deleted file mode 100644 index f69eb0f229..0000000000 --- a/packages/scummvm/files/gcc-4.x.x-accept.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- scummvm-0.6.1b/configure_orig 2006-07-01 16:42:17.000000000 +0000 -+++ scummvm-0.6.1b/configure 2006-07-01 16:48:04.000000000 +0000 -@@ -362,7 +362,7 @@ - fi - - case $cxx_version in -- 2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9]) -+ 2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9]|4.[0-9].[0-9]) - _cxx_major=`echo $cxx_version | cut -d '.' -f 1` - _cxx_minor=`echo $cxx_version | cut -d '.' -f 2` - cxx_version="$cxx_version, ok" diff --git a/packages/scummvm/files/makefile-nostrip.patch b/packages/scummvm/files/makefile-nostrip.patch deleted file mode 100644 index 7f9c8b49d2..0000000000 --- a/packages/scummvm/files/makefile-nostrip.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: scummvm-0.9.1/Makefile -=================================================================== ---- scummvm-0.9.1.orig/Makefile 2007-08-18 13:02:07.000000000 +0200 -+++ scummvm-0.9.1/Makefile 2007-08-18 13:02:24.000000000 +0200 -@@ -45,7 +45,7 @@ - - install: all - $(INSTALL) -d "$(DESTDIR)$(BINDIR)" -- $(INSTALL) -c -s -m 755 "$(srcdir)/scummvm$(EXEEXT)" "$(DESTDIR)$(BINDIR)/scummvm$(EXEEXT)" -+ $(INSTALL) -c -m 755 "$(srcdir)/scummvm$(EXEEXT)" "$(DESTDIR)$(BINDIR)/scummvm$(EXEEXT)" - $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man6/" - $(INSTALL) -c -m 644 "$(srcdir)/dists/scummvm.6" "$(DESTDIR)$(MANDIR)/man6/scummvm.6" - $(INSTALL) -d "$(DESTDIR)$(PREFIX)/share/pixmaps/" diff --git a/packages/scummvm/files/mouse.patch b/packages/scummvm/files/mouse.patch deleted file mode 100644 index 1697ac811d..0000000000 --- a/packages/scummvm/files/mouse.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- ./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/packages/scummvm/files/no-strip.patch b/packages/scummvm/files/no-strip.patch deleted file mode 100644 index 4df1283263..0000000000 --- a/packages/scummvm/files/no-strip.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: scummvm-0.12.0/ports.mk -=================================================================== ---- scummvm-0.12.0.orig/ports.mk -+++ scummvm-0.12.0/ports.mk -@@ -10,7 +10,7 @@ - # - install: all - $(INSTALL) -d "$(DESTDIR)$(BINDIR)" -- $(INSTALL) -c -s -m 755 "$(srcdir)/scummvm$(EXEEXT)" "$(DESTDIR)$(BINDIR)/scummvm$(EXEEXT)" -+ $(INSTALL) -c -m 755 "$(srcdir)/scummvm$(EXEEXT)" "$(DESTDIR)$(BINDIR)/scummvm$(EXEEXT)" - $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man6/" - $(INSTALL) -c -m 644 "$(srcdir)/dists/scummvm.6" "$(DESTDIR)$(MANDIR)/man6/scummvm.6" - $(INSTALL) -d "$(DESTDIR)$(PREFIX)/share/pixmaps/" -@@ -21,7 +21,7 @@ install: all - $(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) "$(DESTDIR)$(DATADIR)/scummvm/" - ifdef DYNAMIC_MODULES - $(INSTALL) -d "$(DESTDIR)$(LIBDIR)/scummvm/" -- $(INSTALL) -c -s -m 644 $(DIST_FILES_PLUGINS) "$(DESTDIR)$(LIBDIR)/scummvm/" -+ $(INSTALL) -c -m 644 $(DIST_FILES_PLUGINS) "$(DESTDIR)$(LIBDIR)/scummvm/" - endif - - uninstall: diff --git a/packages/scummvm/files/om-gta01/openmoko-scummvm b/packages/scummvm/files/om-gta01/openmoko-scummvm deleted file mode 100755 index e8c5cb3984..0000000000 --- a/packages/scummvm/files/om-gta01/openmoko-scummvm +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -# Save current AUX Key mapping -SAVE_KEY="$(xmodmap -pke | grep 'keycode 8')" - -# Map AUX Key to F5 -xmodmap -e "keycode 8 = F5" - -# Turn LCD feft -xrandr -o left - -# Start the scummvm in fullscreen mode -scummvm --fullscreen --themepath=/usr/share/scummvm/ - -# Turn LCD normal -xrandr -o normal - -# Restore the AUX Key mapping -xmodmap -e "$SAVE_KEY" diff --git a/packages/scummvm/files/openmoko/openmoko-scummvm b/packages/scummvm/files/openmoko/openmoko-scummvm deleted file mode 100644 index 58eb2bbded..0000000000 --- a/packages/scummvm/files/openmoko/openmoko-scummvm +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -# Save current AUX Key mapping -SAVE_KEY="$(xmodmap -pke | grep 'keycode 177')" - -# Map AUX Key to F5 -xmodmap -e "keycode 177 = F5" - -# Turn LCD feft -xrandr -o left - -# Start the scummvm in fullscreen mode -scummvm --fullscreen --themepath=/usr/share/scummvm/ - -# Turn LCD normal -xrandr -o normal - -# Restore the AUX Key mapping -xmodmap -e "$SAVE_KEY" diff --git a/packages/scummvm/files/openmoko/scummvm.desktop b/packages/scummvm/files/openmoko/scummvm.desktop deleted file mode 100644 index 96c025050e..0000000000 --- a/packages/scummvm/files/openmoko/scummvm.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=ScummVM -Name[pl]=ScummVM -Comment=Interpreter for several adventure games -Comment[pl]=Interpreter graficznych gier przygodowych -Exec=openmoko-scummvm -Icon=scummvm.xpm -Terminal=false -Type=Application -Categories=Application;Game;AdventureGame; -StartupNotify=false diff --git a/packages/scummvm/files/scummvm-targetcheck.patch b/packages/scummvm/files/scummvm-targetcheck.patch deleted file mode 100644 index 6f245294b4..0000000000 --- a/packages/scummvm/files/scummvm-targetcheck.patch +++ /dev/null @@ -1,17 +0,0 @@ -upstream: http://sourceforge.net/tracker/index.php?func=detail&aid=1959138&group_id=37116&atid=418820 -status: accepted in revision 31912 (less than an hour for turnaround, fantastic!) -origin: adapted from http://bugs.openembedded.net/show_bug.cgi?id=3522 -comment: the strict check for targets needs to be relaxed to compile for some of OE targets - -diff -uNr scummvm-0.9.1.vanilla/configure scummvm-0.9.1/configure ---- scummvm-0.9.1.vanilla/configure 2007-12-23 00:08:23.000000000 +0100 -+++ scummvm-0.9.1/configure 2007-12-23 00:08:35.000000000 +0100 -@@ -763,7 +763,7 @@ - type_2_byte='short' - type_4_byte='int' - ;; -- arm-linux|arm-*-linux-gnueabi) -+ arm-linux|arm*-linux-gnueabi|arm-*-linux|*-angstrom-linux) - echo "Cross-compiling to $_host, forcing endianness, alignment and type sizes" - DEFINES="$DEFINES -DUNIX" - #not true for all ARM systems, but the interesting ones are all LE. Most (if not all) BE arm devices don't have a screen diff --git a/packages/scummvm/files/scummvm.desktop b/packages/scummvm/files/scummvm.desktop deleted file mode 100644 index 5a0f88b355..0000000000 --- a/packages/scummvm/files/scummvm.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=ScummVM -Name[pl]=ScummVM -Comment=Interpreter for several adventure games -Comment[pl]=Interpreter graficznych gier przygodowych -Exec=scummvm -Icon=scummvm.xpm -Terminal=false -Type=Application -Categories=Application;Game;AdventureGame; -StartupNotify=false diff --git a/packages/scummvm/files/sh3-arch-0.9.0+.patch b/packages/scummvm/files/sh3-arch-0.9.0+.patch deleted file mode 100644 index 3cd0505654..0000000000 --- a/packages/scummvm/files/sh3-arch-0.9.0+.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- scummvm-0.9.0/configure_orig 2006-07-01 18:16:04.000000000 +0000 -+++ scummvm-0.9.0/configure 2006-07-01 18:19:09.000000000 +0000 -@@ -762,6 +762,15 @@ - type_2_byte='short' - type_4_byte='int' - ;; -+ sh3-linux) -+ echo "Cross-compiling to $_host, forcing endianness, aligment and type sizes" -+ DEFINES="$DEFINES -DUNIX" -+ _def_endianness='#define SCUMM_LITTLE_ENDIAN' -+ _def_align='#define SCUMM_NEED_ALIGMENT' -+ type_1_byte='char' -+ type_2_byte='short' -+ type_4_byte='int' -+ ;; - ppc-amigaos) - echo "Cross-compiling to $_host, forcing endianness, alignment and type sizes" - _def_endianness='#define SCUMM_BIG_ENDIAN' diff --git a/packages/scummvm/files/sh3-linux-new-arch.patch b/packages/scummvm/files/sh3-linux-new-arch.patch deleted file mode 100644 index b59d727458..0000000000 --- a/packages/scummvm/files/sh3-linux-new-arch.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- scummvm-0.6.1b/configure_orig 2006-07-01 17:15:30.000000000 +0000 -+++ scummvm-0.6.1b/configure 2006-07-01 17:19:41.000000000 +0000 -@@ -462,6 +462,15 @@ - type_2_byte='short' - type_4_byte='int' - ;; -+ sh3-linux) -+ echo "Crosscompiling to $_host, forcing endianess, aligment and type sizes" -+ DEFINES="$DEFINES -DUNIX" -+ _def_endianess='#define SCUMM_LITTLE_ENDIAN' -+ _def_align='#define SCUMM_NEED_ALiGMENT' -+ type_1_byte='char' -+ type_2_byte='short' -+ type_4_byte='int' -+ ;; - *) - echo "Cross-compiling to unknown target, please add your target to configure." - exit 1 diff --git a/packages/scummvm/files/tail-obselete-fix.patch b/packages/scummvm/files/tail-obselete-fix.patch deleted file mode 100644 index 1737133e25..0000000000 --- a/packages/scummvm/files/tail-obselete-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- scummvm-0.6.1b/configure_orig 2006-07-01 16:42:17.000000000 +0000 -+++ scummvm-0.6.1b/configure 2006-07-01 16:43:12.000000000 +0000 -@@ -355,7 +355,7 @@ - - echocheck "compiler version" - --cxx_name=`( $cc -v ) 2>&1 | tail -1 | cut -d ' ' -f 1` -+cxx_name=`( $cc -v ) 2>&1 | tail -n 1 | cut -d ' ' -f 1` - cxx_version=`( $CXX -dumpversion ) 2>&1` - if test "$?" -gt 0; then - cxx_version="not found" diff --git a/packages/scummvm/files/tremor.patch b/packages/scummvm/files/tremor.patch deleted file mode 100644 index 3acf302ec8..0000000000 --- a/packages/scummvm/files/tremor.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- ./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 -+#include - - - 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 -+#include - 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' -- cgit v1.2.3