Contrib: Include lua as a contrib lib. (Please review for your arch).

diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap
index 220c768614e14b1fe1c5173c229a0907a7f431e1..0eb3c6acf0778f6be5036735030754d8e31cbdb3 100755 (executable)
--- a/extras/contrib/bootstrap
+++ b/extras/contrib/bootstrap
@@ -69,6 +69,26 @@ if test "$HOST" != "$BUILD"; then
     AR="${HOST}-ar"
 fi
 
+# Check the HAVE_{OS}
+case $HOST in
+    *darwin*)
+        echo "HAVE_DARWIN_OS = 1" >> config.mak
+        echo "HAVE_BSD = 1" >> config.mak
+    ;;
+    *linux*)
+        echo "HAVE_LINUX = 1" >> config.mak
+    ;;
+    *bsd*)
+        echo "HAVE_BSD = 1" >> config.mak
+    ;;
+    *wince*)
+        echo "HAVE_WINCE = 1" >> config.mak
+    ;;
+    *beos*)
+        echo "HAVE_BEOS = 1" >> config.mak
+    ;;
+esac
+
 case $HOST in
     ppc-darwin)
 # Mac OS X < 10.4
@@ -83,7 +103,6 @@ case $HOST in
 # SDK 10.2.8 requires gcc-3.3 (so we cannot use that SDK)
            SDK_TARGET=10.4
            echo "SDK_TARGET = ${SDK_TARGET}" >> config.mak
-           echo "HAVE_DARWIN_OS = 1" >> config.mak
            echo "ENVP = MACOSX_DEPLOYMENT_TARGET=${SDK_TARGET}" >> config.mak
            echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.4u.sdk" >> config.mak
            CFLAGS_TUNING=" -arch ppc -mtune=G4"
@@ -95,7 +114,6 @@ case $HOST in
     i686-apple-darwin8)
            SDK_TARGET=10.4
            echo "SDK_TARGET = ${SDK_TARGET}" >> config.mak
-           echo "HAVE_DARWIN_OS = 1" >> config.mak
            echo "HAVE_DARWIN_OS_ON_INTEL = 1" >> config.mak
            echo "ENVP = MACOSX_DEPLOYMENT_TARGET=${SDK_TARGET}" >> config.mak
            echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.4u.sdk" >> config.mak
@@ -108,7 +126,6 @@ case $HOST in
     powerpc-apple-darwin9)
            SDK_TARGET=10.4
            echo "SDK_TARGET = ${SDK_TARGET}" >> config.mak
-           echo "HAVE_DARWIN_OS = 1" >> config.mak
 #          echo "ENVP = MACOSX_DEPLOYMENT_TARGET=${SDK_TARGET}" >> config.mak
 #          echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.4u.sdk" >> config.mak
            CFLAGS_TUNING=" -arch ppc -mtune=G4"
@@ -120,7 +137,6 @@ case $HOST in
     i686-apple-darwin9)
            SDK_TARGET=10.4
            echo "SDK_TARGET = ${SDK_TARGET}" >> config.mak
-           echo "HAVE_DARWIN_OS = 1" >> config.mak
            echo "HAVE_DARWIN_OS_ON_INTEL = 1" >> config.mak
 #          echo "ENVP = MACOSX_DEPLOYMENT_TARGET=${SDK_TARGET}" >> config.mak
 #          echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.4u.sdk" >> config.mak
@@ -131,7 +147,6 @@ case $HOST in
            cat src/Distributions/darwin.mak >> distro.mak
         ;;
     i586-pc-beos)
-            echo "HAVE_BEOS = 1" >> config.mak
             if test -f /boot/beos/system/lib/libbind.so; then
                 EXTRA_LDFLAGS=" -lbind -lsocket"
             else
@@ -173,7 +188,6 @@ case $HOST in
             cat src/Distributions/win32.mak >> distro.mak
         ;;
     arm-wince-pe)
-            echo "HAVE_WINCE = 1" >> config.mak
             echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak
             EXTRA_CPPFLAGS=" -D_WIN32_WCE"
             cat src/Distributions/wince.mak >> distro.mak

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 9809feeb632e9d8e52e5e57ef8a9bcbf79c80300..695b30e3dc614afcf07ddde870655acd2464f920 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -542,6 +542,43 @@ CLEAN_FILE += .id3tag
 CLEAN_PKG += libid3tag
 DISTCLEAN_PKG += libid3tag-$(LIBID3TAG_VERSION).tar.gz
 
+
+# ***************************************************************************
+# lua
+# ***************************************************************************
+
+ifdef HAVE_WIN32
+LUA_MAKEPLATEFORM=mingw
+else
+ifdef HAVE_DARWIN_OS
+LUA_MAKEPLATEFORM=macosx
+else
+ifdef HAVE_LINUX
+LUA_MAKEPLATEFORM=linux
+else
+ifdef HAVE_BSD
+LUA_MAKEPLATEFORM=bsd
+else
+LUA_MAKEPLATEFORM=generic
+endif
+endif
+endif
+endif
+
+lua-$(LUA_VERSION).tar.gz:
+       $(WGET) $(LUA_URL)
+
+lua: lua-$(LUA_VERSION).tar.gz
+       $(EXTRACT_GZ)
+
+.lua: lua
+       (cd $<; $(HOSTCC) make $(LUA_MAKEPLATEFORM) && make install INSTALL_TOP=$(PREFIX))
+       touch $@
+
+CLEAN_FILE += .lua
+CLEAN_PKG += lua
+DISTCLEAN_PKG += lua-$(LUA_VERSION).tar.gz
+
 # ***************************************************************************
 # libmad
 # ***************************************************************************

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 7edf803d32f60953e77044f53c932db26602f0b4..1cf1b7f4c212c9196cd48e1eb20caa205bd47a8e 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -189,3 +189,5 @@ ZVBI_VERSION=0.2.22
 ZVBI_URL=$(SF)/zapping/zvbi-$(ZVBI_VERSION).tar.bz2
 TAGLIB_VERSION=1.4
 TAGLIB_URL=http://developer.kde.org/~wheeler/files/src/taglib-$(TAGLIB_VERSION).tar.gz
+LUA_VERSION=5.1
+LUA_URL=http://www.lua.org/ftp/lua-$(LUA_VERSION).tar.gz