Ticket #8778: scummvm-maemo-1.patch

scummvm-0.11

@@ -717 +717 @@
         PlayStation Portable
         RISC OS
         Symbian
-
+        Maemo (Nokia Internet tablets 770, N800, N810)
+        
 The Dreamcast port does not support The Curse of Monkey Island, nor The Dig.
 The PalmOS port does not support The Curse of Monkey Island, Beneath a Steel
 Sky, nor either Simon the Sorcerer 1 or 2. The Dig will only work on some
@@ -1768 +1769 @@
         * Please refer to:
           http://wiki.scummvm.org/index.php/Compiling_ScummVM/iPhone
 
+     Maemo:
+        * Get Scratchbox environment with Maemo 2.2 rootstrap (2.2 is for 770 and up)
+        * Install limbad, Tremor, FLAC, libmpeg2 from source
+        * patch scummvm source (some stuff is currently too dirty to be in svn directly)
+          patch -p1 < backends/platform/maemo/scummvm-0.11.0-maemo.patch
+        * go to backends/platform/maemo
+        * run 'make config'
+        * run 'make scummvm'
+        * create your debian/changelog in top directory
+        * run 'make deb' in backends/platform/maemo 
 
 ------------------------------------------------------------------------
 Good Luck and Happy Adventuring!

scummvm-0.11

@@ -14 +14 @@
 
  New Ports:
    - Added iPhone port.
+   - Added Maemo port for Nokia Internet tablets.
  
  General:
    - Added ARM assembly routines for code in the sound mixer and SCUMM

dists/maemo/scummvm.desktop

@@ +1 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Name=ScummVM
+Exec=/usr/games/scummvm
+Icon=scummvm
+X-Icon-path=/usr/share/icons
+X-Window-Icon=scummvm
+X-HildonDesk-ShowInToolbar=true
+X-Osso-Type=application/x-executable

dists/maemo/scummvm.wrapper

@@ +1 @@
+#!/bin/sh
+# wrapper for proper WM_CLASS name in SDL apps (needed for icon in taskbar)
+#BASEDIR=`dirname $0`
+BASENAME=`basename $0`
+export SDL_VIDEO_X11_WMCLASS=${BASENAME}
+exec ${0}.bin "$@"

scummvm-0.11

@@ -1332 +1332 @@
 fi
 if test "$_flac" = yes ; then
         _def_flac='#define USE_FLAC'
-        LIBS="$LIBS $FLAC_LIBS $OGG_LIBS -lFLAC -logg"
+        if test "$_ogg" = yes ; then
+                LIBS="$LIBS $FLAC_LIBS $OGG_LIBS -lFLAC -logg"
+        else
+                LIBS="$LIBS $FLAC_LIBS -lFLAC"
+        fi
         INCLUDES="$INCLUDES $FLAC_CFLAGS"
         add_to_config_mk_if_no no 'USE_FLAC = 1'
 else

backends/platform/maemo/Makefile

@@ -1 @@
-# ScummVM Maemo MakeFile
-# $URL: https://svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/backends/platform/maemo/Makefile $
-# $Id: Makefile 24008 2006-09-29 08:14:27Z sev $
-
-#control build
-DISABLE_HQ_SCALERS = true
-
-#DISABLE_SCUMM = 1
-#DISABLE_HE = 1
-DISABLE_AGOS = 1
-DISABLE_SKY = 1
-DISABLE_SWORD1 = 1
-DISABLE_SWORD2 = 1
-DISABLE_QUEEN = 1
-DISABLE_KYRA = 1
-DISABLE_SAGA = 1
-DISABLE_GOB = 1
-DISABLE_LURE = 1
-DISABLE_CINE = 1
-DISABLE_AGI = 1
-
-srcdir = ../../..
-VPATH = $(srcdir)
-
-CXX := g++
-EXECUTABLE  := scummvm
-
-INCDIR = $(srcdir)/ . $(srcdir)/engines/
-
-CXXFLAGS := -g -ansi -W -Wno-unused-parameter
-CXXFLAGS += `pkg-config --cflags gconf-2.0 hildon-libs gtk+-2.0 libosso gdk-2.0`
-CXXFLAGS += $(addprefix -I,$(INCDIR)) -I. -Wall $(CXXFLAGS)
-CXXFLAGS += -O -Wuninitialized
-CXXFLAGS += -Wno-long-long -Wno-multichar -Wno-unknown-pragmas
-# Even more warnings...
-CXXFLAGS += -pedantic -Wpointer-arith -Wcast-qual -Wconversion
-CXXFLAGS += -Wshadow -Wimplicit -Wundef -Wnon-virtual-dtor
-CXXFLAGS += -Wno-reorder -Wwrite-strings -fcheck-new
-
-LIBS     += -lz -L/usr/lib -lSDL -lpthread -lXsp -losso
-LIBS     += `pkg-config --libs gconf-2.0 hildon-libs gtk+-2.0 libosso gdk-2.0`
-INCLUDES += -I/usr/include/SDL -D_REENTRANT -I/usr/X11R6/include
-OBJS     += 
-DEFINES  += -DUNIX -DNONSTANDARD_PORT -D__MAEMO__
-LDFLAGS  += 
-
-RANLIB  := ranlib
-INSTALL := install
-AR      := ar cru
-MKDIR   := mkdir -p
-ECHO    := printf
-CAT     := cat
-RM      := rm -f
-RM_REC  := rm -f -r
-CP      := cp
-
-OBJS := main.o maemo-sdl.o
-
-MODULE_DIRS += .
-
-
-BACKEND := sdl
-MODULES +=  backends/platform/sdl base
-MODULE_DIRS += .
+.PHONY: all
 
-HAVE_GCC3 = 1
+all:
+
+
+SRCDIR = ../../..
+
+config:
+        cd $(SRCDIR) ; CXXFLAGS="-Os -mcpu=arm926ej-s -fomit-frame-pointer -DMAEMO_SDL" ./configure  --host=arm-linux --prefix=/usr --disable-debug --disable-mt32emu  --disable-hq-scalers --with-tremor-prefix=/usr --enable-tremor --with-zlib-prefix=/usr --enable-zlib --with-mad-prefix=/usr --enable-mad --enable-flac --disable-fluidsynth
+
+scummvm:
+        cd $(SRCDIR) ; make
+        echo "If there is compiler crash (in Kyra engine) then cd ../../.. and copy/run last line with -O3 instead of -Os and re-run make"
+#       cp $(SRCDIR)/scummvm .
+
+
+deb: $(SRCDIR)/scummvm
+        cd $(SRCDIR) ; dpkg-buildpackage -rfakeroot -b -nc
 
-include $(srcdir)/Makefile.common