vlc | branch: master | Rafaël Carré <[email protected]> | Mon Jul 11 12:11:36 2016 +0200| [f5c896b85ad6b9d2fe92e2dc0cb803292735305a] | committer: Rafaël Carré
Revert "contrib: lua: Do not use system nor popen on winrt" This reverts commit 9318c15416843b09c1242813c7fcc310b9b64f5b. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f5c896b85ad6b9d2fe92e2dc0cb803292735305a --- contrib/src/lua/rules.mak | 4 ---- contrib/src/lua/winrt-nopopen.patch | 14 -------------- contrib/src/lua/winrt-nosystem.patch | 29 ----------------------------- 3 files changed, 47 deletions(-) diff --git a/contrib/src/lua/rules.mak b/contrib/src/lua/rules.mak index 037d680..17b8cef 100644 --- a/contrib/src/lua/rules.mak +++ b/contrib/src/lua/rules.mak @@ -48,10 +48,6 @@ lua: lua-$(LUA_VERSION).tar.gz .sum-lua $(APPLY) $(SRC)/lua/no-dylibs.patch $(APPLY) $(SRC)/lua/no-localeconv.patch $(APPLY) $(SRC)/lua/lua-android-log2.patch -ifdef HAVE_WINSTORE - $(APPLY) $(SRC)/lua/winrt-nopopen.patch - $(APPLY) $(SRC)/lua/winrt-nosystem.patch -endif ifdef HAVE_DARWIN_OS (cd $(UNPACK_DIR) && \ sed -e 's%gcc%$(CC)%' \ diff --git a/contrib/src/lua/winrt-nopopen.patch b/contrib/src/lua/winrt-nopopen.patch deleted file mode 100644 index 3218888..0000000 --- a/contrib/src/lua/winrt-nopopen.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- lua/src/liolib.c.orig 2016-04-06 13:42:39.215028405 +0200 -+++ lua/src/liolib.c 2016-04-06 13:48:24.006744226 +0200 -@@ -58,11 +58,6 @@ - #define l_popen(L,c,m) (fflush(NULL), popen(c,m)) - #define l_pclose(L,file) (pclose(file)) - --#elif defined(LUA_USE_WINDOWS) /* }{ */ -- --#define l_popen(L,c,m) (_popen(c,m)) --#define l_pclose(L,file) (_pclose(file)) -- - #else /* }{ */ - - /* ISO C definitions */ diff --git a/contrib/src/lua/winrt-nosystem.patch b/contrib/src/lua/winrt-nosystem.patch deleted file mode 100644 index b08ff3a..0000000 --- a/contrib/src/lua/winrt-nosystem.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- lua/src/loslib.c.orig 2016-04-06 14:04:30.614773245 +0200 -+++ lua/src/loslib.c 2016-04-06 14:05:40.694941331 +0200 -@@ -127,18 +127,6 @@ - - - --static int os_execute (lua_State *L) { -- const char *cmd = luaL_optstring(L, 1, NULL); -- int stat = system(cmd); -- if (cmd != NULL) -- return luaL_execresult(L, stat); -- else { -- lua_pushboolean(L, stat); /* true if there is a shell */ -- return 1; -- } --} -- -- - static int os_remove (lua_State *L) { - const char *filename = luaL_checkstring(L, 1); - return luaL_fileresult(L, remove(filename) == 0, filename); -@@ -366,7 +354,6 @@ - {"clock", os_clock}, - {"date", os_date}, - {"difftime", os_difftime}, -- {"execute", os_execute}, - {"exit", os_exit}, - {"getenv", os_getenv}, - {"remove", os_remove}, _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
