[vlc-devel] [PATCH 3/6] Revert "Contribs: fix lua compilation with old Android versions"

[Rafaël Carré]

This reverts commit 651eff7e96e1a4a983d6ff161c7b8e07505ba203.
---
 contrib/src/lua/lua-android-log2.patch | 11 -----------
 contrib/src/lua/rules.mak              |  1 -
 2 files changed, 12 deletions(-)
 delete mode 100644 contrib/src/lua/lua-android-log2.patch

diff --git a/contrib/src/lua/lua-android-log2.patch b/contrib/src/lua/lua-android-log2.patch
deleted file mode 100644
index 8b55817..0000000
--- a/contrib/src/lua/lua-android-log2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lua/src/lmathlib.c	2016-03-16 16:13:27.593329107 +0100
-+++ lua/src/lmathlib.c.new	2016-03-16 16:13:05.285328491 +0100
-@@ -183,7 +183,7 @@
-     res = l_mathop(log)(x);
-   else {
-     lua_Number base = luaL_checknumber(L, 2);
--#if !defined(LUA_USE_C89)
-+#if !defined(LUA_USE_C89) && !defined(__ANDROID__)
-     if (base == 2.0) res = l_mathop(log2)(x); else
- #endif
-     if (base == 10.0) res = l_mathop(log10)(x);
diff --git a/contrib/src/lua/rules.mak b/contrib/src/lua/rules.mak
index 17b8cef..512c3c3 100644
--- a/contrib/src/lua/rules.mak
+++ b/contrib/src/lua/rules.mak
@@ -47,7 +47,6 @@ lua: lua-$(LUA_VERSION).tar.gz .sum-lua
 	$(APPLY) $(SRC)/lua/lua-noreadline.patch
 	$(APPLY) $(SRC)/lua/no-dylibs.patch
 	$(APPLY) $(SRC)/lua/no-localeconv.patch
-	$(APPLY) $(SRC)/lua/lua-android-log2.patch
 ifdef HAVE_DARWIN_OS
 	(cd $(UNPACK_DIR) && \
 	sed -e 's%gcc%$(CC)%' \
-- 
2.7.4