jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-29 06:06:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

lua: bump version to 5.1.5

Browse Source 
[thomas.petazzoni@free-electrons.com: rewrote the patch, which was
corrupted in the original submission. Used quilt to refresh the Lua
patches, so that the version numbers are no longer present in the file
names]

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
François Perrad 2012-07-14 15:11:59 +02:00 committed by Thomas Petazzoni
parent 830c5868ed
commit 55bdb7d01a
9 changed files with 40 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
package/lua/lua-bug3-boolean_expression.patch
View File

@ -1,48 +0,0 @@
--- lua-5.1.4.orig/src/lcode.c 2007/12/28 15:32:23 2.25.1.3
+++ lua-5.1.4/src/lcode.c 2009/06/15 14:07:34
@@ -544,15 +544,18 @@
pc = NO_JUMP; /* always true; do nothing */
break;
}
- case VFALSE: {
- pc = luaK_jump(fs); /* always jump */
- break;
- }
case VJMP: {
invertjump(fs, e);
pc = e->u.s.info;
break;
}
+ case VFALSE: {
+ if (!hasjumps(e)) {
+ pc = luaK_jump(fs); /* always jump */
+ break;
+ }
+ /* else go through */
+ }
default: {
pc = jumponcond(fs, e, 0);
break;
@@ -572,14 +575,17 @@
pc = NO_JUMP; /* always false; do nothing */
break;
}
- case VTRUE: {
- pc = luaK_jump(fs); /* always jump */
- break;
- }
case VJMP: {
pc = e->u.s.info;
break;
}
+ case VTRUE: {
+ if (!hasjumps(e)) {
+ pc = luaK_jump(fs); /* always jump */
+ break;
+ }
+ /* else go through */
+ }
default: {
pc = jumponcond(fs, e, 1);
break;

22
package/lua/lua-bug4-table.patch
View File

@ -1,22 +0,0 @@
--- lua-5.1.4.orig/src/lvm.c 2007/12/28 15:32:23 2.63.1.3
+++ lua-5.1.4/src/lvm.c 2009/07/01 20:36:59
@@ -133,6 +133,7 @@
void luaV_settable (lua_State *L, const TValue *t, TValue *key, StkId val) {
int loop;
+ TValue temp;
for (loop = 0; loop < MAXTAGLOOP; loop++) {
const TValue *tm;
if (ttistable(t)) { /* `t' is a table? */
@@ -152,7 +153,9 @@
callTM(L, tm, t, key, val);
return;
}
- t = tm; /* else repeat with `tm' */
+ /* else repeat with `tm' */
+ setobj(L, &temp, tm); /* avoid pointing inside table (may rehash) */
+ t = &temp;
}
luaG_runerror(L, "loop in settable");
}

10
package/lua/lua-bug5-debug_getfenv.patch
View File

@ -1,10 +0,0 @@
--- lua-5.1.4.orig/src/ldblib.c 2007/12/28 15:32:23 2.63.1.3
+++ lua-5.1.4/src/ldblib.c 2010/02/23 12:36:59
@@ -45,6 +45,7 @@
static int db_getfenv (lua_State *L) {
+ luaL_checkany(L, 1);
lua_getfenv(L, 1);
return 1;
}

14
package/lua/lua-bug6-gc_performance.patch
View File

@ -1,14 +0,0 @@
--- lua-5.1.4.orig/src/llex.c 2007/12/28 15:32:23 2.63.1.3
+++ lua-5.1.4/src/llex.c 2010/02/23 12:36:59
@@ -118,8 +118,10 @@
lua_State *L = ls->L;
TString *ts = luaS_newlstr(L, str, l);
TValue *o = luaH_setstr(L, ls->fs->h, ts); /* entry for `str' */
- if (ttisnil(o))
+ if (ttisnil(o)) {
setbvalue(o, 1); /* make sure `str' will not be collected */
+ luaC_checkGC(L);
+ }
return ts;
}

20
package/lua/lua-bug7-string_format.patch
View File

@ -1,20 +0,0 @@
--- lua-5.1.4.orig/src/lstrlib.c 2008/07/11 17:27:21 1.132.1.4
+++ lua-5.1.4/src/lstrlib.c 2010/05/14 15:12:53
@@ -754,6 +754,7 @@
static int str_format (lua_State *L) {
+ int top = lua_gettop(L);
int arg = 1;
size_t sfl;
const char *strfrmt = luaL_checklstring(L, arg, &sfl);
@@ -768,7 +769,8 @@
else { /* format item */
char form[MAX_FORMAT]; /* to store the format (`%...') */
char buff[MAX_ITEM]; /* to store the formatted item */
- arg++;
+ if (++arg > top)
+ luaL_argerror(L, arg, "no value");
strfrmt = scanformat(L, strfrmt, form);
switch (*strfrmt++) {
case 'c': {

14
package/lua/lua-bug8-io_read.patch
View File

@ -1,14 +0,0 @@
--- lua-5.1.4.orig/src/liolib.c 2008/01/18 17:47:43 2.73.1.3
+++ lua-5.1.4.orig/src/liolib.c 2010/05/14 15:29:29
@@ -276,7 +276,10 @@
lua_pushnumber(L, d);
return 1;
}
- else return 0; /* read fails */
+ else {
+ lua_pushnil(L); /* "result" to be removed */
+ return 0; /* read fails */
+ }
}

8
package/lua/lua-root-path.patch
View File

@ -1,6 +1,7 @@
diff -Naur lua-5.1.4.org/src/luaconf.h lua-5.1.4/src/luaconf.h Index: b/src/luaconf.h
--- lua-5.1.4.org/src/luaconf.h 2008-02-11 17:25:08.000000000 +0100 ===================================================================
+++ lua-5.1.4/src/luaconf.h 2009-11-24 23:19:15.052817379 +0100 --- a/src/luaconf.h
+++ b/src/luaconf.h
@@ -94,9 +94,9 @@ @@ -94,9 +94,9 @@
".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll" ".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
@ -14,4 +15,3 @@ diff -Naur lua-5.1.4.org/src/luaconf.h lua-5.1.4/src/luaconf.h
#define LUA_PATH_DEFAULT \ #define LUA_PATH_DEFAULT \
"./?.lua;" LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \ "./?.lua;" LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \
LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua" LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua"

65
package/lua/lua-shared-libs.patch
View File

@ -1,6 +1,7 @@
diff -Naur lua-5.1.4.org/Makefile lua-5.1.4/Makefile Index: b/Makefile
--- lua-5.1.4.org/Makefile 2009-11-24 23:49:28.232820455 +0100 ===================================================================
+++ lua-5.1.4/Makefile 2009-11-24 23:50:35.452817115 +0100 --- a/Makefile
+++ b/Makefile
@@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
# What to install. # What to install.
TO_BIN= lua luac TO_BIN= lua luac
@ -18,9 +19,10 @@ diff -Naur lua-5.1.4.org/Makefile lua-5.1.4/Makefile
cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN) cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
ranlib: ranlib:
diff -Naur lua-5.1.4.org/src/ldo.h lua-5.1.4/src/ldo.h Index: b/src/ldo.h
--- lua-5.1.4.org/src/ldo.h 2009-11-24 23:49:28.232820455 +0100 ===================================================================
+++ lua-5.1.4/src/ldo.h 2009-11-24 23:49:54.244818140 +0100 --- a/src/ldo.h
+++ b/src/ldo.h
@@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
LUAI_FUNC int luaD_poscall (lua_State *L, StkId firstResult); LUAI_FUNC int luaD_poscall (lua_State *L, StkId firstResult);
LUAI_FUNC void luaD_reallocCI (lua_State *L, int newsize); LUAI_FUNC void luaD_reallocCI (lua_State *L, int newsize);
@ -30,9 +32,10 @@ diff -Naur lua-5.1.4.org/src/ldo.h lua-5.1.4/src/ldo.h
LUAI_FUNC void luaD_throw (lua_State *L, int errcode); LUAI_FUNC void luaD_throw (lua_State *L, int errcode);
LUAI_FUNC int luaD_rawrunprotected (lua_State *L, Pfunc f, void *ud); LUAI_FUNC int luaD_rawrunprotected (lua_State *L, Pfunc f, void *ud);
diff -Naur lua-5.1.4.org/src/lfunc.h lua-5.1.4/src/lfunc.h Index: b/src/lfunc.h
--- lua-5.1.4.org/src/lfunc.h 2009-11-24 23:49:28.236815431 +0100 ===================================================================
+++ lua-5.1.4/src/lfunc.h 2009-11-24 23:49:54.244818140 +0100 --- a/src/lfunc.h
+++ b/src/lfunc.h
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
cast(int, sizeof(TValue *)*((n)-1))) cast(int, sizeof(TValue *)*((n)-1)))
@ -42,9 +45,10 @@ diff -Naur lua-5.1.4.org/src/lfunc.h lua-5.1.4/src/lfunc.h
LUAI_FUNC Closure *luaF_newCclosure (lua_State *L, int nelems, Table *e); LUAI_FUNC Closure *luaF_newCclosure (lua_State *L, int nelems, Table *e);
LUAI_FUNC Closure *luaF_newLclosure (lua_State *L, int nelems, Table *e); LUAI_FUNC Closure *luaF_newLclosure (lua_State *L, int nelems, Table *e);
LUAI_FUNC UpVal *luaF_newupval (lua_State *L); LUAI_FUNC UpVal *luaF_newupval (lua_State *L);
diff -Naur lua-5.1.4.org/src/lmem.h lua-5.1.4/src/lmem.h Index: b/src/lmem.h
--- lua-5.1.4.org/src/lmem.h 2009-11-24 23:49:28.236815431 +0100 ===================================================================
+++ lua-5.1.4/src/lmem.h 2009-11-24 23:49:54.244818140 +0100 --- a/src/lmem.h
+++ b/src/lmem.h
@@ -38,9 +38,9 @@ @@ -38,9 +38,9 @@
((v)=cast(t *, luaM_reallocv(L, v, oldn, n, sizeof(t)))) ((v)=cast(t *, luaM_reallocv(L, v, oldn, n, sizeof(t))))
@ -57,9 +61,10 @@ diff -Naur lua-5.1.4.org/src/lmem.h lua-5.1.4/src/lmem.h
LUAI_FUNC void *luaM_growaux_ (lua_State *L, void *block, int *size, LUAI_FUNC void *luaM_growaux_ (lua_State *L, void *block, int *size,
size_t size_elem, int limit, size_t size_elem, int limit,
const char *errormsg); const char *errormsg);
diff -Naur lua-5.1.4.org/src/lstring.h lua-5.1.4/src/lstring.h Index: b/src/lstring.h
--- lua-5.1.4.org/src/lstring.h 2009-11-24 23:49:28.236815431 +0100 ===================================================================
+++ lua-5.1.4/src/lstring.h 2009-11-24 23:49:54.244818140 +0100 --- a/src/lstring.h
+++ b/src/lstring.h
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
LUAI_FUNC void luaS_resize (lua_State *L, int newsize); LUAI_FUNC void luaS_resize (lua_State *L, int newsize);
@ -69,9 +74,10 @@ diff -Naur lua-5.1.4.org/src/lstring.h lua-5.1.4/src/lstring.h
#endif #endif
diff -Naur lua-5.1.4.org/src/lundump.h lua-5.1.4/src/lundump.h Index: b/src/lundump.h
--- lua-5.1.4.org/src/lundump.h 2009-11-24 23:49:28.232820455 +0100 ===================================================================
+++ lua-5.1.4/src/lundump.h 2009-11-24 23:49:54.244818140 +0100 --- a/src/lundump.h
+++ b/src/lundump.h
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
LUAI_FUNC void luaU_header (char* h); LUAI_FUNC void luaU_header (char* h);
@ -81,9 +87,10 @@ diff -Naur lua-5.1.4.org/src/lundump.h lua-5.1.4/src/lundump.h
#ifdef luac_c #ifdef luac_c
/* print one chunk; from print.c */ /* print one chunk; from print.c */
diff -Naur lua-5.1.4.org/src/Makefile lua-5.1.4/src/Makefile Index: b/src/Makefile
--- lua-5.1.4.org/src/Makefile 2009-11-24 23:49:28.236815431 +0100 ===================================================================
+++ lua-5.1.4/src/Makefile 2009-11-24 23:49:54.244818140 +0100 --- a/src/Makefile
+++ b/src/Makefile
@@ -23,6 +23,7 @@ @@ -23,6 +23,7 @@
PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
@ -114,22 +121,20 @@ diff -Naur lua-5.1.4.org/src/Makefile lua-5.1.4/src/Makefile
+so: $(ALL_SO) +so: $(ALL_SO)
+ +
$(LUA_A): $(CORE_O) $(LIB_O) $(LUA_A): $(CORE_O) $(LIB_O)
$(AR) $@ $? $(AR) $@ $(CORE_O) $(LIB_O) # DLL needs all object files
$(RANLIB) $@ $(RANLIB) $@
-$(LUA_T): $(LUA_O) $(LUA_A)
- $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
+$(LUA_SO): $(CORE_O) $(LIB_O) +$(LUA_SO): $(CORE_O) $(LIB_O)
+ $(CC) -o $@.$(PKG_VERSION) -shared -Wl,-soname="$@.$(PKG_VERSION)" $? -nostdlib -lgcc + $(CC) -o $@.$(PKG_VERSION) -shared -Wl,-soname="$@.$(PKG_VERSION)" $? -nostdlib -lgcc
+ ln -fs $@.$(PKG_VERSION) $@ + ln -fs $@.$(PKG_VERSION) $@
+ +
+$(LUA_T): $(LUA_O) $(LUA_SO) $(LUA_T): $(LUA_O) $(LUA_A)
+ $(CC) -o $@ -L. -llua $(MYLDFLAGS) $(LUA_O) $(LIBS) - $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
+ + $(CC) -o $@ -L. -llua $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
+$(LUAC_T): $(LUAC_O) $(LUA_SO)
+ $(CC) -o $@ -L. -llua $(MYLDFLAGS) $(LUAC_O) $(LIBS)
-$(LUAC_T): $(LUAC_O) $(LUA_A) $(LUAC_T): $(LUAC_O) $(LUA_A)
+ $(CC) -o $@ -L. -llua $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
+
+$(LUAC_T)-host: $(LUAC_O) $(LUA_A) +$(LUAC_T)-host: $(LUAC_O) $(LUA_A)
$(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) $(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)

2
package/lua/lua.mk
View File

@ -4,7 +4,7 @@
# #
############################################################# #############################################################
LUA_VERSION = 5.1.4 LUA_VERSION = 5.1.5
LUA_SITE = http://www.lua.org/ftp LUA_SITE = http://www.lua.org/ftp
LUA_INSTALL_STAGING = YES LUA_INSTALL_STAGING = YES