[vlc-commits] contribs: add lua

Rémi Denis-Courmont git at videolan.org
Tue Jun 28 18:45:30 CEST 2011


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Jun 27 13:52:50 2011 +0300| [b5d38779dad5e28c721379b38790114e10f40d21] | committer: Rémi Denis-Courmont

contribs: add lua

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b5d38779dad5e28c721379b38790114e10f40d21
---

 contrib/src/lua/SHA512SUMS           |    1 +
 contrib/src/lua/lua-noreadline.patch |   24 +++++++++++++
 contrib/src/lua/rules.mak            |   62 ++++++++++++++++++++++++++++++++++
 3 files changed, 87 insertions(+), 0 deletions(-)

diff --git a/contrib/src/lua/SHA512SUMS b/contrib/src/lua/SHA512SUMS
new file mode 100644
index 0000000..8b02bb7
--- /dev/null
+++ b/contrib/src/lua/SHA512SUMS
@@ -0,0 +1 @@
+bc542fe8535826ac1e49b03a8f238cf049724b02c14718f8162cfeaf735a5e6c58412ff18dbe7a38e4cc4433f3d1e702554e9b24b5f021634b4280880980f40f  lua-5.1.4.tar.gz
diff --git a/contrib/src/lua/lua-noreadline.patch b/contrib/src/lua/lua-noreadline.patch
new file mode 100644
index 0000000..862d3d1
--- /dev/null
+++ b/contrib/src/lua/lua-noreadline.patch
@@ -0,0 +1,24 @@
+LUA: do not use readline on Linux
+diff -ru lua-5.1/src/Makefile lua/src/Makefile
+--- lua-5.1/src/Makefile	2006-02-16 17:45:09.000000000 +0200
++++ lua/src/Makefile	2009-02-09 23:35:21.000000000 +0200
+@@ -92,7 +92,7 @@
+ 	$(MAKE) all MYCFLAGS=
+ 
+ linux:
+-	$(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses"
++	$(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl"
+ 
+ macosx:
+ 	$(MAKE) all MYCFLAGS=-DLUA_USE_MACOSX
+diff -ru lua-5.1/src/luaconf.h lua/src/luaconf.h
+--- lua-5.1/src/luaconf.h	2006-02-10 19:44:06.000000000 +0200
++++ lua/src/luaconf.h	2009-02-09 23:33:29.000000000 +0200
+@@ -36,7 +36,6 @@
+ #if defined(LUA_USE_LINUX)
+ #define LUA_USE_POSIX
+ #define LUA_USE_DLOPEN		/* needs an extra library: -ldl */
+-#define LUA_USE_READLINE	/* needs some extra libraries */
+ #endif
+ 
+ #if defined(LUA_USE_MACOSX)
diff --git a/contrib/src/lua/rules.mak b/contrib/src/lua/rules.mak
new file mode 100644
index 0000000..115b91e
--- /dev/null
+++ b/contrib/src/lua/rules.mak
@@ -0,0 +1,62 @@
+# Lua 5.1
+
+LUA_VERSION := 5.1.4
+LUA_URL := http://www.lua.org/ftp/lua-$(LUA_VERSION).tar.gz
+
+# Reverse priority order
+LUA_TARGET := generic
+ifdef HAVE_BSD
+LUA_TARGET := bsd
+endif
+ifdef HAVE_LINUX
+LUA_TARGET := linux
+endif
+ifdef HAVE_MACOSX
+LUA_TARGET := macosx
+endif
+ifdef HAVE_WIN32
+LUA_TARGET := mingw
+endif
+
+# Feel free to add autodetection if you need to...
+PKGS += lua
+
+$(TARBALLS)/lua-$(LUA_VERSION).tar.gz:
+	$(DOWNLOAD) $(LUA_URL)
+
+.sum-lua: $(TARBALLS)/lua-$(LUA_VERSION).tar.gz
+	$(CHECK_SHA512)
+	touch $@
+
+lua: $(TARBALLS)/lua-$(LUA_VERSION).tar.gz .sum-lua
+	$(UNPACK_GZ)
+	(cd $@-$(LUA_VERSION) && patch -p1) < $(SRC)/lua/lua-noreadline.patch
+ifdef HAVE_MACOSX
+	(cd $@-$(LUA_VERSION) && \
+	sed -e 's%gcc%$(CC)%' \
+		-e 's%LDFLAGS=%LDFLAGS=$(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)%' \
+		-i.orig src/Makefile)
+endif
+ifdef HAVE_WIN32
+	cd $@-$(LUA_VERSION) && sed -i.orig -e 's/lua luac/lua.exe/' Makefile
+endif
+	cd $@-$(LUA_VERSION)/src && sed -i.orig \
+		-e 's/CC=/#CC=/' \
+		-e 's/= *strip/=$(STRIP)/' \
+		-e 's/= *ranlib/= $(RANLIB)/' \
+		Makefile
+	mv $@-$(LUA_VERSION) $@
+	touch $@
+
+.lua: lua
+	cd $< && $(HOSTVARS) $(MAKE) $(LUA_TARGET)
+ifdef HAVE_WIN32
+	cd $</src && $(HOSTVARS) $(MAKE) liblua.a
+endif
+	cd $< && $(HOSTVARS) $(MAKE) install INSTALL_TOP="$(PREFIX)"
+ifdef HAVE_WIN32
+	cd $< && $(RANLIB) "$(PREFIX)/lib/liblua.a"
+	mkdir -p -- "$(PREFIX)/lib/pkgconfig"
+	cp $</etc/lua.pc "$(PREFIX)/lib/pkgconfig"
+endif
+	touch $@



More information about the vlc-commits mailing list