pool/scummvm
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Copy from home:RedDwarf:branches:games/scummvm via accept of submit request 7681

Browse Source 
Request was accepted with message:
reviewed ok.

OBS-URL: https://build.opensuse.org/package/show/games/scummvm?expand=0&rev=10
This commit is contained in:
Stefan Dirsch 2009-03-07 23:09:37 +00:00 committed by Git OBS Bridge
parent 2876402871
commit 21e4a511b3
12 changed files with 213 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
README.SUSE
View File

@ -1,40 +0,0 @@
FAQ
---
Q: When using the CD Version of "Flight of the Amazon Queen" (which
includes speech output in MP3 format) I get the following warning:
"Using MP3 compressed datafile, but MP3 support not compiled in!"
A: scummvm on SUSE is compiled without MAD (MP3) support. This is
intentional and we can't change this. It should be possible to
convert the FOTAQ data into ogg/flac instead of mp3 format
with "compress_queen" (shipped since SUSE 10.0). But this does
*not* work with the FOTAQ version you can can currently download
from the scummvm website.
# /usr/games/compress_queen --ogg queen.1c
Unknown/unsupported FOTAQ version!
SUSE reported this problem to the scummvm developer team. They
told us that this tool only supports official versions (not yet
converted data) of FOTAQ. Unfortunately the scummvm project
suffers from restricted project file space and therefore cannot
provide an ogg version of FOTAQ. We're working on a solution for
the future. For now you need to download an official CD version
of FOTAQ (not converted yet data) - FOTAQ has been freewared -
and convert it to ogg format with "compress_queen" yourself. Start
your favorite search engine and use
"Flight of the Amazon Queen" download
as search string. The file size should be about 90 MB (zipped;
unzipped size about 180 MB). Otherwise (many sites offer the
35 MB zipped MP3 version) you'll likely download an already MP3
converted version again, with which you'll run into the same
problem again.
UPDATE: Meanwhile you can find a link to the large - unmodified
original version and an ogg compressed version on the official
scummvwm download site.
http://www.scummvm.org/downloads.php

3
scummvm-0.12.0.tar.bz2
View File

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

28
scummvm-0.13.0-bufferoverflow.patch Normal file
View File

@ -0,0 +1,28 @@
--- engines/saga/sfuncs.cpp
+++ engines/saga/sfuncs.cpp
@@ -1570,9 +1570,9 @@
for (int i = 0; i < nArgs; i++) {
snprintf(buf1, 100, "%d", thread->pop());
- strncat(buf, buf1, 256);
+ strncat(buf, buf1, sizeof(buf) - strlen(buf) - 1);
if (i + 1 < nArgs)
- strncat(buf, ", ", 256);
+ strncat(buf, ", ", sizeof(buf) - strlen(buf) - 1);
}
debug(0, "%s)", buf);
--- engines/scumm/he/logic_he.cpp
+++ engines/scumm/he/logic_he.cpp
@@ -86,9 +86,9 @@
for (int i = 1; i < numArgs; i++) {
snprintf(tmp, 32, ", %d", args[i]);
- strncat(str, tmp, 256);
+ strncat(str, tmp, sizeof(str) - strlen(str) - 1);
}
- strncat(str, "])", 256);
+ strncat(str, "])", sizeof(str) - strlen(str) - 1);
debug(0, "%s", str);
#else

19
scummvm-0.13.0-desktop_file.patch Normal file
View File

@ -0,0 +1,19 @@
--- dists/scummvm.desktop
+++ dists/scummvm.desktop
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Name=ScummVM
Comment=Interpreter for several adventure games
Comment[pl]=Interpreter graficznych gier przygodowych
@@ -9,8 +8,8 @@
Comment[es]=Intérprete para varias aventuras gráficas
Comment[ca]=Intèrpret per diverses aventures gràfiques
Exec=scummvm
-Icon=scummvm.xpm
+Icon=scummvm
Terminal=false
Type=Application
-Categories=Application;Game;AdventureGame;
+Categories=Game;AdventureGame;
StartupNotify=false

24
scummvm-0.13.0-extra_deps.patch Normal file
View File

@ -0,0 +1,24 @@
--- configure
+++ configure
@@ -1414,7 +1414,7 @@
fi
if test "$_vorbis" = yes ; then
_def_vorbis='#define USE_VORBIS'
- LIBS="$LIBS $OGG_LIBS $VORBIS_LIBS -lvorbisfile -lvorbis -logg"
+ LIBS="$LIBS $OGG_LIBS $VORBIS_LIBS -lvorbisfile"
INCLUDES="$INCLUDES $OGG_CFLAGS $VORBIS_CFLAGS"
else
_def_vorbis='#undef USE_VORBIS'
@@ -1464,11 +1464,7 @@
fi
if test "$_flac" = yes ; then
_def_flac='#define USE_FLAC'
- if test "$_vorbis" = yes ; then
- LIBS="$LIBS $FLAC_LIBS $OGG_LIBS -lFLAC -logg"
- else
- LIBS="$LIBS $FLAC_LIBS -lFLAC"
- fi
+ LIBS="$LIBS $FLAC_LIBS -lFLAC"
INCLUDES="$INCLUDES $FLAC_CFLAGS"
else
_def_flac='#undef USE_FLAC'

20
scummvm-0.13.0-nostrip.patch Normal file
View File

@ -0,0 +1,20 @@
--- ports.mk
+++ ports.mk
@@ -10,7 +10,7 @@
#
install: all
$(INSTALL) -d "$(DESTDIR)$(BINDIR)"
- $(INSTALL) -c -s -m 755 "./scummvm$(EXEEXT)" "$(DESTDIR)$(BINDIR)/scummvm$(EXEEXT)"
+ $(INSTALL) -c -m 755 "./scummvm$(EXEEXT)" "$(DESTDIR)$(BINDIR)/scummvm$(EXEEXT)"
$(INSTALL) -d "$(DESTDIR)$(MANDIR)/man6/"
$(INSTALL) -c -m 644 "$(srcdir)/dists/scummvm.6" "$(DESTDIR)$(MANDIR)/man6/scummvm.6"
$(INSTALL) -d "$(DESTDIR)$(PREFIX)/share/pixmaps/"
@@ -21,7 +21,7 @@
$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) "$(DESTDIR)$(DATADIR)/scummvm/"
ifdef DYNAMIC_MODULES
$(INSTALL) -d "$(DESTDIR)$(LIBDIR)/scummvm/"
- $(INSTALL) -c -s -m 644 $(DIST_FILES_PLUGINS) "$(DESTDIR)$(LIBDIR)/scummvm/"
+ $(INSTALL) -c -m 644 $(DIST_FILES_PLUGINS) "$(DESTDIR)$(LIBDIR)/scummvm/"
endif
uninstall:

3
scummvm-0.13.0.tar.bz2 Normal file
View File

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

22
scummvm-bufferoverflow.diff
View File

@ -1,22 +0,0 @@
--- engines/saga/sfuncs.cpp.orig 2008-01-13 17:43:26.266273000 +0100
+++ engines/saga/sfuncs.cpp 2008-01-13 17:47:20.736926500 +0100
@@ -1985,7 +1985,7 @@
for (int i = 0; i < nArgs; i++) {
snprintf(buf1, 100, "%d", thread->pop());
- strncat(buf, buf1, 256);
+ strncat(buf, buf1, sizeof(buf) - strlen(buf) - 1);
if (i + 1 < nArgs)
strncat(buf, ", ", 256);
}
--- engines/scumm/he/logic_he.cpp.orig 2008-01-13 17:48:28.561165250 +0100
+++ engines/scumm/he/logic_he.cpp 2008-01-13 17:48:45.454221000 +0100
@@ -86,7 +86,7 @@
for (int i = 1; i < numArgs; i++) {
snprintf(tmp, 32, ", %d", args[i]);
- strncat(str, tmp, 256);
+ strncat(str, tmp, sizeof(str) - strlen(str) - 1);
}
strncat(str, "])", 256);

26
scummvm-cflags.diff
View File

@ -1,26 +0,0 @@
--- Makefile.orig 2006-05-28 12:27:43.041858713 +0200
+++ Makefile 2006-05-28 12:28:26.485265934 +0200
@@ -25,6 +25,7 @@
# Enable even more warnings...
CXXFLAGS+= -pedantic -Wpointer-arith -Wcast-qual -Wcast-align
CXXFLAGS+= -Wshadow -Wimplicit -Wnon-virtual-dtor -Wwrite-strings
+CXXFLAGS+= $(RPM_OPT_FLAGS) -fno-strict-aliasing
# 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 @@
tools/convbdf$(EXEEXT): $(srcdir)/tools/convbdf.c
$(MKDIR) tools/$(DEPDIR)
- $(CC) $(CFLAGS) -Wall -o $@ $<
+ $(CC) $(RPM_OPT_FLAGS) -o $@ $<
tools/md5table$(EXEEXT): $(srcdir)/tools/md5table.c
$(MKDIR) tools/$(DEPDIR)
- $(CC) $(CFLAGS) -Wall -o $@ $<
+ $(CC) $(RPM_OPT_FLAGS) -o $@ $<
#
# Rules to explicitly rebuild the credits / MD5 tables

29
scummvm-tools-0.11.0.diff
View File

@ -1,29 +0,0 @@
--- Makefile.orig 2008-01-13 00:10:11.000000000 +0100
+++ Makefile 2008-01-13 06:28:27.000000000 +0100
@@ -5,15 +5,10 @@
CC := gcc
CXX := g++
-CFLAGS += -g -O -Wall -Wuninitialized -Wno-long-long -Wno-multichar -DUNIX
# LDFLAGS +=
# Additional warnings
-CFLAGS+= -Wshadow
-CFLAGS+= -pedantic
-CFLAGS+= -Wpointer-arith -Wcast-qual -Wcast-align
# -Wconversion
-CFLAGS+= -Wshadow -Wimplicit -Wundef -Wwrite-strings
TARGETS := \
compress_agos$(EXEEXT) \
@@ -65,6 +60,10 @@
compress_scumm_bun$(EXEEXT): compress_scumm_bun.o compress.o util.o
$(CXX) $(LDFLAGS) -o $@ $+
+install: all
+ mkdir -p $(DESTDIR)/usr/games
+ install -m 755 $(TARGETS) $(DESTDIR)/usr/games
+
compress_scumm_san$(EXEEXT): compress_scumm_san.o compress.o util.o
$(CXX) $(LDFLAGS) -o $@ $+ -lz

3
scummvm-tools-0.11.0.tar.bz2
View File

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

204
scummvm.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package scummvm (Version 0.12.0) # spec file for package scummvm (Version 0.13.0)
# #
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -19,102 +19,136 @@
Name: scummvm Name: scummvm
BuildRequires: SDL-devel flac-devel gcc-c++ libpng-devel libsndfile-devel libvorbis libvorbis-devel readline-devel Version: 0.13.0
BuildRequires: fluidsynth-devel Release: 1
Url: http://scummvm.sourceforge.net/ Summary: Interpreter for several adventure games
License: GPL v2 or later
Group: Amusements/Games/Other Group: Amusements/Games/Other
AutoReqProv: on License: GPLv2+, LGPLv2.1 or later
Url: http://www.scummvm.org
Source: http://downloads.sf.net/%{name}/%{name}-%{version}.tar.bz2
Patch: %{name}-%{version}-nostrip.patch
Patch1: %{name}-%{version}-extra_deps.patch
Patch2: %{name}-%{version}-desktop_file.patch
# Submitted upstream, should be removed with next version
Patch3: %{name}-%{version}-bufferoverflow.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: SDL-devel >= 1.2.2 flac-devel libvorbis-devel zlib-devel
BuildRequires: fluidsynth-devel gcc-c++ update-desktop-files
%ifarch %{ix86}
BuildRequires: nasm
%endif
Provides: sarien Provides: sarien
Obsoletes: sarien Obsoletes: sarien
Version: 0.12.0 Suggests: %{name}-extra %{name}-tools
Release: 2.1
Summary: Interpreter for LucasArts games
Source: %name-%version.tar.bz2
Source1: %name-tools-0.11.0.tar.bz2
Source2: README.SUSE
Patch: %name-cflags.diff
Patch1: %name-tools-0.11.0.diff
Patch2: %name-bufferoverflow.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
ScummVM is an implementation of the LucasArts SCUMM (Script Creation ScummVM is an interpreter that will play graphic adventure games written for
Utility for Maniac Mansion) interpreter, used in games such as Monkey LucasArts' SCUMM virtual machine (such as Day of the Tentacle and
Island and Day of the Tentacle. Some things are still missing in a few Monkey Island), Sierra's AGI adventures (such as early King's Quest and
games, and there are a few bugs. Regardless, it is possible to play Space Quest games), Adventure Soft's Simon the Sorcerer 1, 2 and Feeble Files,
some games all the way through to the end. Revolution Software's Beneath a Steel Sky and Broken Sword 1 and 2,
Interactive Binary Illusions' Flight of the Amazon Queen,
At the moment there is support for the following games: Coktel Vision's Gobliiins, Wyrmkeep's Inherit the Earth, Westwood's
Legend of Kyrandia, and various others.
Zak McCracken and the Alien Mindbenders (FM Towns version) Loom
(256-color CD version) The Secret of Monkey Island (VGA CD version)
Monkey Island 2: LeChuck's Revenge Indiana Jones and the Fate of
Atlantis (demo and full version) Day of the Tentacle (demo and full
version) Sam & Max (demo and full version) Simon the Sorcerer
There is also experimental support for these games:
Indiana Jones and the Last Crusade (VGA version) The Secret of Monkey
Island (VGA floppy disk version) Full Throttle The DIG
If you are a fan of Sierra On-Line adventure games you might want to
try the 'sarien' and 'freesci' packages.
Authors: Authors:
-------- --------
Ludvig Strigeus Max Horn
Vincent Hamm Eugene Sandulenko
%package extra
Summary: Extra engines for ScummVM
Group: Amusements/Games/Other
Requires: %{name} = %{version}
%description extra
Cruise, igor, m4, made and tinsel engines for ScummVM.
These engines are in a worse state, but allow to play extra games.
%prep %prep
%setup -b1 %setup -q
%patch %patch
pushd ../scummvm-tools-0.11.0
%patch1 %patch1
popd
%patch2 %patch2
%patch3
%build %build
pushd ../scummvm-tools-0.11.0
%ifarch ppc ppc64 s390 s390x
export CFLAGS="$RPM_OPT_FLAGS -DSCUMM_BIG_ENDIAN -DUNIX"
%else
export CFLAGS="$RPM_OPT_FLAGS -DUNIX"
%endif
make
popd
%ifarch %ix86 %ifarch %ix86
RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mmmx -msse" RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mmmx -msse"
%endif %endif
./configure --prefix=/usr \ # No rpm configure because scummvm's configure isn't a real configure and thus
--bindir=/usr/games \ # doesn't understand some of the options %%configure passes.
--mandir=%_mandir \ CXXFLAGS="$RPM_OPT_FLAGS" ; export CXXFLAGS ; \
--enable-drascula \ ./configure --prefix=%{_prefix} \
--enable-igor --bindir=%{_prefix}/games \
--datadir=%{_datadir}/games \
--mandir=%{_mandir} \
--libdir=%{_libdir} \
--enable-plugins \
--enable-cruise=dynamic \
--enable-igor=dynamic \
--enable-m4=dynamic \
--enable-made=dynamic \
--enable-tinsel=dynamic
# --enable-saga2
# While cruise, igor, m4, mad and tinsel aren't compiled by default they are
# full engines, so I compile them like plugins. saga2 is a subengine of saga, I
# prefer not to touch it including saga2 support.
make %{?jobs:-j %jobs} make %{?jobs:-j %jobs}
%install %install
pushd ../scummvm-tools-0.11.0 make install DESTDIR=${RPM_BUILD_ROOT}
make install DESTDIR=$RPM_BUILD_ROOT install -m 644 dists/pred.dic "${RPM_BUILD_ROOT}%{_datadir}/games/scummvm/"
cp README $RPM_BUILD_DIR/%name-%version/README-tools install -m 644 icons/%{name}.svg "${RPM_BUILD_ROOT}%{_datadir}/pixmaps/"
popd %suse_update_desktop_file -i %{name}
make install DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/scummvm %clean
install -m 644 gui/themes/* $RPM_BUILD_ROOT/%{_datadir}/scummvm rm -Rf ${RPM_BUILD_ROOT}
cp $RPM_SOURCE_DIR/README.SUSE .
%files %files
%defattr(-,root,root) %defattr(0644,root,root,0755)
%doc AUTHORS NEWS README COPYING COPYRIGHT README-tools README.SUSE %doc AUTHORS README NEWS COPYING COPYING.LGPL COPYRIGHT
/usr/games/* %attr(0755,root,root)%{_prefix}/games/scummvm
%{_datadir}/scummvm/ %{_datadir}/games/%{name}
%_mandir/man6/scummvm.6.gz %{_mandir}/man6/%{name}.6*
/usr/share/pixmaps/scummvm.xpm %{_datadir}/applications/%{name}.desktop
%exclude /usr/share/doc/scummvm %{_datadir}/pixmaps/%{name}.svg
%exclude %{_datadir}/pixmaps/%{name}.xpm
%exclude %{_datadir}/doc/%{name}
%files extra
%defattr(0644,root,root,0755)
%{_libdir}/%{name}
%changelog %changelog
* Sat Mar 7 2009 cmorve69@yahoo.es - 0.13.0
- fixed lincense tag
- removed README.SUSE file
- package scummvm-tools in a separate package
- updated description
- various fixes taken from Fedora and upstream spec files
- updated to new 0.13.0 release
* General:
- Added MIDI driver for Atari ST / FreeMint.
- Added a 'Load' button to the Launcher (not supported by all engines).
- Added a new global main menu (GMM) dialog usable from all engines.
- Added the ability to return to the launcher from running games (via the
GMM).
- Rewrote GUI renderer to use an vector based approach.
- Rewrote GUI configuration to use XML.
* New Games:
- Added support for Blue's 123 Time Activities.
- Added support for Blue's ABC Time Activities.
- Added support for Bud Tucker in Double Trouble.
- Added support for The 7th Guest.
*KYRA:
- Added support for Auto-save feature.
- Added support for MIDI music.
*SCUMM:
- Implemented radio-chatter effect in The DIG.
* Tue Sep 2 2008 sndirsch@suse.de * Tue Sep 2 2008 sndirsch@suse.de
- updated to new 0.12.0 release - updated to new 0.12.0 release
* New Games: * New Games:
@ -656,25 +690,25 @@ cp $RPM_SOURCE_DIR/README.SUSE .
* Fixed various iMUSE bugs * Fixed various iMUSE bugs
* Tue May 13 2003 mmj@suse.de * Tue May 13 2003 mmj@suse.de
- Update to 0.4.0 including: - Update to 0.4.0 including:
· Curse of Monkey Island (comi) support (experimental) * Curse of Monkey Island (comi) support (experimental)
· Added support for the EGA versions of Loom, Monkey Island and * Added support for the EGA versions of Loom, Monkey Island and
Indy3 Indy3
· Improved music support in Indy3 and the floppy versions of * Improved music support in Indy3 and the floppy versions of
Monkey Island Monkey Island
· Many Simon the Sorcerer 1 & 2 improvements and fixes * Many Simon the Sorcerer 1 & 2 improvements and fixes
· Even more pre-alpha support for enhanced versions of V2 SCUMM * Even more pre-alpha support for enhanced versions of V2 SCUMM
games (Maniac Mansion and Zak) games (Maniac Mansion and Zak)
· Preliminary support for early Humongous Entertainment titles * Preliminary support for early Humongous Entertainment titles
(very experimental) (very experimental)
· New debug console and several GUI/Launcher enhancements * New debug console and several GUI/Launcher enhancements
· New Save/Load code (easier to expand while retaining * New Save/Load code (easier to expand while retaining
compatibility) compatibility)
· Dreamcast port now works with new games added for 0.3.0b * Dreamcast port now works with new games added for 0.3.0b
· New official PalmOS port * New official PalmOS port
· Various minor and not so minor SCUMM game fixes * Various minor and not so minor SCUMM game fixes
· Large memory leak fixed for The Dig/COMI * Large memory leak fixed for The Dig/COMI
· SMUSH code optimised, frame dropping added for slower machines * SMUSH code optimised, frame dropping added for slower machines
· Code cleanups * Code cleanups
* Wed Dec 11 2002 mmj@suse.de * Wed Dec 11 2002 mmj@suse.de
- Update to 0.3.0b - Update to 0.3.0b
* Wed Dec 4 2002 mmj@suse.de * Wed Dec 4 2002 mmj@suse.de