- update to 1.4.1

OBS-URL: https://build.opensuse.org/package/show/games/scummvm?expand=0&rev=24

scummvm-1.3.1.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b25dc7f7e26ed6df3d901043efb2337a525df4dd3cd1589e772733cfa90037f6
-size 10479934

scummvm-1.4.1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fa0a7f0d59524611be0c5b9be9ac7f8e7a72bab1826732e056f88332aa3139da
+size 15703475

scummvm-nobuildtime.patch

@@ -1,17 +0,0 @@
-Index: base/version.cpp
-===================================================================
---- base/version.cpp.orig
-+++ base/version.cpp
-@@ -59,9 +59,9 @@
-  * to properly work in exports (i.e. release tar balls etc.).
-  */
- const char *gScummVMVersion = SCUMMVM_VERSION;
--const char *gScummVMBuildDate = __DATE__ " " __TIME__;
--const char *gScummVMVersionDate = SCUMMVM_VERSION " (" __DATE__ " " __TIME__ ")";
--const char *gScummVMFullVersion = "ScummVM " SCUMMVM_VERSION " (" __DATE__ " " __TIME__ ")";
-+const char *gScummVMBuildDate = "";
-+const char *gScummVMVersionDate = SCUMMVM_VERSION;
-+const char *gScummVMFullVersion = "ScummVM " SCUMMVM_VERSION;
- const char *gScummVMFeatures = ""
- #ifdef USE_TREMOR
- #ifdef USE_TREMOLO

scummvm-nostrip.patch

@@ -2,7 +2,7 @@ Index: ports.mk
 ===================================================================
 --- ports.mk.orig
 +++ ports.mk
-@@ -10,24 +10,27 @@
+@@ -8,24 +8,27 @@
  #
  install:
  	$(INSTALL) -d "$(DESTDIR)$(bindir)"

scummvm-underlinking.patch

@@ -2,7 +2,7 @@ Index: rules.mk
 ===================================================================
 --- rules.mk.orig
 +++ rules.mk
-@@ -43,7 +43,7 @@ ifdef PLUGIN
+@@ -42,7 +42,7 @@ ifdef PLUGIN
  PLUGIN-$(MODULE) := plugins/$(PLUGIN_PREFIX)$(notdir $(MODULE))$(PLUGIN_SUFFIX)
  $(PLUGIN-$(MODULE)): $(MODULE_OBJS-$(MODULE)) $(PLUGIN_EXTRA_DEPS)
  	$(QUIET)$(MKDIR) plugins

scummvm.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Mar 30 13:56:31 UTC 2012 - reddwarf@opensuse.org
+
+- update to 1.4.1
+
 -------------------------------------------------------------------
 Thu Sep  1 08:35:15 UTC 2011 - reddwarf@opensuse.org
 

scummvm.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package scummvm
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,25 +16,23 @@
 #
 
 
-
-%bcond_with mpeg2
+%bcond_with aac
 %bcond_with mp3
 
 Name:           scummvm
-Version:        1.3.1
+Version:        1.4.1
 Release:        0
-License:        GPLv2+, LGPLv2.1+, BSD
 Summary:        Interpreter for several adventure games
-Url:            http://www.scummvm.org
+License:        GPLv2+, LGPLv2.1+, BSD
 Group:          Amusements/Games/Other
-Source:         http://sourceforge.net/projects/scummvm/files/scummvm/%{version}/scummvm-%{version}.tar.bz2
+Url:            http://www.scummvm.org
+Source0:        http://downloads.sourceforge.net/project/scummvm/scummvm/%{version}/scummvm-%{version}.tar.bz2
 Patch0:         %{name}-nostrip.patch
-Patch1:         %{name}-nobuildtime.patch
 # It's an ugly workaround but makes the sword25 engine plugin link against
 # png/theora, and since we use --as-needed there are no real problems. Once the
 # engine passes to the main binary the problem will dissapear.
 # It could also be good to make it use the system's Lua.
-Patch2:         %{name}-1.3.1-underlinking.patch
+Patch1:         %{name}-underlinking.patch
 BuildRequires:  gcc-c++
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  update-desktop-files
@@ -46,8 +44,8 @@ BuildRequires:  pkgconfig(sdl) >= 1.2.2
 BuildRequires:  pkgconfig(theoradec) >= 1.0
 BuildRequires:  pkgconfig(vorbisfile)
 BuildRequires:  pkgconfig(zlib)
-%if %{with mpeg2}
-BuildRequires:  pkgconfig(libmpeg2) >= 0.3.2
+%if %{with aac}
+BuildRequires:  libfaad-devel
 %endif
 %if %{with mp3}
 BuildRequires:  pkgconfig(mad)
@@ -81,7 +79,10 @@ These engines are in a worse state, but allow to play extra games.
 %setup -q
 %patch0
 %patch1
-%patch2
+FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
+sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" base/version.cpp backends/plugins/elf/version.cpp
+FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M:%%S')
+sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/" base/version.cpp backends/plugins/elf/version.cpp
 
 %build
 # No rpm configure because scummvm's configure isn't a real configure and thus
@@ -92,13 +93,14 @@ CXXFLAGS="%{optflags}" ; export CXXFLAGS ; \
             --datarootdir=%{_datadir} \
             --mandir=%{_mandir} \
             --libdir=%{_libdir} \
-            %{?with_mpeg2:--enable-mpeg2} \
             --enable-verbose-build \
             --enable-plugins \
-            --enable-m4=dynamic \
-            --enable-lastexpress=dynamic \
-            --enable-sword25=dynamic \
-            --enable-tsage=dynamic
+            --enable-engine-dynamic=cge \
+            --enable-engine-dynamic=composer \
+            --enable-engine-dynamic=dreamweb \
+            --enable-engine-dynamic=lastexpress \
+            --enable-engine-dynamic=m4 \
+            --enable-engine-dynamic=sword25
 # --docdir=%%{_docdir}/%%{name}
 # Subengines are not included even as dynamic since I don't want to touch the main engines
 make %{?_smp_mflags}