Hello community, here is the log from the commit of package stratagus checked in at Sun May 13 16:53:23 CEST 2007. -------- --- stratagus/stratagus.changes 2007-04-11 16:18:16.000000000 +0200 +++ /mounts/work_src_done/STABLE/stratagus/stratagus.changes 2007-05-12 21:42:11.025073000 +0200 @@ -1,0 +2,6 @@ +Sat May 12 21:41:41 CEST 2007 - sndirsch@suse.de + +- update to 2.2.3: + * several bug fixes and support for Lua 5.1 + +------------------------------------------------------------------- Old: ---- lua51.diff stratagus-2.2.2-src.tar.gz New: ---- lua.diff stratagus-2.2.3-src.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ stratagus.spec ++++++ --- /var/tmp/diff_new_pack.pO2325/_old 2007-05-13 16:52:36.000000000 +0200 +++ /var/tmp/diff_new_pack.pO2325/_new 2007-05-13 16:52:36.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package stratagus (Version 2.2.2) +# spec file for package stratagus (Version 2.2.3) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,11 +12,7 @@ Name: stratagus BuildRequires: SDL-devel flac-devel gcc-c++ libmikmod-devel libpng-devel libtheora-devel libvorbis-devel scons -%if %suse_version > 1010 -BuildRequires: lua50-devel -%else BuildRequires: lua-devel -%endif %if %suse_version <= 930 BuildRequires: xorg-x11-devel %endif @@ -24,12 +20,12 @@ License: GNU General Public License (GPL) Group: Amusements/Games/Strategy/Real Time Autoreqprov: on -Version: 2.2.2 -Release: 13 +Version: 2.2.3 +Release: 2 Summary: Real-time strategy gaming engine Source: stratagus-%{version}-src.tar.gz Patch0: ccflags.diff -Patch1: lua51.diff +Patch1: lua.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -48,7 +44,7 @@ %prep %setup %patch0 -#%patch1 ## build aganist lua50 instead +%patch1 echo "env.Append(CCFLAGS = Split('$RPM_OPT_FLAGS -fno-strict-aliasing -DHAVE_STRNLEN'))" >> SConstruct %build @@ -64,6 +60,9 @@ /usr/bin/stratagus %changelog +* Sat May 12 2007 - sndirsch@suse.de +- update to 2.2.3: + * several bug fixes and support for Lua 5.1 * Wed Apr 11 2007 - sbrabec@suse.cz - Require just created libmikmod-devel instead of libmikmod. * Tue Mar 06 2007 - sndirsch@suse.de ++++++ lua51.diff -> lua.diff ++++++ --- stratagus/lua51.diff 2007-03-06 10:46:40.000000000 +0100 +++ /mounts/work_src_done/STABLE/stratagus/lua.diff 2007-05-12 21:33:56.547427000 +0200 @@ -1,94 +1,11 @@ ---- SConstruct -+++ SConstruct -@@ -103,6 +103,8 @@ - if not found: - return 0 - +--- SConstruct.ori 2007-05-12 21:27:48.742522428 +0200 ++++ SConstruct 2007-05-12 21:32:47.492832364 +0200 +@@ -119,6 +119,8 @@ + return 1 + if conf.CheckLibWithHeader('lualib5.1', 'lualib.h', 'c'): + return 1 + if conf.CheckLibWithHeader('liblua', 'lualib.h', 'c'): + return 1 - if conf.CheckLibWithHeader('lualib', 'lualib.h', 'c'): - return 1 - if conf.CheckLibWithHeader('lualib50', 'lualib.h', 'c'): ---- src/stratagus/script.cpp -+++ src/stratagus/script.cpp -@@ -405,7 +405,7 @@ - DebugPrint("Garbage collect (before): %d/%d\n" _C_ - lua_getgccount(Lua) _C_ lua_getgcthreshold(Lua)); - -- lua_setgcthreshold(Lua, 0); -+ lua_gc(Lua, LUA_GCCOLLECT, 0); - - DebugPrint("Garbage collect (after): %d/%d\n" _C_ - lua_getgccount(Lua) _C_ lua_getgcthreshold(Lua)); ---- src/tolua/tolua.cpp -+++ src/tolua/tolua.cpp -@@ -14547,7 +14547,8 @@ - 97,116, 97, 98,108,101, 40, 70,111,110,116, 67,111,108,111, - 114,115, 44, 32,109,116, 41,32 - }; -- lua_dobuffer(tolua_S,(char*)B,sizeof(B),"tolua: embedded Lua code 1"); -+ luaL_loadbuffer(tolua_S, (char *)B, sizeof(B), "tolua: embedded Lua code 1"); -+ lua_pcall(tolua_S, 0, 0, lua_gettop(tolua_S)); - lua_settop(tolua_S, top); - } /* end of embedded lua code */ - -@@ -14610,7 +14611,8 @@ - 111,110, 76,105,115,116,101,110,101,114, 58,110,101,119, 40, - 102, 41, 10,101,110,100,32 - }; -- lua_dobuffer(tolua_S,(char*)B,sizeof(B),"tolua: embedded Lua code 2"); -+ luaL_loadbuffer(tolua_S, (char *)B, sizeof(B), "tolua: embedded Lua code 2"); -+ lua_pcall(tolua_S, 0, 0, lua_gettop(tolua_S)); - lua_settop(tolua_S, top); - } /* end of embedded lua code */ - -@@ -14884,7 +14886,8 @@ - 115,116,101,110,101,114, 40,119, 46, 97, 99,116,105,111,110, - 99, 98, 41, 10,101,110,100,32 - }; -- lua_dobuffer(tolua_S,(char*)B,sizeof(B),"tolua: embedded Lua code 3"); -+ luaL_loadbuffer(tolua_S, (char *)B, sizeof(B), "tolua: embedded Lua code 3"); -+ lua_pcall(tolua_S, 0, 0, lua_gettop(tolua_S)); - lua_settop(tolua_S, top); - } /* end of embedded lua code */ - -@@ -15239,7 +15242,8 @@ - 110,100, 10,114,101,116,117,114,110, 32,109,101,110,117, 10, - 101,110,100,32 - }; -- lua_dobuffer(tolua_S,(char*)B,sizeof(B),"tolua: embedded Lua code 4"); -+ luaL_loadbuffer(tolua_S, (char *)B, sizeof(B), "tolua: embedded Lua code 4"); -+ lua_pcall(tolua_S, 0, 0, lua_gettop(tolua_S)); - lua_settop(tolua_S, top); - } /* end of embedded lua code */ - ---- src/tolua/tolua_map.cpp -+++ src/tolua/tolua_map.cpp -@@ -152,7 +152,7 @@ - { - lua_pop(L,1); /* clear metatable off stack */ - /* force garbage collection to avoid C to reuse a to-be-collected address */ -- lua_setgcthreshold(L,0); -+ lua_gc(L, LUA_GCCOLLECT, 0); - success = tolua_register_gc(L,1); - } - } -@@ -169,7 +169,7 @@ - { - void* u = *((void**)lua_touserdata(L,1)); - /* force garbage collection to avoid releasing a to-be-collected address */ -- lua_setgcthreshold(L,0); -+ lua_gc(L, LUA_GCCOLLECT, 0); - lua_pushstring(L,"tolua_gc"); - lua_rawget(L,LUA_REGISTRYINDEX); - lua_pushlightuserdata(L,u); ---- src/tolua/tolua_to.cpp -+++ src/tolua/tolua_to.cpp -@@ -90,6 +90,7 @@ - return v; - } + return 0 -+#define lua_unboxpointer(L,i) (*(void**)(lua_touserdata((L), (i)))) - TOLUA_API void* tolua_tofieldusertype (lua_State* L, int lo, int index, void* def) - { - void* v; + def AutoConfigure(env): ++++++ stratagus-2.2.2-src.tar.gz -> stratagus-2.2.3-src.tar.gz ++++++ ++++ 20182 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org