Merge remote branch 'upstream/master' into pegasus

Conflicts:
	video/qt_decoder.cpp

1 files changed, 95 insertions, 5 deletions

diff --git a/configure b/configure
index 1808a39daa..a0cfa76881 100755
--- a/configure
+++ b/configure
@@ -83,6 +83,7 @@ add_engine he "HE71+ games" yes
 add_engine agi "AGI" yes
 add_engine agos "AGOS" yes "agos2"
 add_engine agos2 "AGOS 2 games" yes
+add_engine cge "CGE" no
 add_engine cine "Cinematique evo 1" yes
 add_engine composer "Magic Composer" no
 add_engine cruise "Cinematique evo 2" yes
@@ -166,6 +167,7 @@ _translation=yes
 # Default platform settings
 _backend=sdl
 _16bit=auto
+_savegame_timestamp=auto
 _dynamic_modules=no
 _elf_loader=no
 _plugins_default=static
@@ -745,6 +747,7 @@ Special configuration feature:
                                            gp2xwiz for GP2X Wiz
                                            iphone for Apple iPhone
                                            linupy for Yopy PDA
+                                           maemo for Nokia Maemo
                                            motoezx for MotoEZX
                                            motomagx for MotoMAGX
                                            n64 for Nintendo 64
@@ -772,6 +775,7 @@ Optional Features:
   --default-dynamic        make plugins dynamic by default
   --disable-mt32emu        don't enable the integrated MT-32 emulator
   --disable-16bit          don't enable 16bit color support
+  --disable-savegame-timestamp don't use timestamps for blank savegame descriptions
   --disable-scalers        exclude scalers
   --disable-hq-scalers     exclude HQ2x and HQ3x scalers
   --disable-translation    don't build support for translated messages
@@ -851,6 +855,7 @@ done # for parm in ...
 for ac_option in $@; do
 	case "$ac_option" in
 	--disable-16bit)          _16bit=no       ;;
+	--disable-savegame-timestamp) _savegame_timestamp=no ;;
 	--disable-scalers)        _build_scalers=no ;;
 	--disable-hq-scalers)     _build_hq_scalers=no ;;
 	--enable-alsa)            _alsa=yes       ;;
@@ -1131,6 +1136,22 @@ linupy)
 	_host_os=linux
 	_host_cpu=arm
 	;;
+maemo)
+	_host_os=maemo
+	_host_cpu=arm
+	_host_alias=arm-linux
+
+	# The prefix is always the same on Maemo so we hardcode the default
+	# here. It is still possible to define a custom prefix which is
+	# needed when packaging the app with a user-specific app ID.
+	test "x$prefix" = xNONE && prefix=/opt/scummvm
+	# Maemo apps are installed into app-specific directories. The
+	# default directory structure of ScummVM makes no sense here so we
+	# hardcode Maemo specific directories here.
+	datarootdir='${prefix}/share'
+	datadir=/opt/scummvm/share
+	docdir='${datarootdir}/doc/scummvm'
+	;;
 motoezx)
 	_host_os=linux
 	_host_cpu=arm
@@ -1921,6 +1942,9 @@ case $_host_os in
 			CXXFLAGS="$CXXFLAGS $(getconf LFS_CFLAGS 2>/dev/null)"
 		fi
 		;;
+	maemo)
+		DEFINES="$DEFINES -DMAEMO"
+		;;
 	mingw*)
 		DEFINES="$DEFINES -DWIN32"
 		DEFINES="$DEFINES -D__USE_MINGW_ANSI_STDIO=0"
@@ -2085,6 +2109,7 @@ if test -n "$_host"; then
 			ASFLAGS="$ASFLAGS"
 			_backend="gph"
 			_build_hq_scalers=no
+			_savegame_timestamp=no
 			_vkeybd=yes
 			_seq_midi=no
 			_mt32emu=no
@@ -2175,6 +2200,7 @@ if test -n "$_host"; then
 			LDFLAGS="$LDFLAGS -static"
 			_backend="gph"
 			_build_hq_scalers=no
+			_savegame_timestamp=no
 			_vkeybd=yes
 			_seq_midi=no
 			_mt32emu=no
@@ -2194,6 +2220,7 @@ if test -n "$_host"; then
 			ASFLAGS="$ASFLAGS -mfloat-abi=soft"
 			_backend="gph"
 			_build_hq_scalers=no
+			_savegame_timestamp=no
 			_vkeybd=yes
 			_seq_midi=no
 			_mt32emu=no
@@ -2212,6 +2239,23 @@ if test -n "$_host"; then
 			_ar="m68k-atari-mint-ar cru"
 			_seq_midi=no
 			;;
+		maemo)
+			CXXFLAGS="$CXXFLAGS -Os"
+			CXXFLAGS="$CXXFLAGS -mcpu=arm926ej-s"
+			CXXFLAGS="$CXXFLAGS -fomit-frame-pointer"
+			INCLUDES="$INCLUDES -I/usr/X11R6/include"
+			LIBS="$LIBS -lpthread"
+			LIBS="$LIBS -L/usr/lib"
+			
+			_backend="maemo"
+			_vkeybd=yes
+			_build_hq_scalers=no
+			_mt32emu=no
+			_alsa=no
+			_mad=yes
+			_tremor=yes
+			_zlib=yes
+			;;
 		*mingw32*)
 			_sdlconfig=$_host-sdl-config
 			_windres=$_host-windres
@@ -2260,6 +2304,7 @@ if test -n "$_host"; then
 			_backend="n64"
 			_mt32emu=no
 			_build_scalers=no
+			_savegame_timestamp=no
 			_translation=no
 			_keymapper=no
 			_text_console=no
@@ -2462,6 +2507,9 @@ case $_backend in
 	linuxmoto)
 		DEFINES="$DEFINES -DLINUXMOTO"
 		;;
+	maemo)
+		DEFINES="$DEFINES -DMAEMO"
+		;;
 	n64)
 		INCLUDES="$INCLUDES "'-I$(N64SDK)/include'
 		INCLUDES="$INCLUDES "'-I$(N64SDK)/mips64/include'
@@ -2544,7 +2592,7 @@ MODULES="$MODULES backends/platform/$_backend"
 # Setup SDL specifics for SDL based backends
 #
 case $_backend in
-	dingux | gp2x | gph | linuxmoto | openpandora | samsungtv | sdl)
+	dingux | gp2x | gph | linuxmoto | maemo | openpandora | samsungtv | sdl)
 		find_sdlconfig
 		INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
 		LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
@@ -2567,7 +2615,7 @@ esac
 # Enable 16bit support only for backends which support it
 #
 case $_backend in
-	android | bada | dingux | dreamcast | gph | openpandora | psp | samsungtv | sdl | webos | wii)
+	android | bada | dingux | dreamcast | gph | maemo | openpandora | psp | samsungtv | sdl | webos | wii)
 		if test "$_16bit" = auto ; then
 			_16bit=yes
 		else
@@ -2579,6 +2627,26 @@ case $_backend in
 		;;
 esac
 
+#
+# Disable savegame timestamp support for backends which don't have a reliable real time clock
+#
+case $_backend in
+	gph | n64)
+		if test "$_savegame_timestamp" = auto ; then
+			_savegame_timestamp=no
+		else
+			_savegame_timestamp=yes
+		fi
+		;;
+	*)
+		if test "$_savegame_timestamp" = auto ; then
+			_savegame_timestamp=yes
+		else
+			_savegame_timestamp=no
+		fi
+		;;
+esac
+
 
 #
 # Determine whether host is POSIX compliant, or at least POSIX
@@ -2593,7 +2661,7 @@ case $_host_os in
 	amigaos* | cygwin* | dreamcast | ds | gamecube | mingw* | n64 | ps2 | ps3 | psp | wii | wince)
 		_posix=no
 		;;
-	android | beos* | bsd* | darwin* | freebsd* | gph-linux | haiku* | hpux* | iphone | irix* | linux* | mint* | netbsd* | openbsd* | solaris* | sunos* | uclinux* | webos)
+	android | beos* | bsd* | darwin* | freebsd* | gph-linux | haiku* | hpux* | iphone | irix* | linux* | maemo | mint* | netbsd* | openbsd* | solaris* | sunos* | uclinux* | webos)
 		_posix=yes
 		;;
 	os2-emx*)
@@ -2713,6 +2781,19 @@ PRE_OBJS_FLAGS  := -Wl,-export-dynamic -Wl,-whole-archive
 POST_OBJS_FLAGS := -Wl,-no-whole-archive
 '
 		;;
+	irix*)
+		_plugin_prefix="lib"
+		_plugin_suffix=".so"
+		CXXFLAGS="$CXXFLAGS -fpic"
+		LIBS="$LIBS -ldl"
+_mak_plugins='
+PLUGIN_EXTRA_DEPS =
+PLUGIN_LDFLAGS  += -shared -static-libgcc
+PRE_OBJS_FLAGS  := -Wl,-export-dynamic -Wl,-whole-archive
+POST_OBJS_FLAGS := -Wl,-no-whole-archive
+'
+		;;
+
 	linux*)
 		_plugin_prefix="lib"
 		_plugin_suffix=".so"
@@ -2822,6 +2903,11 @@ define_in_config_if_yes "$_mt32emu" 'USE_MT32EMU'
 define_in_config_if_yes "$_16bit" 'USE_RGB_COLOR'
 
 #
+# Check whether save games use the current time as default description
+#
+define_in_config_if_yes "$_savegame_timestamp" 'USE_SAVEGAME_TIMESTAMP'
+
+#
 # Check whether to enable the (hq) scalers
 #
 if test "$_build_scalers" = no ; then
@@ -3449,8 +3535,8 @@ case $_backend in
 		# Add ../plugins as a path so plugins can be found when running from a .PND.
 		DEFINES="$DEFINES -DPLUGIN_DIRECTORY=\\\"../plugins\\\""
 		;;
-	webos)
-		# The WebOS app wants the plugins in the "lib" directory
+	maemo | webos)
+		# The WebOS and Maemo apps want the plugins in the "lib" directory
 		# without a scummvm sub directory.
 		DEFINES="$DEFINES -DPLUGIN_DIRECTORY=\\\"$libdir\\\""
 		;;
@@ -3484,6 +3570,10 @@ if test "$_16bit" = yes ; then
 	echo_n ", 16bit color"
 fi
 
+if test "$_savegame_timestamp" = yes ; then
+	echo_n ", savegame timestamp"
+fi
+
 if test "$_build_scalers" = yes ; then
 	if test "$_build_hq_scalers" = yes ; then
 		echo_n ", HQ scalers"