Update scummvm to 1.6.0, also make it a packaged app.

libraries/SDL/nacl.patch

 diff --git a/Makefile.in b/Makefile.in
 index e29dc6d..99321ee 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -42,7 +42,7 @@ SDLMAIN_OBJECTS = @SDLMAIN_OBJECTS@
  
  DIST = acinclude autogen.sh Borland.html Borland.zip BUGS build-scripts configure configure.in COPYING CREDITS CWprojects.sea.bin docs docs.html include INSTALL Makefile.dc Makefile.minimal Makefile.in MPWmake.sea.bin README* sdl-config.in sdl.m4 sdl.pc.in SDL.qpg.in SDL.spec SDL.spec.in src test TODO VisualCE.zip VisualC.html VisualC.zip Watcom-OS2.zip Watcom-Win32.zip symbian.zip WhatsNew Xcode.tar.gz
  
 -HDRS = SDL.h SDL_active.h SDL_audio.h SDL_byteorder.h SDL_cdrom.h SDL_cpuinfo.h SDL_endian.h SDL_error.h SDL_events.h SDL_getenv.h SDL_joystick.h SDL_keyboard.h SDL_keysym.h SDL_loadso.h SDL_main.h SDL_mouse.h SDL_mutex.h SDL_name.h SDL_opengl.h SDL_platform.h SDL_quit.h SDL_rwops.h SDL_stdinc.h SDL_syswm.h SDL_thread.h SDL_timer.h SDL_types.h SDL_version.h SDL_video.h begin_code.h close_code.h
 +HDRS = SDL.h SDL_active.h SDL_audio.h SDL_byteorder.h SDL_cdrom.h SDL_cpuinfo.h SDL_endian.h SDL_error.h SDL_events.h SDL_getenv.h SDL_joystick.h SDL_keyboard.h SDL_keysym.h SDL_loadso.h SDL_main.h SDL_mouse.h SDL_mutex.h SDL_name.h SDL_nacl.h SDL_opengl.h SDL_platform.h SDL_quit.h SDL_rwops.h SDL_stdinc.h SDL_syswm.h SDL_thread.h SDL_timer.h SDL_types.h SDL_version.h SDL_video.h begin_code.h close_code.h
@@ skipping 32 matching lines @@
                         ;;
                 esac
                 ;;
 +       -nacl*)
 +               os=-nacl
 +               ;;
         -nto-qnx*)
                 ;;
         -nto*)
 diff --git a/configure.in b/configure.in
-index a7e9b18..ca1de7e 100644
+index a7e9b18..8788acd 100644
 --- a/configure.in
 +++ b/configure.in
 @@ -885,6 +885,48 @@ CheckVisibilityHidden()
      fi
  }
  
 +dnl Check for Native Client stuff
 +CheckNativeClient()
 +{
 +    AC_ARG_ENABLE(naclvideo,
 +AC_HELP_STRING([--enable-naclvideo], [enable the nacl video driver [[default=yes]]]),
 +                  , enable_naclvideo=yes)
 +    if test x$enable_video = xyes -a x$enable_naclvideo = xyes; then
 +        AC_DEFINE(SDL_VIDEO_DRIVER_NACL)
 +        SOURCES="$SOURCES $srcdir/src/video/nacl/*.cc"
-+        SDL_LIBS="-Wl,--start-group -lSDLmain $SDL_LIBS -lppapi -lppapi_cpp -lppapi_gles2 -Wl,--end-group -lstdc++"
++        SDL_LIBS="-Wl,--start-group -lSDLmain -lnacl_io $SDL_LIBS -lppapi -lppapi_cpp -lppapi_gles2 -Wl,--end-group -lstdc++"

[Sam Clegg, 2013/10/26 01:20:52]

I'm afraid you can't do this just yet because there are
still some SDL ports that use nacl-mounts.

 +    fi
 +
 +    AC_ARG_ENABLE(naclaudio,
 +AC_HELP_STRING([--enable-naclaudio], [enable the nacl audio driver [[default=yes]]]),
 +                  , enable_naclaudio=yes)
 +    if test x$enable_audio = xyes -a x$enable_naclaudio = xyes; then
 +        AC_DEFINE(SDL_AUDIO_DRIVER_NACL)
 +        SOURCES="$SOURCES $srcdir/src/audio/nacl/*.cc"
 +    fi
 +}
@@ skipping 1487 matching lines @@
  
 +case "$host" in
 +    *-*-nacl*)
 +        LIBS="$LIBS -lnacl_io -lstdc++ -lc -lnosys"
 +        ;;
 +esac
 +
  dnl Check for X11 path, needed for OpenGL on some systems
  AC_PATH_X
  if test x$have_x = xyes; then