rpms/stratagus/devel stratagus--lua-5.1.diff, NONE, 1.1 stratagus.spec, 1.7, 1.8
Peter Lemenkov (peter)
fedora-extras-commits at redhat.com
Fri Sep 15 21:00:04 UTC 2006
Author: peter
Update of /cvs/extras/rpms/stratagus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26414
Modified Files:
stratagus.spec
Added Files:
stratagus--lua-5.1.diff
Log Message:
Fix building with Lua 5.1
stratagus--lua-5.1.diff:
--- NEW FILE stratagus--lua-5.1.diff ---
--- configure 2004-07-02 03:46:35.000000000 +0200
+++ configure 2006-08-24 21:37:10.000000000 +0200
@@ -5548,13 +5548,13 @@ fi
fi
- echo "$as_me:$LINENO: checking for luaopen_base in -llualib" >&5
-echo $ECHO_N "checking for luaopen_base in -llualib... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for luaopen_base in -llua" >&5
+echo $ECHO_N "checking for luaopen_base in -llua... $ECHO_C" >&6
if test "${ac_cv_lib_lualib_luaopen_base+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-llualib $LUA_LIBS -lm $LIBS"
+LIBS="-llua $LUA_LIBS -lm $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -5613,15 +5613,15 @@ fi
echo "$as_me:$LINENO: result: $ac_cv_lib_lualib_luaopen_base" >&5
echo "${ECHO_T}$ac_cv_lib_lualib_luaopen_base" >&6
if test $ac_cv_lib_lualib_luaopen_base = yes; then
- LUA_LIBS="$LUA_LIBS -llualib"
+ LUA_LIBS="$LUA_LIBS -llua"
else
- echo "$as_me:$LINENO: checking for luaopen_base in -llualib50" >&5
-echo $ECHO_N "checking for luaopen_base in -llualib50... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for luaopen_base in -llua50" >&5
+echo $ECHO_N "checking for luaopen_base in -llua50... $ECHO_C" >&6
if test "${ac_cv_lib_lualib50_luaopen_base+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-llualib50 $LUA_LIBS -lm $LIBS"
+LIBS="-llua50 $LUA_LIBS -lm $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -5680,15 +5680,15 @@ fi
echo "$as_me:$LINENO: result: $ac_cv_lib_lualib50_luaopen_base" >&5
echo "${ECHO_T}$ac_cv_lib_lualib50_luaopen_base" >&6
if test $ac_cv_lib_lualib50_luaopen_base = yes; then
- LUA_LIBS="$LUA_LIBS -llualib50"
+ LUA_LIBS="$LUA_LIBS -llua50"
else
- echo "$as_me:$LINENO: checking for luaopen_base in -llualib5.0" >&5
-echo $ECHO_N "checking for luaopen_base in -llualib5.0... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for luaopen_base in -llua5.0" >&5
+echo $ECHO_N "checking for luaopen_base in -llua5.0... $ECHO_C" >&6
if test "${ac_cv_lib_lualib5_0_luaopen_base+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-llualib5.0 $LUA_LIBS -lm $LIBS"
+LIBS="-llua5.0 $LUA_LIBS -lm $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -5747,7 +5747,7 @@ fi
echo "$as_me:$LINENO: result: $ac_cv_lib_lualib5_0_luaopen_base" >&5
echo "${ECHO_T}$ac_cv_lib_lualib5_0_luaopen_base" >&6
if test $ac_cv_lib_lualib5_0_luaopen_base = yes; then
- LUA_LIBS="$LUA_LIBS -llualib5.0"
+ LUA_LIBS="$LUA_LIBS -llua5.0"
else
{ { echo "$as_me:$LINENO: error: Lualib5 is required" >&5
echo "$as_me: error: Lualib5 is required" >&2;}
--- configure.in 2004-06-12 13:55:49.000000000 +0200
+++ configure.in 2006-08-24 21:37:12.000000000 +0200
@@ -263,9 +263,9 @@ else
AC_CHECK_LIB(lua50, lua_setfenv, LUA_LIBS="$LUA_LIBS -llua50",
AC_CHECK_LIB(lua5.0, lua_setfenv, LUA_LIBS="$LUA_LIBS -llua5.0",
[AC_MSG_ERROR(Lua5 is required)], -lm), -lm), -lm)
- AC_CHECK_LIB(lualib, luaopen_base, LUA_LIBS="$LUA_LIBS -llualib",
- AC_CHECK_LIB(lualib50, luaopen_base, LUA_LIBS="$LUA_LIBS -llualib50",
- AC_CHECK_LIB(lualib5.0, luaopen_base, LUA_LIBS="$LUA_LIBS -llualib5.0",
+ AC_CHECK_LIB(lualib, luaopen_base, LUA_LIBS="$LUA_LIBS -llua",
+ AC_CHECK_LIB(lualib50, luaopen_base, LUA_LIBS="$LUA_LIBS -llua50",
+ AC_CHECK_LIB(lualib5.0, luaopen_base, LUA_LIBS="$LUA_LIBS -llua5.0",
[AC_MSG_ERROR(Lualib5 is required)], $LUA_LIBS -lm), $LUA_LIBS -lm),$LUA_LIBS -lm)
fi
--- src/stratagus/script.c 2004-06-27 00:38:18.000000000 +0200
+++ src/stratagus/script.c 2006-08-24 21:40:55.000000000 +0200
@@ -323,9 +323,9 @@ int LuaToBoolean(lua_State* l, int narg)
void CclGarbageCollect(int fast)
{
DebugPrint("Garbage collect (before): %d/%d\n" _C_
- lua_getgccount(Lua) _C_ lua_getgcthreshold(Lua));
+ lua_getgccount(Lua) _C_ lua_gc(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));
Index: stratagus.spec
===================================================================
RCS file: /cvs/extras/rpms/stratagus/devel/stratagus.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- stratagus.spec 6 May 2006 04:00:04 -0000 1.7
+++ stratagus.spec 15 Sep 2006 21:00:04 -0000 1.8
@@ -6,13 +6,14 @@
Name: stratagus
Summary: Real-time strategy gaming engine
Version: 2.1
-Release: 6%{?dist}
+Release: 7%{?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
BuildRequires: flac-devel
BuildRequires: mikmod-devel
BuildRequires: lua
@@ -41,6 +42,7 @@
%setup -q -n %{name}-040702
%patch0
%patch1
+%patch2
%build
%configure --with-x \
@@ -72,6 +74,9 @@
%changelog
+* Sat Sep 16 2006 Peter Lemenkov <lemenkov at gmail.com> 2.1-7%{?dist}
+- Fix building with Lua 5.1
+
* Sat May 06 2006 Peter Lemenkov <lemenkov at newmail.ru> 2.1-6%{?dist}
- Added link to page with datasets
More information about the scm-commits
mailing list