[csw-devel] SF.net SVN: gar:[21225] csw/mgar/pkg/scummvm/trunk

[lblume at users.sourceforge.net]

Revision: 21225
          http://gar.svn.sourceforge.net/gar/?rev=21225&view=rev
Author:   lblume
Date:     2013-05-30 09:47:56 +0000 (Thu, 30 May 2013)
Log Message:
-----------
scummvm/trunk: Bump to version 1.6.0; add fluidsynth support; some minor fixes

Modified Paths:
--------------
    csw/mgar/pkg/scummvm/trunk/Makefile
    csw/mgar/pkg/scummvm/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/scummvm/trunk/files/
    csw/mgar/pkg/scummvm/trunk/files/0001-redefining-FILE.patch
    csw/mgar/pkg/scummvm/trunk/files/0002-configure-really-is-a-bash-script.patch

Modified: csw/mgar/pkg/scummvm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/scummvm/trunk/Makefile	2013-05-29 10:55:08 UTC (rev 21224)
+++ csw/mgar/pkg/scummvm/trunk/Makefile	2013-05-30 09:47:56 UTC (rev 21225)
@@ -1,5 +1,5 @@
-NAME = scummvm
-VERSION = 1.4.0
+NAME    = scummvm
+VERSION = 1.6.0
 GARTYPE = v2
 
 DESCRIPTION = Virtual machine for several classic graphical point-and-click adventure games
@@ -20,7 +20,15 @@
 RUNTIME_DEP_PKGS_CSWscummvm += CSWlibmad0
 RUNTIME_DEP_PKGS_CSWscummvm += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWscummvm += CSWlibvorbisfile3
+RUNTIME_DEP_PKGS_CSWscummvm += CSWlibfluidsynth1
 
+BUILD64=1
+
+BUILD_DEP_PKGS_CSWscummvm += CSWlibsdl-dev
+BUILD_DEP_PKGS_CSWscummvm += CSWfluidsynth-dev
+
+PATCHFILES += 0001-redefining-FILE.patch
+PATCHFILES += 0002-configure-really-is-a-bash-script.patch
 # Don't know about these, investigate later
 CHECKPKG_OVERRIDES_CSWscummvm += file-with-bad-content|/usr/local|root/opt/csw/bin/scummvm
 CHECKPKG_OVERRIDES_CSWscummvm += file-with-bad-content|/usr/local|root/opt/csw/share/man/man6/scummvm.6
@@ -33,7 +41,10 @@
 CONFIGURE_ARGS += --mandir=$(mandir)
 CONFIGURE_ARGS += --datadir=$(datadir)
 CONFIGURE_ARGS += --libdir=$(libdir)
-CONFIGURE_ARGS += --enable-all-engines
+CONFIGURE_ARGS += --enable-release
+CONFIGURE_ARGS += --enable-plugins
+CONFIGURE_ARGS += --default-dynamic
+CONFIGURE_ARGS += --enable-updates
 
 TEST_TARGET = test
 

Modified: csw/mgar/pkg/scummvm/trunk/checksums
===================================================================
--- csw/mgar/pkg/scummvm/trunk/checksums	2013-05-29 10:55:08 UTC (rev 21224)
+++ csw/mgar/pkg/scummvm/trunk/checksums	2013-05-30 09:47:56 UTC (rev 21225)
@@ -1 +1 @@
-361000b78ebf0d0f449e98238d677be1  scummvm-1.4.0.tar.bz2
+473c151ff44e3db7b603ecacd800a0d2  scummvm-1.6.0.tar.bz2

Added: csw/mgar/pkg/scummvm/trunk/files/0001-redefining-FILE.patch
===================================================================
--- csw/mgar/pkg/scummvm/trunk/files/0001-redefining-FILE.patch	                        (rev 0)
+++ csw/mgar/pkg/scummvm/trunk/files/0001-redefining-FILE.patch	2013-05-30 09:47:56 UTC (rev 21225)
@@ -0,0 +1,18 @@
+--- ./backends/platform/sdl/sdl-sys.h	Sun May 26 22:21:47 2013
++++ ./backends/platform/sdl/sdl-sys.h	Wed May 29 18:04:58 2013
+@@ -34,10 +34,15 @@
+ // Remove FILE override from common/forbidden.h, and replace
+ // it with an alternate slightly less unfriendly override.
+ #if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_FILE)
++#if defined(__sun)
+ #undef FILE
++typedef __FILE FILE;
++#else
++#undef FILE
+ typedef struct { int FAKE; } FAKE_FILE;
+ #define FILE FAKE_FILE
+ #endif
++#endif
+ 
+ #if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_strcasecmp)
+ #undef strcasecmp

Added: csw/mgar/pkg/scummvm/trunk/files/0002-configure-really-is-a-bash-script.patch
===================================================================
--- csw/mgar/pkg/scummvm/trunk/files/0002-configure-really-is-a-bash-script.patch	                        (rev 0)
+++ csw/mgar/pkg/scummvm/trunk/files/0002-configure-really-is-a-bash-script.patch	2013-05-30 09:47:56 UTC (rev 21225)
@@ -0,0 +1,8 @@
+--- ./configure.original	Mon May 27 21:52:21 2013
++++ ./configure	Mon May 27 21:51:17 2013
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ #
+ # configure -- custom configure script for ScummVM.
+ #

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.