Hello community,
here is the log from the commit of package scummvm
checked in at Sun Jun 11 17:44:42 CEST 2006.
--------
--- scummvm/scummvm.changes 2006-05-30 23:56:16.000000000 +0200
+++ scummvm/scummvm.changes 2006-06-11 13:29:41.000000000 +0200
@@ -1,0 +2,6 @@
+Sun Jun 11 13:18:09 CEST 2006 - sndirsch@suse.de
+
+- updated to current CVS (2006-06-11)
+ * various fixes
+
+-------------------------------------------------------------------
Old:
----
scummvm-060530.tar.bz2
scummvm-tools-060528.diff
scummvm-tools-060528.tar.bz2
New:
----
scummvm-060611.tar.bz2
scummvm-tools-060611.diff
scummvm-tools-060611.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ scummvm.spec ++++++
--- /var/tmp/diff_new_pack.DJUjZB/_old 2006-06-11 17:44:11.000000000 +0200
+++ /var/tmp/diff_new_pack.DJUjZB/_new 2006-06-11 17:44:11.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package scummvm (Version 060530)
+# spec file for package scummvm (Version 060611)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -16,14 +16,14 @@
License: GPL
Group: Amusements/Games/Other
Autoreqprov: on
-Version: 060530
+Version: 060611
Release: 1
Summary: Interpreter for LucasArts games
Source: %name-%version.tar.bz2
-Source1: %name-tools-060528.tar.bz2
+Source1: %name-tools-060611.tar.bz2
Source2: README.SUSE
Patch: %name-cflags.diff
-Patch1: %name-tools-060528.diff
+Patch1: %name-tools-060611.diff
Patch4: %name.diff
Patch5: %name-strip.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -103,6 +103,9 @@
/usr/share/pixmaps/scummvm.xpm
%changelog -n scummvm
+* Sun Jun 11 2006 - sndirsch@suse.de
+- updated to current CVS (2006-06-11)
+ * various fixes
* Tue May 30 2006 - sndirsch@suse.de
- updated to current CVS (2006-05-30)
* obsoletes gob2.diff
++++++ scummvm-060530.tar.bz2 -> scummvm-060611.tar.bz2 ++++++
++++ 69231 lines of diff (skipped)
++++++ scummvm-tools-060528.diff -> scummvm-tools-060611.diff ++++++
++++++ scummvm-tools-060528.tar.bz2 -> scummvm-tools-060611.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/tools/trunk/Makefile new/tools/trunk/Makefile
--- old/tools/trunk/Makefile 2006-05-28 09:57:23.000000000 +0200
+++ new/tools/trunk/Makefile 2006-06-11 13:15:33.000000000 +0200
@@ -1,5 +1,5 @@
# $URL: https://svn.sourceforge.net/svnroot/scummvm/tools/trunk/Makefile $
-# $Id: Makefile 22545 2006-05-20 13:10:34Z h00ligan $
+# $Id: Makefile 22855 2006-06-03 06:43:16Z kirben $
SRC=.
@@ -60,8 +60,8 @@
compress_scumm_bun$(EXEEXT): compress_scumm_bun.o compress.o util.o
$(CXX) $(LDFLAGS) -o $@ $+
-encode_dxa$(EXEEXT): encode_dxa.o util.o
- $(CXX) $(LDFLAGS) -o $@ $+ -lpng -lsndfile -lz
+encode_dxa$(EXEEXT): encode_dxa.o compress.o util.o
+ $(CXX) $(LDFLAGS) -o $@ $+ -lpng -lz
extract_loom_tg16$(EXEEXT): extract_loom_tg16.o util.o
$(CC) $(LDFLAGS) -o $@ $+
@@ -105,7 +105,7 @@
# Most compress_* tools (except for compress_queen) use compress.h
compress_saga.o compress_scumm_sou.o compress_scumm_bun.o \
compress_simon.o compress_sword1.o compress_sword2.o \
-compress_kyra.o compress.o: compress.h
+compress_kyra.o compress.o encode_dxa.o: compress.h
# Virtually everything depends on util.h
compress_saga.o compress_scumm_sou.o compress_scumm_bun.o \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/tools/trunk/README new/tools/trunk/README
--- old/tools/trunk/README 2006-05-28 09:57:23.000000000 +0200
+++ new/tools/trunk/README 2006-06-11 13:15:33.000000000 +0200
@@ -24,17 +24,19 @@
There is currently no support for this game in ScummVM!
extract_mm_c64
- Extracts data files from Commodore 64 version of Maniac Mansion.
+ Extracts data files from the Commodore 64 version of Maniac
+ Mansion.
extract_mm_nes
- Extracts data files from NES version of Maniac Mansion.
+ Extracts data files from the NES version of Maniac Mansion.
extract_simon1_amiga
- Extracts the graphics or music files in AGA/ECS
- versions of Simon the Sorcerer 1 for Amiga
+ Extracts the graphics or music files in AGA and ECS
+ versions of Simon the Sorcerer 1 for Amiga.
extract_zak_c64
- Extracts data files from Commodore 64 version of Zak McKracken
+ Extracts data files from the Commodore 64 version of Zak
+ McKracken.
Compression Tools:
compress_scumm_sou
@@ -43,20 +45,21 @@
compress_queen
Used to rebuild the datafile of Flight of the Amazon Queen,
- to allow optional MP3/Ogg/FLAC compression.
+ and allow optional MP3, Vorbis or FLAC compression.
compress_saga
- Compress SAGA engine digital sound files into MP3 and Ogg
- Vorbis format.
+ Used to compress SAGA engine digital sound files to MP3 or
+ Vorbis.
There is currently no support for compressed sound files in
ScummVM!
compress_simon
- Compresses Simon voc/wav files to MP3/Ogg/FLAC.
+ Used to compress the Feeble Files or Simon 1/2 voc/wav files
+ to MP3, Vorbis or FLAC.
compress_sword1
- Used to compress Broken Sword 1's music and speech files
- using mp3 or vorbis.
+ Used to compress Broken Sword 1's music and speech files to
+ MP3 or Vorbis.
compress_sword2
Used to compress Broken Sword 2's music and speech .clu
@@ -98,6 +101,17 @@
For the Ogg or Mad compression feature, your ScummVM binary
naturally must have been built with Ogg or Mad support enabled.
+ compress_kyra
+ Used to compress The Legend of Kyrandia's speech files with
+ MP3, Vorbis or FLAC.
+
+ Example of usage:
+ compress_kyra <flags here> input/GEMCUT.VRM output/GEMCUT.VRM
+
+ Note: You have to keep the VRM extension, else it will NOT work.
+ Use it like shown above, copy all *.VRM files to a directory
+ and let the tool put the output file in another directory.
+
Script Tools:
descumm
Decompiles SCUMM scripts
@@ -114,26 +128,26 @@
Creates DXA file out of extracted Smacker video.
To extract a video use RAD Game Tools and perform 2 passes
- on it. Let's say, your video is called 'intro.smk'.
+ on it. For example, if your video is called 'intro.smk'.
- 1. Extract video to PNG, 256 colors (chose PNG format
+ 1. Extract the video to PNG, 256 colors (choose PNG format
and tick the checkbox). It will create bunch of files named
- 'introXXX.png' where XXX is frame number. Make sure you
+ 'introXXX.png', where XXX is frame number. Make sure you have
extracted 256 colors PNGs, otherwise encode_dxa will complain.
- 2. Extract audio to WAV format. You will get file 'intro.wav'.
+ 2. Extract the audio to WAV format, you will get an
+ 'intro.wav' file.
- 3. Put files 'intro.smk', 'intro.wav' and 'intro*.png' to a
- single directory, say, video/
+ 3. Put files 'intro.smk', 'intro.wav' and 'intro*.png' into a
+ single directory.
- 4. Run `encode_dxa intro /path/to/directory/video/`
- or for simplicity cd to that directory and run
- `encode_data intro ./`
+ 4. Run `encode_dxa intro` in that directory
- 5. You will get intro.dxa file in result.
+ 5. You will get an intro.dxa file and intro.flac/mp3/ogg file
+ in result.
- Additionally you may use batch processing of SMK files in
- RAD Game Tools. Just select more than one file and push
+ Additionally you may use batch processing mode of SMK files in
+ RAD Game Tools. Just select more than one file and push the
'Convert' button. It will ask you either you want them
- processed in batch and will do this for you. All buttons
+ processed in batch mode and will do this for you. All buttons
and conversion options work the same.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/tools/trunk/compress.c new/tools/trunk/compress.c
--- old/tools/trunk/compress.c 2006-05-28 09:57:23.000000000 +0200
+++ new/tools/trunk/compress.c 2006-06-11 13:15:33.000000000 +0200
@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* $URL: https://svn.sourceforge.net/svnroot/scummvm/tools/trunk/compress.c $
- * $Id: compress.c 22572 2006-05-23 08:45:21Z eriktorbjorn $
+ * $Id: compress.c 22924 2006-06-05 02:07:25Z kirben $
*
*/
@@ -131,8 +131,8 @@
if (oggparms.silent)
tmp += sprintf(tmp, "--quiet ");
tmp += sprintf(tmp, "--quality=%d ", oggparms.quality);
- tmp += sprintf(tmp, "--output=%s ", outname);
- tmp += sprintf(tmp, "%s ", inname);
+ tmp += sprintf(tmp, "--output=\"%s\" ", outname);
+ tmp += sprintf(tmp, "\"%s\" ", inname);
err = system(fbuf) != 0;
break;
@@ -167,7 +167,7 @@
tmp += sprintf(tmp, "-q %d ", encparms.algqual);
tmp += sprintf(tmp, "-V %d ", encparms.vbrqual);
tmp += sprintf(tmp, "-B %d ", encparms.maxBitr);
- tmp += sprintf(tmp, "%s %s ", inname, outname);
+ tmp += sprintf(tmp, "\"%s\" \"%s\" ", inname, outname);
err = system(fbuf) != 0;
break;
@@ -189,8 +189,8 @@
tmp += sprintf(tmp, "%s ", flacparms.argv[i]);
}
- tmp += sprintf(tmp, "-o %s ", outname);
- tmp += sprintf(tmp, "%s ", inname);
+ tmp += sprintf(tmp, "-o \"%s\" ", outname);
+ tmp += sprintf(tmp, "\"%s\" ", inname);
err = system(fbuf) != 0;
break;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/tools/trunk/compress_kyra.cpp new/tools/trunk/compress_kyra.cpp
--- old/tools/trunk/compress_kyra.cpp 2006-05-28 09:57:23.000000000 +0200
+++ new/tools/trunk/compress_kyra.cpp 2006-06-11 13:15:33.000000000 +0200
@@ -186,6 +186,7 @@
if (strstr(tempPak.filename, ".VOC") == NULL) {
if (endOffset == file_size)
break;
+ startOffset = endOffset;
continue;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/tools/trunk/compress_sword1.c new/tools/trunk/compress_sword1.c
--- old/tools/trunk/compress_sword1.c 2006-05-28 09:57:22.000000000 +0200
+++ new/tools/trunk/compress_sword1.c 2006-06-11 13:15:33.000000000 +0200
@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* $URL: https://svn.sourceforge.net/svnroot/scummvm/tools/trunk/compress_sword1.c $
- * $Id: compress_sword1.c 21035 2006-03-03 14:35:18Z fingolfin $
+ * $Id: compress_sword1.c 22730 2006-05-29 03:12:51Z eriktorbjorn $
*
*/
@@ -493,7 +493,7 @@
convertClu(clu, cl3, compMode);
}
}
- if (clu)
+ if (clu)
fclose(clu);
if (cl3)
fclose(cl3);
@@ -560,7 +560,7 @@
}
}
if (!speechFound) {
- printf("Unable to find speech files.\n");
+ printf("Unable to find speech files.\n");
printf("Please copy the SPEECH.CLU files from Broken Sword CD1 and CD2\n");
printf("into the \"SPEECH\" subdirectory and rename them to\n");
printf("SPEECH1.CLU and SPEECH2.CLU\n\n");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/tools/trunk/encode_dxa.cpp new/tools/trunk/encode_dxa.cpp
--- old/tools/trunk/encode_dxa.cpp 2006-05-28 09:57:22.000000000 +0200
+++ new/tools/trunk/encode_dxa.cpp 2006-06-11 13:15:33.000000000 +0200
@@ -17,14 +17,14 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* $URL: https://svn.sourceforge.net/svnroot/scummvm/tools/trunk/encode_dxa.cpp $
- * $Id: encode_dxa.cpp 22232 2006-04-29 23:09:20Z sev $
+ * $Id: encode_dxa.cpp 22861 2006-06-03 10:57:22Z kirben $
*
*/
+#include "compress.h"
#include "util.h"
#include