From f286f0bcdcaa20558377ea59eb7bf2b306bcb88f0b66feb7ac86f8dcf197f056 Mon Sep 17 00:00:00 2001 From: Cristian Morales Vega Date: Thu, 2 Jun 2011 09:25:03 +0000 Subject: [PATCH] - update to new 1.3.0 release * New Games: - Added support for Backyard Baseball. - Added support for Backyard Baseball 2001. - Added support for Urban Runner. - Added support for Playtoons: Bambou le Sauveur de la Jungle. - Added support for Toonstruck. - Added support for Living Books v1 and v2 games. - Added support for Hugo's House of Horrors, Hugo 2: Whodunit? and Hugo 3: Jungle of Doom. - Added support for Amiga SCI games (except Conquests of the Longbow). - Added support for Macintosh SCI1 games. * General - Added Danish translation. - Added Norwegian Bokmaal translation. - Added Norwegian Nynorsk translation. - Added Swedish translation. - Added Debug Console to Cine, Draci, Gob, MADE, Sword1, Touche and Tucker Engines. - Closed significant memory leaks. RTL should now be more usable. * AGOS: - Closed memory leaks in Simon 2 and Feeble Files. * Cine: - Corrected memory leaks and invalid memory accesses. Future Wars should be more stable. - Made Operation Stealth completable, though significant graphical glitches remain so not official supported. OBS-URL: https://build.opensuse.org/package/show/games/scummvm?expand=0&rev=21 --- _service | 7 +- _service:download_url:scummvm-1.2.1.tar.bz2 | 3 - _service:set_version:scummvm.spec | 124 -------------------- scummvm-overflow.patch | 40 ------- scummvm.changes | 117 ++++++++++++++++++ scummvm.spec | 22 ++-- 6 files changed, 129 insertions(+), 184 deletions(-) delete mode 100644 _service:download_url:scummvm-1.2.1.tar.bz2 delete mode 100644 _service:set_version:scummvm.spec delete mode 100644 scummvm-overflow.patch diff --git a/_service b/_service index 6ee21ee..157bae9 100644 --- a/_service +++ b/_service @@ -1,14 +1,13 @@ - http downloads.sourceforge.net - /project/scummvm/scummvm/1.2.1/scummvm-1.2.1.tar.bz2 + /project/scummvm/scummvm/1.3.0/scummvm-1.3.0.tar.bz2 - _service:download_url:scummvm-1.2.1.tar.bz2 + _service:download_url:scummvm-1.3.0.tar.bz2 sha256 - 488e0fc0fb48509f8d2dcc8f87a77d03655e8ae0e9f4333963aaa07ff75f2a09 + 694a65a16a72c1d676e09c9af11f1ba1393d2ed731b941d82a79c50e335b58af diff --git a/_service:download_url:scummvm-1.2.1.tar.bz2 b/_service:download_url:scummvm-1.2.1.tar.bz2 deleted file mode 100644 index 6169c8f..0000000 --- a/_service:download_url:scummvm-1.2.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:488e0fc0fb48509f8d2dcc8f87a77d03655e8ae0e9f4333963aaa07ff75f2a09 -size 9541548 diff --git a/_service:set_version:scummvm.spec b/_service:set_version:scummvm.spec deleted file mode 100644 index 9ffc7e0..0000000 --- a/_service:set_version:scummvm.spec +++ /dev/null @@ -1,124 +0,0 @@ -# -# spec file for package scummvm (Version 1.2.1) -# -# Copyright (c) 2010 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 -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - -%bcond_with mpeg2 -%bcond_with mp3 - -Name: scummvm -Version: 1.2.1 -Release: 0 -License: GPLv2+, LGPLv2.1+, BSD -Summary: Interpreter for several adventure games -Url: http://www.scummvm.org -Group: Amusements/Games/Other -Source: http://downloads.sf.net/%{name}/%{name}-%{version}.tar.bz2 -Patch0: %{name}-nostrip.patch -Patch1: %{name}-nobuildtime.patch -Patch2: %{name}-overflow.patch -BuildRequires: SDL-devel >= 1.2.2 -BuildRequires: flac-devel -BuildRequires: fluidsynth-devel -BuildRequires: gcc-c++ -BuildRequires: hicolor-icon-theme -BuildRequires: libvorbis-devel -BuildRequires: update-desktop-files -BuildRequires: zlib-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if %{with mpeg2} -BuildRequires: libmpeg2-devel -%endif -%if %{with mp3} -BuildRequires: libmad-devel -%endif -%ifarch %{ix86} -BuildRequires: nasm -%endif -Suggests: %{name}-extra -Suggests: %{name}-tools - -%description -ScummVM is an interpreter that will play graphic adventure games written for -LucasArts' SCUMM virtual machine (such as Day of the Tentacle and -Monkey Island), Sierra's AGI adventures (such as early King's Quest and -Space Quest games), Adventure Soft's Simon the Sorcerer 1, 2 and Feeble Files, -Revolution Software's Beneath a Steel Sky and Broken Sword 1 and 2, -Interactive Binary Illusions' Flight of the Amazon Queen, -Coktel Vision's Gobliiins, Wyrmkeep's Inherit the Earth, Westwood's -Legend of Kyrandia, and various others. - -%package extra -Summary: Extra engines for ScummVM -Group: Amusements/Games/Other -Requires: %{name} = %{version} - -%description extra -M4, mohawk and hugo engines for ScummVM. -These engines are in a worse state, but allow to play extra games. - -%prep -%setup -q -%patch0 -%patch1 -%patch2 - -%build -# No rpm configure because scummvm's configure isn't a real configure and thus -# doesn't understand some of the options %%configure passes. -CXXFLAGS="%{optflags}" ; export CXXFLAGS ; \ -./configure --prefix=%{_prefix} \ - --bindir=%{_bindir} \ - --datarootdir=%{_datadir} \ - --mandir=%{_mandir} \ - --libdir=%{_libdir} \ - %{?with_mpeg2:--enable-mpeg2} \ - --enable-verbose-build \ - --enable-plugins \ - --enable-m4=dynamic \ - --enable-mohawk=dynamic \ - --enable-hugo=dynamic - # --docdir=%{_docdir}/%{name} - # --enable-groovie2 - # --enable-lol - # --enable-saga2 -# While m4, mohawk and hugo aren't compiled by default they are full -# engines, so I compile them as plugins. groovie2, lol and saga2 are subengines, -# I prefer not to touch the base engines including support for them. - -make %{?_smp_mflags} - -%install -# docdir is here because in 1.2.0 configure is broken -make install DESTDIR=${RPM_BUILD_ROOT} docdir=%{_docdir}/%{name} -%suse_update_desktop_file -i %{name} - -%clean -rm -rf %{buildroot} - -%files -%defattr(0644,root,root,0755) -%attr(0755,root,root)%{_bindir}/%{name} -%{_datadir}/%{name} -%{_mandir}/man6/%{name}.6* -%{_datadir}/applications/%{name}.desktop -%{_datadir}/icons/hicolor/*/apps/%{name}.* -%{_docdir}/%{name} - -%files extra -%defattr(0644,root,root,0755) -%{_libdir}/%{name} - -%changelog diff --git a/scummvm-overflow.patch b/scummvm-overflow.patch deleted file mode 100644 index 46291f7..0000000 --- a/scummvm-overflow.patch +++ /dev/null @@ -1,40 +0,0 @@ -Index: engines/agi/predictive.cpp -=================================================================== ---- engines/agi/predictive.cpp.orig -+++ engines/agi/predictive.cpp -@@ -461,9 +461,10 @@ bool AgiEngine::predictiveDialog() { - } - - press: -- strncpy(_predictiveResult, prefix.c_str(), 40); -- strncat(_predictiveResult, _currentWord.c_str(), 40); -- _predictiveResult[prefix.size() + _currentCode.size() + 1] = 0; -+ strncpy(_predictiveResult, prefix.c_str(), sizeof(_predictiveResult)); -+ _predictiveResult[sizeof(_predictiveResult) - 1]= 0; -+ strncat(_predictiveResult, _currentWord.c_str(), sizeof(_predictiveResult)-strlen(_predictiveResult)-1); -+ _predictiveResult[prefix.size() + _currentCode.size()] = 0; - - getout: - // if another window was shown, bring it up again -Index: engines/parallaction/balloons.cpp -=================================================================== ---- engines/parallaction/balloons.cpp.orig -+++ engines/parallaction/balloons.cpp -@@ -248,7 +248,7 @@ class BalloonManager_ns : public Balloon - Parallaction_ns *_vm; - static int16 _dialogueBalloonX[5]; - -- byte _textColors[2]; -+ byte _textColors[3]; - - struct Balloon { - Common::Rect outerBox; -@@ -530,7 +530,7 @@ public: - class BalloonManager_br : public BalloonManager { - - Parallaction_br *_vm; -- byte _textColors[2]; -+ byte _textColors[3]; - - struct Balloon { - Common::Rect box; diff --git a/scummvm.changes b/scummvm.changes index b328034..47b7555 100644 --- a/scummvm.changes +++ b/scummvm.changes @@ -1,3 +1,120 @@ +------------------------------------------------------------------- +Thu Jun 2 09:12:42 UTC 2011 - cmorve69@yahoo.es + +- update to new 1.3.0 release + * New Games: + - Added support for Backyard Baseball. + - Added support for Backyard Baseball 2001. + - Added support for Urban Runner. + - Added support for Playtoons: Bambou le Sauveur de la Jungle. + - Added support for Toonstruck. + - Added support for Living Books v1 and v2 games. + - Added support for Hugo's House of Horrors, Hugo 2: Whodunit? + and Hugo 3: Jungle of Doom. + - Added support for Amiga SCI games (except Conquests of the + Longbow). + - Added support for Macintosh SCI1 games. + + * General + - Added Danish translation. + - Added Norwegian Bokmaal translation. + - Added Norwegian Nynorsk translation. + - Added Swedish translation. + - Added Debug Console to Cine, Draci, Gob, MADE, Sword1, Touche + and Tucker Engines. + - Closed significant memory leaks. RTL should now be more + usable. + + * AGOS: + - Closed memory leaks in Simon 2 and Feeble Files. + + * Cine: + - Corrected memory leaks and invalid memory accesses. + Future Wars should be more stable. + - Made Operation Stealth completable, though significant + graphical glitches remain so not official supported. + + * Drascula: + - Added German and French subtitles in the Von Braun cutscene + (#3069981: no subtitles in scene with "von Braun"). + - Improved French translation of the game. + - Added support for "Return To Launcher". + + * Gob: + - Fixed "Goblin Stuck On Reload" bugs affecting Gobliiins. + + * Kyra: + - Closed memory leaks. + + * Parallaction: + - Corrected issue which could cause crash at engine exit. + - Closed memory leaks in Nippon Safes Amiga. + + * SCI: + - Added a CMS music driver for SCI1 - SCI1.1 games. + - Added an option to toggle undithering from the ScummVM GUI. + - Added several previously missing parts of the game state in + saved games, such as game played time, script created + windows, the script string heap and information related to + the text parser in old EGA games. + - Added support for SCI1.1 magnifier cursors. + - Added support for the keypad +/- keys. + - Added support for the alternative General MIDI tracks in the + Windows CD versions of Eco Quest, Jones in the Fast Lane, + King's Quest 5 and Space Quest 4. + - Added support for the alternative Windows cursors in the + Windows versio of King's Quest 6. + - Added support for simultaneous speech and subtitles in the CD + versions of Space Quest 4 and Freddy Pharkas. + - Corrected resource loading leaks. + - Corrected several problems and issues in the Skate-O-Rama + rooms in Space Quest 4. + - Corrected several issues in Hoyle Classic Card Games. + - Fixed several graphical glitches (like, for example, parts of + the screen that weren't erased correctly under some rare + circumstances). + - Fixed several script bugs. + - Fixed several pathfinding related issues and lockups (like, + for example, a lockup in the shower scene of Laura bow 1 and + pathfinding in some screens during the chase sequence in + Laura Bow 2). + - Fixed several music related glitches and possible lockups + (like, for example, a rare music lockup that occurred when + loading a saved game outside the palace in Quest for Glory 3). + - Fixed possible problems and lockups in the character import + screens of Quest for Glory 2 and 3. + - Fixed a bug that caused a lockup in the SCI1 CD version of + Mixed Up Mother Goose, after Tommy Tucker's song. + - Fixed a script bug in the CD version of King's Quest 5, which + caused a lockup under certain circumstances when going + outside the witch's house in the dark forest. + - Function keys now work correctly when the num lock key is on. + - Improved support for fanmade game scripts. + - Improved support for non-English versions of games. + - Made several enhancements and fixes related to MT-32 music + (e.g. reverb). + - Music is no longer out of tune when loading saved games. + + * SCUMM: + - Improved support for FM-TOWNS versions of games. + + * Teenagent: + - Closed memory leaks. + + * Tinsel: + - Closed memory leaks in Coroutines. + - Added enhanced music support for the German CD + "Neon Edition" re-release of Discworld 1. + + * Touche: + - Corrected memory leaks and minor issues. + + * Tucker: + - Added workarounds for several issues present in the original game. + + * SDL ports: + - Closed memory leaks in Mouse Surfaces. + ------------------------------------------------------------------- Sun Dec 12 05:19:55 UTC 2010 - reddwarf@opensuse.org diff --git a/scummvm.spec b/scummvm.spec index d5901ac..6e0ca6e 100644 --- a/scummvm.spec +++ b/scummvm.spec @@ -1,5 +1,5 @@ # -# spec file for package scummvm (Version 1.2.1) +# spec file for package scummvm (Version 1.3.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -28,12 +28,13 @@ Group: Amusements/Games/Other Source: http://downloads.sf.net/%{name}/%{name}-%{version}.tar.bz2 Patch0: %{name}-nostrip.patch Patch1: %{name}-nobuildtime.patch -Patch2: %{name}-overflow.patch BuildRequires: SDL-devel >= 1.2.2 BuildRequires: flac-devel BuildRequires: fluidsynth-devel BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme +BuildRequires: libpng14-compat-devel +BuildRequires: libtheora-devel BuildRequires: libvorbis-devel BuildRequires: update-desktop-files BuildRequires: zlib-devel @@ -73,7 +74,6 @@ These engines are in a worse state, but allow to play extra games. %setup -q %patch0 %patch1 -%patch2 %build # No rpm configure because scummvm's configure isn't a real configure and thus @@ -88,20 +88,16 @@ CXXFLAGS="%{optflags}" ; export CXXFLAGS ; \ --enable-verbose-build \ --enable-plugins \ --enable-m4=dynamic \ - --enable-mohawk=dynamic \ - --enable-hugo=dynamic - # --docdir=%{_docdir}/%{name} - # --enable-groovie2 - # --enable-lol - # --enable-saga2 -# While m4, mohawk and hugo aren't compiled by default they are full -# engines, so I compile them as plugins. groovie2, lol and saga2 are subengines, -# I prefer not to touch the base engines including support for them. + --enable-lastexpress=dynamic \ + --enable-sword25=dynamic \ + --enable-tsage=dynamic +# --docdir=%%{_docdir}/%%{name} +# Subengines are not even as dynamic since I don't want to touch the main engines make %{?_smp_mflags} %install -# docdir is here because in 1.2.0 configure is broken +# docdir is here because since 1.2.0 configure is broken make install DESTDIR=${RPM_BUILD_ROOT} docdir=%{_docdir}/%{name} %suse_update_desktop_file -i %{name}