commit scummvm

28 May 2006

Hello community,

here is the log from the commit of package scummvm
checked in at Mon May 29 01:21:18 CEST 2006.

--------

--- scummvm/scummvm.changes	2006-02-06 17:39:54.000000000 +0100
+++ scummvm/scummvm.changes	2006-05-28 12:23:21.000000000 +0200
@@ -1,0 +2,7 @@
+Sun May 28 12:20:44 CEST 2006 - sndirsch@suse.de
+
+- updated to current CVS (2006-05-28)
+  * adds eperimental support for lure, cine, agi *and* gob2 (at 
+    least the intro works now including sound)
+
+-------------------------------------------------------------------

Old:
----
  scummvm-0.8.2.tar.bz2
  scummvm-tools-060129.diff
  scummvm-tools-060129.tar.bz2

New:
----
  scummvm-060528.tar.bz2
  scummvm-tools-060528.diff
  scummvm-tools-060528.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ scummvm.spec ++++++
--- /var/tmp/diff_new_pack.K4deA6/_old	2006-05-29 01:20:37.000000000 +0200
+++ /var/tmp/diff_new_pack.K4deA6/_new	2006-05-29 01:20:37.000000000 +0200
@@ -1,29 +1,29 @@
 #
-# spec file for package scummvm (Version 0.8.2)
+# spec file for package scummvm (Version 060528)
 #
 # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
-# Please submit bugfixes or comments via http://bugs.opensuse.org
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 # norootforbuild
 
 Name:         scummvm
-BuildRequires: SDL-devel flac-devel fluidsynth-devel gcc-c++ libvorbis libvorbis-devel readline-devel
+BuildRequires:  SDL-devel flac-devel fluidsynth-devel gcc-c++ libpng-devel libsndfile-devel libvorbis libvorbis-devel readline-devel
 URL:          http://scummvm.sourceforge.net/
 License:      GPL
 Group:        Amusements/Games/Other
 Autoreqprov:  on
-Version:      0.8.2
+Version:        060528
 Release:      1
 Summary:      Interpreter for LucasArts games
 Source:       %name-%version.tar.bz2
-Source1:      %name-tools-060129.tar.bz2
+Source1:        %name-tools-060528.tar.bz2
 Source2:      README.SUSE
 Patch:        %name-cflags.diff
-Patch1:       %name-tools-060129.diff
+Patch1:         %name-tools-060528.diff
 Patch3:       gob2.diff
 Patch4:       %name.diff
 Patch5:       %name-strip.diff
@@ -60,17 +60,17 @@
     Vincent Hamm
 
 %prep
-%setup -n %name-%version -b1
+%setup -n %name/trunk -b1
 %patch
-pushd ../tools
+pushd ../../tools/trunk
 %patch1
 popd
-#%patch3
+%patch3
 %patch4
 %patch5
 
 %build
-pushd ../tools
+pushd ../../tools/trunk
 %ifarch ppc ppc64 s390 s390x
   export CFLAGS="$RPM_OPT_FLAGS -DSCUMM_BIG_ENDIAN"
 %else
@@ -84,13 +84,15 @@
 ./configure --prefix=/usr \
             --bindir=/usr/games \
             --mandir=%_mandir \
-            --enable-kyra
+            --enable-lure \
+            --enable-cine \
+            --enable-agi
 make
 
 %install
-pushd ../tools
+pushd ../../tools/trunk
   make install DESTDIR=$RPM_BUILD_ROOT
-  cp README $RPM_BUILD_DIR/%name-%version/README-tools
+  cp README $RPM_BUILD_DIR/%name/trunk/README-tools
 popd
 make install DESTDIR=$RPM_BUILD_ROOT
 cp $RPM_SOURCE_DIR/README.SUSE .
@@ -103,6 +105,10 @@
 /usr/share/pixmaps/scummvm.xpm
 
 %changelog -n scummvm
+* Sun May 28 2006 - sndirsch@suse.de
+- updated to current CVS (2006-05-28)
+  * adds eperimental support for lure, cine, agi *and* gob2 (at
+  least the intro works now including sound)
 * Mon Feb 06 2006 - sndirsch@suse.de
 - added libvorbis/libvorbis-devel to BuildRequires to enable
   Ogg/Vorbis support again; has been disabled by switching from


++++++ gob2.diff ++++++
--- /var/tmp/diff_new_pack.K4deA6/_old	2006-05-29 01:20:37.000000000 +0200
+++ /var/tmp/diff_new_pack.K4deA6/_new	2006-05-29 01:20:37.000000000 +0200
@@ -1,15 +1,10 @@
---- gob/gob.cpp.orig	2005-06-12 18:06:11.568810258 +0200
-+++ gob/gob.cpp	2005-06-12 18:08:00.467794870 +0200
-@@ -68,10 +68,11 @@
- 
- 	{"gob1", "Gobliiins (Interactive Demo)", GF_GOB1, "4f5bf4b9e4c39ebb93579747fc678e97"},
- 
--#if 0
-+#if 1
- 	{"gob2", "Gobliins 2 (DOS)", GF_GOB2, "abb5f762f9979d4253002de20f6e7b56"},
- 	{"gob2", "Gobliins 2 (DOS)", GF_GOB2, "9b6de65d811c08eebf50391b84fcba92"},
- 	{"gob2", "Gobliins 2 (DOS)", GF_GOB2, "54d59c200e3823ad0af11a605a6fd06a"},
-+	{"gob2", "Gobliins 2 (DOS)", GF_GOB2, "a13892cdf4badda85a6f6fb47603a128"},
- 	{"gob2", "Gobliins 2 (DOS Ru)", GF_GOB2, "b6d47494bf88398ae59c1b5656cafce4"},
+--- engines/gob/gob.cpp.orig	2006-05-28 12:14:28.130789234 +0200
++++ engines/gob/gob.cpp	2006-05-28 12:15:44.505443980 +0200
+@@ -88,6 +88,7 @@
+ 	{"gob2", "Gobliins 2 (DOS)", GF_GOB2, Common::FR_FRA, "abb5f762f9979d4253002de20f6e7b56"},
+ 	{"gob2", "Gobliins 2 (DOS)", GF_GOB2, Common::EN_GRB, "9b6de65d811c08eebf50391b84fcba92"},
+ 	{"gob2", "Gobliins 2 (DOS)", GF_GOB2, Common::EN_USA, "54d59c200e3823ad0af11a605a6fd06a"},
++	{"gob2", "Gobliins 2 (DOS)", GF_GOB2, Common::DE_DEU, "a13892cdf4badda85a6f6fb47603a128"},
+ 	{"gob2", "Gobliins 2 (DOS Ru)", GF_GOB2, Common::RU_RUS, "b6d47494bf88398ae59c1b5656cafce4"},
  	// CD 1.000.
- 	{"gob2", "Gobliins 2 (CD)", GF_GOB2, "02bf538fd8003b8da23a3546299c3df4"},
+ 	{"gob2", "Gobliins 2 (CD)", GF_GOB2, Common::EN_USA, "02bf538fd8003b8da23a3546299c3df4"},

++++++ scummvm-0.8.2.tar.bz2 -> scummvm-060528.tar.bz2 ++++++
++++ 1574433 lines of diff (skipped)

++++++ scummvm-cflags.diff ++++++
--- /var/tmp/diff_new_pack.K4deA6/_old	2006-05-29 01:20:56.000000000 +0200
+++ /var/tmp/diff_new_pack.K4deA6/_new	2006-05-29 01:20:56.000000000 +0200
@@ -1,13 +1,13 @@
---- Makefile.orig	2004-02-25 11:00:07.000000000 +0100
-+++ Makefile	2004-03-16 09:05:42.386201259 +0100
-@@ -39,6 +39,7 @@
+--- Makefile.orig	2006-05-28 12:27:43.041858713 +0200
++++ Makefile	2006-05-28 12:28:26.485265934 +0200
+@@ -25,6 +25,7 @@
  CXXFLAGS+= -pedantic -Wpointer-arith -Wcast-qual -Wconversion
  CXXFLAGS+= -Wshadow -Wimplicit -Wundef -Wnon-virtual-dtor
- CXXFLAGS+= -Wno-reorder -Wwrite-strings -fcheck-new
+ CXXFLAGS+= -Wno-reorder -Wwrite-strings
 +CXXFLAGS+= $(RPM_OPT_FLAGS) -fno-strict-aliasing
  
- #######################################################################
- # Misc stuff - you should never have to edit this                     #
+ # Disable RTTI and exceptions, and enabled checking of pointers returned by "new"
+ CXXFLAGS+= -fno-rtti -fno-exceptions -fcheck-new
 --- tools/module.mk.orig	2005-07-04 10:24:38.268173325 +0200
 +++ tools/module.mk	2005-07-04 10:25:29.249315179 +0200
 @@ -27,11 +27,11 @@

++++++ scummvm-tools-060129.diff -> scummvm-tools-060528.diff ++++++
--- scummvm/scummvm-tools-060129.diff	2006-02-06 17:39:54.000000000 +0100
+++ scummvm/scummvm-tools-060528.diff	2006-05-28 12:37:08.000000000 +0200
@@ -24,6 +24,6 @@
 +	mkdir -p $(DESTDIR)/usr/games
 +	install -m 755 $(TARGETS) $(DESTDIR)/usr/games
 +
- compress_san$(EXEEXT): compress_san.o compress.o util.o
+ compress_scumm_san$(EXEEXT): compress_scumm_san.o compress.o util.o
  	$(CXX) $(LDFLAGS) -o $@ $+ -lz
  

++++++ scummvm-tools-060129.tar.bz2 -> scummvm-tools-060528.tar.bz2 ++++++
++++   42137 lines of diff (skipped)

++++++ scummvm.diff ++++++
--- /var/tmp/diff_new_pack.K4deA6/_old	2006-05-29 01:20:57.000000000 +0200
+++ /var/tmp/diff_new_pack.K4deA6/_new	2006-05-29 01:20:57.000000000 +0200
@@ -1,9 +1,9 @@
---- Makefile.old	2005-07-04 11:07:59.048459780 +0200
-+++ Makefile	2005-07-04 11:13:42.047835627 +0200
-@@ -51,8 +51,6 @@
- 	$(INSTALL) -c -m 644 "$(srcdir)/scummvm.6" "$(DESTDIR)$(MANDIR)/man6/scummvm.6"
+--- Makefile.orig	2006-05-28 12:38:39.425129609 +0200
++++ Makefile	2006-05-28 12:40:17.999899011 +0200
+@@ -50,8 +50,6 @@
+ 	$(INSTALL) -c -m 644 "$(srcdir)/dists/scummvm.6" "$(DESTDIR)$(MANDIR)/man6/scummvm.6"
  	$(INSTALL) -d "$(DESTDIR)$(PREFIX)/share/pixmaps/"
- 	$(INSTALL) -c -m 644 "$(srcdir)/scummvm.xpm" "$(DESTDIR)$(PREFIX)/share/pixmaps/scummvm.xpm"
+ 	$(INSTALL) -c -m 644 "$(srcdir)/icons/scummvm.xpm" "$(DESTDIR)$(PREFIX)/share/pixmaps/scummvm.xpm"
 -	$(INSTALL) -d "$(DESTDIR)$(PREFIX)/share/doc/scummvm/"
 -	$(INSTALL) -c -m 644 "$(srcdir)/AUTHORS" "$(srcdir)/COPYING" "$(srcdir)/NEWS" "$(srcdir)/README" "$(DESTDIR)$(PREFIX)/share/doc/scummvm/"
  


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

    

root＠suse.de

tags

participants (1)