Hello community, here is the log from the commit of package scummvm checked in at Tue Nov 20 01:41:53 CET 2007. -------- --- scummvm/scummvm.changes 2007-06-21 11:51:17.000000000 +0200 +++ /mounts/work_src_done/STABLE/scummvm/scummvm.changes 2007-11-19 17:41:44.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Nov 19 16:03:58 CET 2007 - mkoenig@suse.de + +- fix build + +------------------------------------------------------------------- New: ---- scummvm-0.10.0-namespace_instead_static.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scummvm.spec ++++++ --- /var/tmp/diff_new_pack.U11197/_old 2007-11-20 01:41:04.000000000 +0100 +++ /var/tmp/diff_new_pack.U11197/_new 2007-11-20 01:41:04.000000000 +0100 @@ -15,14 +15,14 @@ %if %sles_version == 0 BuildRequires: fluidsynth-devel %endif -URL: http://scummvm.sourceforge.net/ -License: GNU General Public License (GPL) +Url: http://scummvm.sourceforge.net/ +License: GPL v2 or later Group: Amusements/Games/Other -Autoreqprov: on +AutoReqProv: on Provides: sarien Obsoletes: sarien Version: 0.10.0 -Release: 1 +Release: 47 Summary: Interpreter for LucasArts games Source: %name-%version.tar.bz2 Source1: %name-tools-0.9.0.tar.bz2 @@ -31,6 +31,7 @@ Patch1: %name-tools-0.9.0.diff Patch4: %name.diff Patch5: %name-strip.diff +Patch6: scummvm-0.10.0-namespace_instead_static.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -71,6 +72,7 @@ popd %patch4 %patch5 +%patch6 -p1 %build pushd ../tools/tags/release-0-9-0 @@ -110,8 +112,9 @@ %{_datadir}/scummvm/ %_mandir/man6/scummvm.6.gz /usr/share/pixmaps/scummvm.xpm - %changelog +* Mon Nov 19 2007 - mkoenig@suse.de +- fix build * Thu Jun 21 2007 - sndirsch@suse.de - updated to new 0.10.0 release * Several new engines and thus new games supported: ++++++ scummvm-0.10.0-namespace_instead_static.patch ++++++ Index: scummvm-0.10.0/engines/touche/saveload.cpp =================================================================== --- scummvm-0.10.0.orig/engines/touche/saveload.cpp +++ scummvm-0.10.0/engines/touche/saveload.cpp @@ -36,46 +36,49 @@ enum { kGameStateDescriptionLen = 32 }; +/* begin private namespace */ +namespace { + template <class S, class T> -static void saveOrLoad(S &s, T &t); +void saveOrLoad(S &s, T &t); template <> -static void saveOrLoad(Common::WriteStream &stream, uint16 &i) { +void saveOrLoad(Common::WriteStream &stream, uint16 &i) { stream.writeUint16LE(i); } template <> -static void saveOrLoad(Common::ReadStream &stream, uint16 &i) { +void saveOrLoad(Common::ReadStream &stream, uint16 &i) { i = stream.readUint16LE(); } template <> -static void saveOrLoad(Common::WriteStream &stream, int16 &i) { +void saveOrLoad(Common::WriteStream &stream, int16 &i) { stream.writeSint16LE(i); } template <> -static void saveOrLoad(Common::ReadStream &stream, int16 &i) { +void saveOrLoad(Common::ReadStream &stream, int16 &i) { i = stream.readSint16LE(); } template <class S, class T> -static void saveOrLoadPtr(S &s, T *&t, T *base); +void saveOrLoadPtr(S &s, T *&t, T *base); template <> -static void saveOrLoadPtr(Common::WriteStream &stream, int16 *&p, int16 *base) { +void saveOrLoadPtr(Common::WriteStream &stream, int16 *&p, int16 *base) { int32 offset = (int32)(p - base); stream.writeSint32LE(offset); } template <> -static void saveOrLoadPtr(Common::ReadStream &stream, int16 *&p, int16 *base) { +void saveOrLoadPtr(Common::ReadStream &stream, int16 *&p, int16 *base) { int32 offset = stream.readSint32LE(); p = base + offset; } template <class S> -static void saveOrLoad(S &s, Common::Rect &r) { +void saveOrLoad(S &s, Common::Rect &r) { saveOrLoad(s, r.left); saveOrLoad(s, r.top); saveOrLoad(s, r.right); @@ -83,13 +86,13 @@ static void saveOrLoad(S &s, Common::Rec } template <class S> -static void saveOrLoad(S &s, SequenceEntry &seq) { +void saveOrLoad(S &s, SequenceEntry &seq) { saveOrLoad(s, seq.sprNum); saveOrLoad(s, seq.seqNum); } template <class S> -static void saveOrLoad(S &s, KeyChar &key) { +void saveOrLoad(S &s, KeyChar &key) { saveOrLoad(s, key.num); saveOrLoad(s, key.flags); saveOrLoad(s, key.currentAnimCounter); @@ -149,14 +152,14 @@ static void saveOrLoad(S &s, KeyChar &ke } template <class S> -static void saveOrLoad(S &s, TalkEntry &entry) { +void saveOrLoad(S &s, TalkEntry &entry) { saveOrLoad(s, entry.otherKeyChar); saveOrLoad(s, entry.talkingKeyChar); saveOrLoad(s, entry.num); } template <class S> -static void saveOrLoad(S &s, ProgramHitBoxData &data) { +void saveOrLoad(S &s, ProgramHitBoxData &data) { saveOrLoad(s, data.item); saveOrLoad(s, data.talk); saveOrLoad(s, data.state); @@ -171,14 +174,14 @@ static void saveOrLoad(S &s, ProgramHitB } template <class S> -static void saveOrLoad(S &s, Area &area) { +void saveOrLoad(S &s, Area &area) { saveOrLoad(s, area.r); saveOrLoad(s, area.srcX); saveOrLoad(s, area.srcY); } template <class S> -static void saveOrLoad(S &s, ProgramBackgroundData &data) { +void saveOrLoad(S &s, ProgramBackgroundData &data) { saveOrLoad(s, data.area); saveOrLoad(s, data.type); saveOrLoad(s, data.offset); @@ -187,7 +190,7 @@ static void saveOrLoad(S &s, ProgramBack } template <class S> -static void saveOrLoad(S &s, ProgramAreaData &data) { +void saveOrLoad(S &s, ProgramAreaData &data) { saveOrLoad(s, data.area); saveOrLoad(s, data.id); saveOrLoad(s, data.state); @@ -196,7 +199,7 @@ static void saveOrLoad(S &s, ProgramArea } template <class S> -static void saveOrLoad(S &s, ProgramWalkData &data) { +void saveOrLoad(S &s, ProgramWalkData &data) { saveOrLoad(s, data.point1); saveOrLoad(s, data.point2); saveOrLoad(s, data.clippingRect); @@ -205,7 +208,7 @@ static void saveOrLoad(S &s, ProgramWalk } template <class S> -static void saveOrLoad(S &s, ProgramPointData &data) { +void saveOrLoad(S &s, ProgramPointData &data) { saveOrLoad(s, data.x); saveOrLoad(s, data.y); saveOrLoad(s, data.z); @@ -213,10 +216,10 @@ static void saveOrLoad(S &s, ProgramPoin } template <class S, class A> -static void saveOrLoadCommonArray(S &s, A &array); +void saveOrLoadCommonArray(S &s, A &array); template <class A> -static void saveOrLoadCommonArray(Common::WriteStream &stream, A &array) { +void saveOrLoadCommonArray(Common::WriteStream &stream, A &array) { uint count = array.size(); assert(count < 0xFFFF); stream.writeUint16LE(count); @@ -226,7 +229,7 @@ static void saveOrLoadCommonArray(Common } template <class A> -static void saveOrLoadCommonArray(Common::ReadStream &stream, A &array) { +void saveOrLoadCommonArray(Common::ReadStream &stream, A &array) { uint count = stream.readUint16LE(); if (count == array.size()) { for (uint i = 0; i < count; ++i) { @@ -236,13 +239,15 @@ static void saveOrLoadCommonArray(Common } template <class S, class A> -static void saveOrLoadStaticArray(S &s, A &array, uint count) { +void saveOrLoadStaticArray(S &s, A &array, uint count) { for (uint i = 0; i < count; ++i) { saveOrLoad(s, array[i]); } } -static const uint32 saveLoadEndMarker = 0x55AA55AA; +const uint32 saveLoadEndMarker = 0x55AA55AA; + +} /* end of private namespace */ void ToucheEngine::saveGameStateData(Common::WriteStream *stream) { setKeyCharMoney(); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org