diff --git a/scummvm-0.13.0-bufferoverflow.patch b/scummvm-0.13.0-bufferoverflow.patch deleted file mode 100644 index cf16e40..0000000 --- a/scummvm-0.13.0-bufferoverflow.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- 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 diff --git a/scummvm-0.13.0.tar.bz2 b/scummvm-0.13.0.tar.bz2 deleted file mode 100644 index cdc6aef..0000000 --- a/scummvm-0.13.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3e5267fe75b1a2b9618a3866f5d70b5c04d54994ff8d96aa7def9b54ea7d022d -size 7110600 diff --git a/scummvm-0.13.1.tar.bz2 b/scummvm-0.13.1.tar.bz2 new file mode 100644 index 0000000..4b4ad3d --- /dev/null +++ b/scummvm-0.13.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:43e8003352022b131c1b91660d3e0240a140013a3f4d68742fe7f0714c42a0d9 +size 7108330 diff --git a/scummvm.spec b/scummvm.spec index 8e38275..ef37587 100644 --- a/scummvm.spec +++ b/scummvm.spec @@ -1,5 +1,5 @@ # -# spec file for package scummvm (Version 0.13.0) +# spec file for package scummvm (Version 0.13.1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -15,25 +15,29 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - +%bcond_with mpeg2 +%bcond_with mp3 Name: scummvm -Version: 0.13.0 +Version: 0.13.1 Release: 1 Summary: Interpreter for several adventure games Group: Amusements/Games/Other 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 +Patch: %{name}-0.13.0-nostrip.patch +Patch1: %{name}-0.13.0-extra_deps.patch +Patch2: %{name}-0.13.0-desktop_file.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 +%if %{with mpeg2} +BuildRequires: libmpeg2-devel +%endif +%if %{with mp3} +BuildRequires: libmad-devel +%endif %ifarch %{ix86} BuildRequires: nasm %endif @@ -72,7 +76,6 @@ These engines are in a worse state, but allow to play extra games. %patch %patch1 %patch2 -%patch3 %build %ifarch %ix86 @@ -93,9 +96,10 @@ CXXFLAGS="$RPM_OPT_FLAGS" ; export CXXFLAGS ; \ --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. + # --enable-lol +# While cruise, igor, m4, made and tinsel aren't compiled by default they are +# full engines, so I compile them like plugins. saga2 and lol are subengines, I +# prefer not to touch the base engines including support for them. make %{?jobs:-j %jobs} @@ -124,6 +128,39 @@ rm -Rf ${RPM_BUILD_ROOT} %{_libdir}/%{name} %changelog +* Tue May 5 2009 cmorve69@yahoo.es - 0.13.1 +- made mpeg2 and mp3 support optional +- updated to new 0.13.1 release + * AGOS: + - Fixed crash after OmniTV video is played in The Feeble Files + - Fixed crashes when exploring Jack the Ripper scene in the PC version of + the Waxworks + - Fixed palette glitches in the AtariST version of Elvira 2 + - Fixed noise that can occur when sound effects are played, when exploring + Pyramid scene in the Waxworks + + * Gob: + - Fixed a crash in the Italian version of Woodruff + + * Groovie: + - Fixed some issues with music in The 7th Guest + + * Parallaction: + - Fixed the sarcophagus puzzle in Nippon Safes + + * SAGA: + - Fixed a crash in Inherit the Earth + - Fixed glitches in the save/load dialog. + + * Sword2: + - Fixed random sound corruption when using the original sound files. + + * Game launcher: + - Fixed a case where memory could be corrupted + - Fixed the small cursor in the modern theme + - Fixed a bug in the theme engine, which could cause crashes + - Made the file browser bigger in 1x mode + * Sat Mar 7 2009 cmorve69@yahoo.es - 0.13.0 - fixed lincense tag - removed README.SUSE file