New build with updated libs and several new ones added, too

1 files changed, 32 insertions, 27 deletions

diff --git a/vlc/build/vlc-1.0.SlackBuild b/vlc/build/vlc-1.0.SlackBuild
index 92d5ded0..498f4258 100755
--- a/vlc/build/vlc-1.0.SlackBuild
+++ b/vlc/build/vlc-1.0.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright (c) 2007 Eric Hameleers <alien@slackware.com>
+# Copyright (c) 2007,2008 Eric Hameleers <alien@slackware.com>
 #
 #   Permission to use, copy, modify, and distribute this software for
 #   any purpose with or without fee is hereby granted, provided that
@@ -44,10 +44,11 @@
 #              Again, the resulting binary package requires no additional
 #              non-Slackware packages, except for libdvdcss in case you want
 #              to watch an encrypted DVD.
-# 20071218-1:18/dec/2007 by Eric Hameleers <alien@slackware.com>
-#            * Start using SVN snapshots. The 0.8.6d official release does
+# 0.8.6d.2:  29/jan/2008 by Eric Hameleers <alien@slackware.com>
+#            * Disable building AMR. The 0.8.6d official release does
 #              not have support for AMR audio codec re-added yet.
 #              Also, add the AAC en/decoder to the PATENTED software.
+#              Build with dll loader support only on 32bit platform.
 # 
 # Run 'sh vlc.SlackBuild --cleanup' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -85,9 +86,9 @@ USE_PATENTS=${USE_PATENTS:-"YES"}
 
 PRGNAM=vlc
 PRGNAM2=mozplugin
-VERSION=${VERSION:-"20071218"}
+VERSION=${VERSION:-"0.8.6d"}
 ARCH=${ARCH:-"i486"}
-BUILD=${BUILD:-"1"}
+BUILD=${BUILD:-"2"}
 
 DOCS="ABOUT-NLS AUTHORS COPYING ChangeLog HACKING INSTALL MAINTAINERS \
       NEWS README THANKS"
@@ -116,7 +117,7 @@ CDIO=0.78.2
 DAAP=0.4.0
 DC1394=1.2.2
 DCA=0.0.5
-DIRAC=0.8.0
+DIRAC=0.9.1
 DV=1.0.0
 DVBPSI=0.1.6
 DVDNAV=0.1.10
@@ -126,7 +127,7 @@ EBML=0.7.7
 FAAC=1.26
 FAAD2=2.6.1
 #FFMPEG=r10883 # (20071031) latest recommended version is r10461 (20070911)
-FFMPEG=20071218
+FFMPEG=20080128
 GGI=2.2.2
 GII=1.0.2
 GOOM=2k4-0
@@ -137,13 +138,13 @@ MPCDEC=1.2.6
 MPEG2DEC=0.4.1
 RAW1394=1.3.0
 SHOUT=2.2.2
-SPEEX=1.2beta2
+SPEEX=1.2beta3
 THEORA=1.0beta2
 TWOLAME=0.3.12
 VCD=0.7.21
 #WXGTK=2.8.7 # <-- does not work
 WXGTK=2.6.4
-X264=20071218-2245
+X264=20080128-2245
 
 # Determine what X we're running (the modular X returns the prefix
 # in the next command, while older versions stay silent):
@@ -173,7 +174,7 @@ OUTPUT=${OUTPUT:-"/tmp"}
 
 # VLC source
 SOURCE[0]="$SRCDIR/${PRGNAM}-${VERSION}.tar.bz2"
-#SRCURL[0]="http://download.videolan.org/pub/videolan/${PRGNAM}/${VERSION}/${PRGNAM}-${VERSION}.tar.bz2"
+SRCURL[0]="http://download.videolan.org/pub/videolan/${PRGNAM}/${VERSION}/${PRGNAM}-${VERSION}.tar.bz2"
 SRCURL[0]=""
 SRCPAT[0]="NO"
 
@@ -581,11 +582,6 @@ make_faac()
 {
 echo -e "**\n**  faac ...\n**"
 cd $TMP/tmp-$PRGNAM/faac
-#patch -p1 < $SRCDIR/faac_bootstrap.patch \
-#  2>&1 | tee  $OUTPUT/patch-${PRGNAM}_faac.log
-#patch -p1 < $SRCDIR/faac_pipe.patch \
-#  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}_faac.log
-
 sh bootstrap
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -676,7 +672,8 @@ fi
 
 # Only use patented code if we are allowing it:
 if [ "${USE_PATENTS}" == "YES" ]; then
-  USE_PATENTED="--enable-libmp3lame --enable-libamr-nb --enable-libamr-wb"
+  #USE_PATENTED="--enable-libmp3lame --enable-libamr-nb --enable-libamr-wb  --enable-libfaac"
+  USE_PATENTED="--enable-libmp3lame --enable-libfaac"
 else
   USE_PATENTED=" "
 fi
@@ -689,7 +686,6 @@ LDFLAGS="$SLKLDFLAGS" \
             ${USE_PATENTED} \
             --enable-libvorbis \
             --enable-libtheora \
-            --enable-libfaac \
             --enable-gpl \
             --enable-pp \
             --enable-pthreads \
@@ -1435,6 +1431,7 @@ make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_dc1394.log
 cd $OLDDIR
 }
 
+
 # -----------------------------------------------------------------------------
 # VLC
 # -----------------------------------------------------------------------------
@@ -1448,10 +1445,14 @@ echo "" >$OUTPUT/patch-${PRGNAM}.log
 cat $SRCDIR/vlc_deffont.patch | sed "s#@@XPREFIX@@#$XPREF#" | patch -p1 \
    2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
 
-# Fix support for recent versions of the dirac codec:
+# Fix support for 0.8.x versions of the dirac codec:
 # (see http://livna.org/pipermail/subversion/2007-October/007104.html)
 cat $SRCDIR/vlc_dirac-0.8.0-api.patch | patch -p1 \
   2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+# Fix support for 0.9.x versions of the dirac codec (apply after the previous):
+# (see http://trac.videolan.org/vlc/changeset/24672)
+cat $SRCDIR/vlc_dirac-0.9.0-api.patch | patch -p1 \
+  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
 
 ## Add support for AMR if compiled into static ffmpeg
 #cat $SRCDIR/vlc_amr.patch | patch -p0 \
@@ -1502,9 +1503,16 @@ fi
 
 # Only use patented code if we are allowing it:
 if [ "${USE_PATENTS}" == "YES" ]; then
-  DO_FFMPEG_PATENTED="--with-ffmpeg-mp3lame --with-ffmpeg-amrnb --with-fmpeg-amrwb"
+  DO_FFMPEG_PATENTED="--with-ffmpeg-mp3lame \
+     --enable-faad \
+     --with-faad-tree=$TMP/tmp-$PRGNAM/faad2 \
+     --with-ffmpeg-faac"
+     #  --with-ffmpeg-amrnb --with-fmpeg-amrwb
+  #DO_FFMPEG_LIBS_PAT="-lamrnb -lamrwb -lfaac -lmp3lame"
+  DO_FFMPEG_LIBS_PAT="-lfaac -lmp3lame"
 else
   DO_FFMPEG_PATENTED=" "
+  DO_FFMPEG_LIBS_PAT=""
 fi
 
 sh bootstrap
@@ -1578,8 +1586,6 @@ PKG_CONFIG_PATH="`pwd`/../vlcdeps/usr/lib/pkgconfig" \
             --enable-dirac \
             --enable-x264 \
             --with-x264-tree=$TMP/tmp-$PRGNAM/x264-snapshot-$X264 \
-            --enable-faad \
-            --with-faad-tree=$TMP/tmp-$PRGNAM/faad2 \
             --enable-a52 \
             --with-a52-tree=$TMP/tmp-$PRGNAM/a52dec-$A52 \
             --enable-live555 \
@@ -1594,7 +1600,6 @@ PKG_CONFIG_PATH="`pwd`/../vlcdeps/usr/lib/pkgconfig" \
             --with-ffmpeg-theora \
             --with-ffmpeg-vorbis \
             --with-ffmpeg-ogg \
-            --with-ffmpeg-faac \
             --with-ffmpeg-zlib \
             --with-ffmpeg-tree=$TMP/tmp-$PRGNAM/ffmpeg-${FFMPEG} \
             --with-wx-config-path=$TMP/tmp-$PRGNAM/wxGTK-${WXGTK} \
@@ -1602,7 +1607,7 @@ PKG_CONFIG_PATH="`pwd`/../vlcdeps/usr/lib/pkgconfig" \
             --program-prefix="" \
             --program-suffix="" \
             --build=i486-slackware-linux \
-            FFMPEG_LIBS="-lavformat -lavcodec -lz -lamrnb -lamrwb -lfaac -lmp3lame -ldl -ltheora -lvorbisenc -lavutil -lvorbis -lm -logg -lpostproc" \
+            FFMPEG_LIBS="-lavformat -lavcodec -lz ${DO_FFMPEG_LIBS_PAT} -ldl -ltheora -lvorbisenc -lavutil -lvorbis -lm -logg -lpostproc" \
             FFMPEG_CFLAGS="" \
             2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
             # Try without this... --disable-gtk \
@@ -1742,7 +1747,7 @@ fi
 # - now call them one by one:
 # -----------------------------------------------------------------------------
 
-if ( "xy" == "x" ); then
+#if ( "xy" == "x" ); then
 # CD/VCD image support:
 # Circular dependencies need these loops:
 make_cdio --disable-vcd-info
@@ -1766,8 +1771,8 @@ make_theora
 # Only use patented code if we are allowing it:
 if [ "${USE_PATENTS}" == "YES" ]; then
   make_lame
-  make_amrnb
-  make_amrwb
+  #make_amrnb
+  #make_amrwb
   make_faac
 fi
 
@@ -1802,7 +1807,7 @@ make_1394
 make_speex
 make_shout
 
-fi
+#fi # End  ( "xy" == "x" )
 
 # And finally, let vlc collect all of the above into one app:
 make_vlc