Update to 1.0.1 ; also added lua embedded interpreter

1 files changed, 62 insertions, 22 deletions

diff --git a/vlc/build/vlc-1.0.SlackBuild b/vlc/build/vlc-1.0.SlackBuild
index 67c1caad..d735566f 100755
--- a/vlc/build/vlc-1.0.SlackBuild
+++ b/vlc/build/vlc-1.0.SlackBuild
@@ -166,7 +166,10 @@
 #               Also updated live plugin to 2009.06.02
 # 1.0.0-1:    06/jul/2009 by Eric Hameleers <alien@slackware.com>
 #             * VLC 1.0.0 has been released!
-#               Also added kate plugin.
+# 1.0.1-1:    28/jul/2009 by Eric Hameleers <alien@slackware.com>
+#             * An update that fixes a realrtsp vulnerability. Also updated
+#               x264/live555 snapshots and added support for lua playlist,
+#               metafetcher and interface plugins.
 # 
 # Run 'sh vlc.SlackBuild' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -197,9 +200,11 @@ TAG=${TAG:-"alien"}
 # SRCVER and VERSION values may be modified later!
 # If SRCVER is set to "HEAD" then you get a git snapshot, else we look
 # for the tarball in vlc's releases directory.
-SRCVER=${SRCVER:-"1.0.0"}
+SRCVER=${SRCVER:-"1.0.1"}
+# Other acceptible formats:
 #SRCVER=${SRCVER:-"20090114"}
 #SRCVER=${SRCVER:-"HEAD"}
+
 VERSION=${VERSION:-$(echo $SRCVER | tr '-' '.')}
 
 DOCS="ABOUT-NLS AUTHORS COPYING ChangeLog HACKING INSTALL MAINTAINERS \
@@ -246,10 +251,12 @@ USE_PATENTS=${USE_PATENTS:-"YES"}
 REQUIRE_YASM=${REQUIRE_YASM:-"YES"}
 
 # VLC uses Qt4 for it's GUI.
-# If you already have Qt4 installed, it will speed up the compilation a lot,
-# and create a smaller vlc package. Define STATIC_QT4="NO"
-# If you want an all-in package, define STATIC_QT4="YES":
-STATIC_QT4=${STATIC_QT4:-"YES"}
+# Slackware 13.0 already has Qt4 installed, this will speed up
+# the compilation a lot, and create a smaller vlc package.
+# In that case, define STATIC_QT4="NO" to use the system version of Qt4.
+# If you want an all-in package (including static version of Qt4), then
+# define STATIC_QT4="YES":
+STATIC_QT4=${STATIC_QT4:-"NO"}
 
 # VLC uses ffmpeg's avcodec for a lot of the AV processing.
 # If you already have ffmpeg installed, it will speed up the compilation a lot,
@@ -312,9 +319,10 @@ FLUID=1.0.9
 GGI=2.2.2
 GII=1.0.2
 GOOM=2k4-0
-KATE="0.3.3"
+KATE=0.3.3
 LAME=398-2
 LIVE=latest
+LUA=5.1.4
 MATROSKA=0.8.1
 MPCDEC=1.2.6
 MPEG2DEC=0.5.1
@@ -331,7 +339,7 @@ UPNP=1.6.6
 VCD=0.7.23
 X264_SAFE=20080301-2245 # In later versions nasm complains
                         #   about 'function hidden'
-X264=20090608-2245      # Needs yasm installed
+X264=20090726-2245      # Needs yasm installed
 
 # Determine what X we're running (the modular X returns the prefix
 # in the next command, while older versions stay silent):
@@ -359,7 +367,7 @@ if ! which yasm >/dev/null 2>&1 ; then
   else
     echo "## Aborting the build - set the internal script variable:"
     echo "##   REQUIRE_YASM to 'NO' if you don't have yasm installed,"
-    echo "##   and want to fall back to an old (but still useable)"
+    echo "##   and want to fall back to an old (hopefully still useable)"
     echo "##   version of X264 that builds with nasm instead."
     echo "##"
     exit 1
@@ -635,6 +643,12 @@ SRCURL[41]="http://libtiger.googlecode.com/files/libtiger-${TIGER}.tar.gz"
 SRCPAT[41]="NO"
 USE[41]="YES"
 
+# Lua - embedded interpreter for lua playlist, metafetcher and interface plugins
+SOURCE[42]="$SRCDIR/lua-${LUA}.tar.gz"
+SRCURL[42]="http://www.lua.org/ftp/lua-${LUA}.tar.gz"
+SRCPAT[42]="NO"
+USE[42]="YES"
+
 # CSS decoding- VLC can do without if you install an external libdvdcss package.
 #SOURCE[XX]="$SRCDIR/libdvdcss-${DVDCSS}.tar.bz2"
 #SRCURL[XX]="http://download.videolan.org/pub/libdvdcss/${DVDCSS}/libdvdcss-${DVDCSS}.tar.bz2"
@@ -2213,6 +2227,33 @@ cd -
 
 
 # -----------------------------------------------------------------------------
+# Compile lua
+# -----------------------------------------------------------------------------
+make_lua()
+{
+echo -e "**\n**  lua ...\n**"
+cd $TMP/tmp-$PRGNAM/lua-${LUA}
+
+# Make it use our CFLAGS:
+sed -i "s/-DLUA_USE_LINUX/\"-DLUA_USE_LINUX $SLKCFLAGS\"/g" src/Makefile
+
+MYLDFLAGS="$SLKLDFLAGS -ld" make linux -j${JOBS} \
+  2>&1 | tee $OUTPUT/make-${PRGNAM}_lua.log
+# Install lua into a temp location so vlc can pickup the library
+make install INSTALL_TOP=$VLCDEPSDIR/usr \
+  2>&1 | tee -a $OUTPUT/make-${PRGNAM}_lua.log
+# Install a pkg-config file:
+install -D -m 0644 etc/lua.pc $VLCDEPSDIR/usr/lib/pkgconfig/lua.pc
+# Who knows this is required:
+sed -i "/^prefix=/s#/usr/local#/usr#" etc/lua.pc
+# Add DOCS to the vlcdeps to have it added to vlc package later:
+mkdir -p $VLCDEPSDIR/doc/lua
+cp COPYRIGHT HISTORY README $VLCDEPSDIR/doc/lua/ || true
+cd -
+}
+
+
+# -----------------------------------------------------------------------------
 # VLC
 # -----------------------------------------------------------------------------
 make_vlc()
@@ -2339,11 +2380,14 @@ PATH="$VLCDEPSDIR/usr/bin:$PATH" \
             --disable-debug \
             --disable-testsuite \
             --disable-static \
+	    --disable-gnomevfs \
+            --disable-zvbi \
+            --disable-snapshot \
             --enable-shared \
             --enable-release \
             --enable-optimize-memory=no \
             --enable-qt4 \
-	    --disable-gnomevfs \
+            --enable-lua \
             --enable-pvr \
             --enable-dc1394 \
             --with-dv-raw1394=$TMP/tmp-$PRGNAM/libraw1394-${RAW1394} \
@@ -2359,13 +2403,13 @@ PATH="$VLCDEPSDIR/usr/bin:$PATH" \
             --enable-svg \
             --enable-svgalib \
             --enable-telx \
-            --disable-zvbi \
-            --disable-snapshot \
             --enable-libass \
             --enable-v4l \
             --enable-caca \
             --enable-aa \
+            --enable-ggi \
             --disable-galaktos \
+            --enable-switcher \
             --enable-upnp \
             --enable-flac \
             --enable-shout \
@@ -2406,12 +2450,8 @@ PATH="$VLCDEPSDIR/usr/bin:$PATH" \
             # Libdvdnav is now the default (which uses libdvdread in turn)
             #--enable-dvdread \
             #--with-dvdread-tree=$TMP/tmp-$PRGNAM/libdvdread-$DVDREAD \
-            # Disabled for now (note dvb is now explicitly disabled
-            # above or else you get compile errors):
-            #--enable-ggi \
             #--enable-goom \
             #--with-goom-tree=$TMP/tmp-$PRGNAM/goom$GOOM \
-            #--enable-switcher \
 
             # Sometimes skins support breaks and we'll have to disable it:
             #--disable-skins2 \
@@ -2642,10 +2682,10 @@ else
   make_1394
   make_kate
   make_tiger
+  make_lua
 
-  # Leave these out for now (0.9.0. testing phase)
-  #make_goom
-  #make_ggi
+  make_goom
+  make_ggi
 
   make_dv
   make_dvbpsi
@@ -2662,13 +2702,13 @@ if echo "$*" | grep -qw -- --wrapvlcdeps ; then
   cd $TMP/tmp-$PRGNAM
   tar -jcf $OUTPUT/$PRGNAM-vlcdeps-$ARCH.tar.bz2 \
     vlcdeps \
-    live \
-    speex-$SPEEX \
     a52dec-$A52 \
     faad2-$FAAD2 \
-    twolame-$TWOLAME \
     libraw1394-${RAW1394} \
     libavc1394-${AVC1394} \
+    live \
+    speex-$SPEEX \
+    twolame-$TWOLAME \
     x264-snapshot-$X264
   find . -name "*.la" -exec sed -i -e "s#$TMP/tmp-$PRGNAM#/usr/share/vlcdeps#g" {} \;
   echo "Created vlcdeps binary tarball in '$OUTPUT/$PRGNAM-vlcdeps-$ARCH.tar.bz2'..."