rpms/stratagus/FC-5 stratagus--use-lua51.diff, NONE, 1.1 stratagus--use_external_tolua.diff, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 stratagus.spec, 1.10, 1.11 stratagus--Rules_make_in.diff, 1.1, NONE stratagus--configure-libs.diff, 1.1, NONE stratagus--configure_in-libs.diff, 1.1, NONE stratagus--lp64.diff, 1.1, NONE stratagus--lua-5.1.diff, 1.2, NONE
Peter Lemenkov (peter)
fedora-extras-commits at redhat.com
Wed Jan 24 20:13:55 UTC 2007
Author: peter
Update of /cvs/extras/rpms/stratagus/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14629/FC-5
Modified Files:
.cvsignore sources stratagus.spec
Added Files:
stratagus--use-lua51.diff stratagus--use_external_tolua.diff
Removed Files:
stratagus--Rules_make_in.diff stratagus--configure-libs.diff
stratagus--configure_in-libs.diff stratagus--lp64.diff
stratagus--lua-5.1.diff
Log Message:
auto-import stratagus-2.2.2-0 on branch FC-5 from stratagus-2.2.2-0.src.rpm
version 2.2.2
stratagus--use-lua51.diff:
--- NEW FILE stratagus--use-lua51.diff ---
diff -ur stratagus-2.2.2.orig/src/stratagus/script.cpp stratagus-2.2.2/src/stratagus/script.cpp
--- src/stratagus/script.cpp 2006-11-20 01:18:04.000000000 +0100
+++ src/stratagus/script.cpp 2007-01-24 11:53:31.000000000 +0100
@@ -169,6 +169,23 @@
return status;
}
+int traceback (lua_State *L) {
+ lua_getfield(L, LUA_GLOBALSINDEX, "debug");
+ if (!lua_istable(L, -1)) {
+ lua_pop(L, 1);
+ return 1;
+ }
+ lua_getfield(L, -1, "traceback");
+ if (!lua_isfunction(L, -1)) {
+ lua_pop(L, 2);
+ return 1;
+ }
+ lua_pushvalue(L, 1); /* pass error message */
+ lua_pushinteger(L, 2); /* skip this function and traceback */
+ lua_call(L, 2, 1); /* call debug.traceback */
+ return 1;
+}
+
/**
** Call a lua function
**
@@ -183,8 +200,7 @@
int base;
base = lua_gettop(Lua) - narg; // function index
- lua_pushliteral(Lua, "_TRACEBACK");
- lua_rawget(Lua, LUA_GLOBALSINDEX); // get traceback function
+ lua_pushcfunction(Lua, traceback); /* push traceback function */
lua_insert(Lua, base); // put it under chunk and args
signal(SIGINT, laction);
status = lua_pcall(Lua, narg, (clear ? 0 : LUA_MULTRET), base);
diff -ur stratagus-2.2.2.orig/src/ui/widgets.cpp stratagus-2.2.2/src/ui/widgets.cpp
--- src/ui/widgets.cpp 2007-01-07 01:25:04.000000000 +0100
+++ src/ui/widgets.cpp 2007-01-24 11:53:07.000000000 +0100
@@ -192,14 +192,17 @@
**
** @param eventId FIXME: docu
*/
+int traceback (lua_State *L);
+
void LuaActionListener::action(const std::string &eventId)
{
int status;
int base;
base = lua_gettop(luastate);
- lua_getglobal(luastate, "_TRACEBACK");
lua_rawgeti(luastate, LUA_REGISTRYINDEX, luaref);
lua_pushstring(luastate, eventId.c_str());
+ lua_pushcfunction(luastate, traceback);
+ lua_insert(luastate, base);
status = lua_pcall(luastate, 1, 0, base); //FIXME call error reporting function
if (status) {
const char *msg;
stratagus--use_external_tolua.diff:
--- NEW FILE stratagus--use_external_tolua.diff ---
Index: src/tolua/Module.make
===================================================================
--- src/tolua/Module.make (revision 7816)
+++ src/tolua/Module.make (working copy)
@@ -26,9 +26,8 @@
## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
MODULE = src/tolua
-MSRC = tolua.cpp tolua_event.cpp tolua_is.cpp tolua_map.cpp tolua_push.cpp \
- tolua_to.cpp
-MHDRS = tolua_event.h tolua++.h
+MSRC = tolua.cpp
+MHDRS =
SRC += $(addprefix $(MODULE)/,$(MSRC))
HDRS += $(addprefix $(MODULE)/,$(MHDRS))
Index: src/tolua/tolua.cpp
===================================================================
--- src/tolua/tolua.cpp (revision 7816)
+++ src/tolua/tolua.cpp (working copy)
@@ -8,7 +8,7 @@
#endif
#include "string.h"
-#include "tolua++.h"
+#include <tolua++.h>
/* Exported function */
TOLUA_API int tolua_stratagus_open (lua_State* tolua_S);
@@ -16149,7 +16149,7 @@
10,115,101,116,109,101,116, 97,116, 97, 98,108,101, 40, 85,
110,105,116, 84,121,112,101,115, 44, 32,109,116, 41,32
};
- lua_dobuffer(tolua_S,(char*)B,sizeof(B),"tolua: embedded Lua code 1");
+ tolua_dobuffer(tolua_S,(char*)B,sizeof(B),"tolua: embedded Lua code 1");
lua_settop(tolua_S, top);
} /* end of embedded lua code */
@@ -16212,7 +16212,7 @@
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");
+ tolua_dobuffer(tolua_S,(char*)B,sizeof(B),"tolua: embedded Lua code 2");
lua_settop(tolua_S, top);
} /* end of embedded lua code */
@@ -16460,7 +16460,7 @@
105,115,116,101,110,101,114, 40,119, 46, 95, 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");
+ tolua_dobuffer(tolua_S,(char*)B,sizeof(B),"tolua: embedded Lua code 3");
lua_settop(tolua_S, top);
} /* end of embedded lua code */
@@ -16856,7 +16856,7 @@
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");
+ tolua_dobuffer(tolua_S,(char*)B,sizeof(B),"tolua: embedded Lua code 4");
lua_settop(tolua_S, top);
} /* end of embedded lua code */
@@ -17056,7 +17056,7 @@
101,110,101,114, 58,110,101,119, 40, 99, 97,108,108, 98, 97,
99,107, 41, 41, 10,101,110,100,32
};
- lua_dobuffer(tolua_S,(char*)B,sizeof(B),"tolua: embedded Lua code 5");
+ tolua_dobuffer(tolua_S,(char*)B,sizeof(B),"tolua: embedded Lua code 5");
lua_settop(tolua_S, top);
} /* end of embedded lua code */
Index: Rules.make.in
===================================================================
--- Rules.make.in (revision 7816)
+++ Rules.make.in (working copy)
@@ -19,7 +19,7 @@
CPPFLAGS=@DEFS@ @CPPFLAGS@ -DUSE_ZLIB -I$(TOPDIR) -I$(TOPDIR)/src/include -I$(TOPDIR)/src/guichan/include
CXXFLAGS=@CXXFLAGS@
-LDFLAGS=@LDFLAGS@ -lpng -lz -lm
+LDFLAGS=@LDFLAGS@ -lpng -lz -lm -ltolua++
OBJDIR=@OBJDIR@
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/stratagus/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 30 Mar 2006 06:38:17 -0000 1.2
+++ .cvsignore 24 Jan 2007 20:13:25 -0000 1.3
@@ -1 +1 @@
-stratagus-2.1-src.tar.gz
+stratagus-2.2.2-src.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/stratagus/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 30 Mar 2006 06:38:17 -0000 1.2
+++ sources 24 Jan 2007 20:13:25 -0000 1.3
@@ -1 +1 @@
-ff6b2070b66e8847eeed6bedc24ad8bb stratagus-2.1-src.tar.gz
+0e116a9d4080dbca6dad78b7d34fec8f stratagus-2.2.2-src.tar.gz
Index: stratagus.spec
===================================================================
RCS file: /cvs/extras/rpms/stratagus/FC-5/stratagus.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- stratagus.spec 21 Nov 2006 10:35:40 -0000 1.10
+++ stratagus.spec 24 Jan 2007 20:13:25 -0000 1.11
@@ -1,24 +1,15 @@
-# Rebuild switch:
-# --with libmad Enables libmad
-
-%{?_with_libmad: %define use_libmad 1}
-
Name: stratagus
Summary: Real-time strategy gaming engine
-Version: 2.1
-Release: 11%{?dist}
+Version: 2.2.2
+Release: 0%{?dist}
License: GPL
Group: Development/Libraries
URL: http://stratagus.sourceforge.net/
Source0: http://dl.sf.net/%{name}/%{name}-%{version}-src.tar.gz
-Patch0: stratagus--lp64.diff
-Patch1: stratagus--Rules_make_in.diff
-Patch2: stratagus--lua-5.1.diff
-Patch3: stratagus--configure_in-libs.diff
-Patch4: stratagus--configure-libs.diff
-BuildRequires: flac-devel
+Patch0: stratagus--use_external_tolua.diff
+Patch1: stratagus--use-lua51.diff
BuildRequires: mikmod-devel
-BuildRequires: lua
+BuildRequires: tolua++-devel
BuildRequires: lua-devel
BuildRequires: bzip2-devel
BuildRequires: libpng-devel
@@ -27,9 +18,6 @@
BuildRequires: SDL-devel
BuildRequires: libGL-devel
BuildRequires: libGLU-devel
-%if 0%{?use_libmad}
-BuildRequires: libmad-devel
-%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -42,26 +30,17 @@
of current games using the stratagus engine.
%prep
-%setup -q -n %{name}-040702
+%setup -q
%patch0
%patch1
-%patch2
-%patch3
-%patch4
-sed -i 's/DEBUG_CFLAGS=.*/DEBUG_CFLAGS="%{optflags}"/g' configure
+#sed -i 's/DEBUG_CFLAGS=.*/DEBUG_CFLAGS="%{optflags}"/g' configure
%build
%configure --with-x \
--with-bz2 \
--with-ogg \
--with-mikmod \
-%if 0%{?use_libmad}
-%else
- --with-mad=no \
-%endif
- --with-flac \
- --with-opengl \
- --with-cdaudio=sdlcd
+ --with-opengl
%{__make}
@@ -80,6 +59,14 @@
%changelog
+* Wed Jan 24 2007 Peter Lemenkov <lemenkov at gmail.com> 2.2.2-0
+- Version 2.2.2
+
+* Sun Dec 24 2006 Peter Lemenkov <lemenkov at gmail.com> 2.2.1-0
+- Version 2.2.1
+- Using externally shipping tolua++ nstead of internal one.
+- No more using of MAD and FLAC
+
* Sat Nov 18 2006 Peter Lemenkov <lemenkov at gmail.com> 2.1-11
- fix for bug #216166 suggested by Hans de Goede
--- stratagus--Rules_make_in.diff DELETED ---
--- stratagus--configure-libs.diff DELETED ---
--- stratagus--configure_in-libs.diff DELETED ---
--- stratagus--lp64.diff DELETED ---
--- stratagus--lua-5.1.diff DELETED ---
More information about the fedora-extras-commits
mailing list