Enable paramters --wrapvlcdeps and --unwrapvlcdeps which will speed up vlc package creation by building a tarball of pre-compiled support libraries

1 files changed, 113 insertions, 81 deletions

diff --git a/vlc/build/vlc-1.0.SlackBuild b/vlc/build/vlc-1.0.SlackBuild
index 9e3f1ec6..6a22651b 100755
--- a/vlc/build/vlc-1.0.SlackBuild
+++ b/vlc/build/vlc-1.0.SlackBuild
@@ -141,7 +141,7 @@
 # 0.9.8a-3:   28/dec/2008 by Eric Hameleers <alien@slackware.com>
 #             * Updated ffmpeg/x264 snapshots, made it build on x86_64 with the
 #               help of Attila Craciun.
-# 20090114-1: 22/jan/2009 by Eric Hameleers <alien@slackware.com>
+# 0.9.9-1:    28/jan/2009 by Eric Hameleers <alien@slackware.com>
 #             * Updated vlc/ffmpeg/x264 snapshots, fix default font for x86_64,
 #               fix DTS audio decoding on x86_64
 # 
@@ -290,8 +290,8 @@ FAAC=1.26
 FAAD2=2.6.1
 #FFMPEG=20080731
 #FFMPEG=r14080 # latest recommended version for 0.9.0 is r14080 (20080705)
-FFMPEG=r16707 # recommended version for 0.9.2 is r15261 (20080908)
-              # but I use 16707 (20090121)
+FFMPEG=r16849 # recommended version for 0.9.2 is r15261 (20080908)
+              # but I use 16849 (20090129)
 FLUID=1.0.8
 GGI=2.2.2
 GII=1.0.2
@@ -2222,7 +2222,7 @@ PATH="$VLCDEPSDIR/usr/bin:$PATH" \
             --enable-dc1394 \
             --with-dv-raw1394=$TMP/tmp-$PRGNAM/libraw1394-${RAW1394} \
             --with-dv-avc1394=$TMP/tmp-$PRGNAM/libavc1394-${AVC1394} \
-            --disable-dv \
+            --enable-dv \
             --enable-dvbpsi \
             --enable-dvdnav \
             --with-dvdnav-config-path=$VLCDEPSDIR/usr/bin \
@@ -2251,7 +2251,6 @@ PATH="$VLCDEPSDIR/usr/bin:$PATH" \
             --enable-speex \
             --with-speex-tree=$TMP/tmp-$PRGNAM/speex-$SPEEX \
             --enable-x264 \
-            --with-x264-tree=$TMP/tmp-$PRGNAM/x264-snapshot-$X264 \
             --enable-a52 \
             --with-a52-tree=$TMP/tmp-$PRGNAM/a52dec-$A52 \
             --enable-faad \
@@ -2276,18 +2275,22 @@ PATH="$VLCDEPSDIR/usr/bin:$PATH" \
             # Enabled by default:
             #--enable-dca \
             #--with-dca-tree=$TMP/tmp-$PRGNAM/libdca-$DCA \
+            # Use installed vlcdeps library:
+            #--with-x264-tree=$TMP/tmp-$PRGNAM/x264-snapshot-$X264 \
 
             # 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-dv \
             #--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 \
+
             # Got errors about missing sdt.h in ./modules/access/dvb/access.c
             #--with-dvbpsi-tree=$TMP/tmp-$PRGNAM/libdvbpsi5-${DVBPSI} \
 
@@ -2309,7 +2312,8 @@ PATH="$VLCDEPSDIR/usr/bin:$PATH" \
 sed -i -e "s/dtstospdif /dtstofloat32 dtstospdif /" vlc-config
 
 # Now, we are ready for the compile:
-make -j${JOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
+#make -j${JOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
+make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
 
 cd $OLDDIR
 }
@@ -2445,86 +2449,114 @@ fi
 # - now call them one by one:
 # -----------------------------------------------------------------------------
 
-#if [ "xy" == "x" ]; then
-# CD/VCD image support:
-# Circular dependencies need these loops:
-make_cdio --disable-vcd-info
-make_vcd
-make_cdio
+if echo "$*" | grep -qw -- --unwrapvlcdeps ; then
+  # We use a tarball with precompiled binaries instead of compiling all
+  # dependencies at this moment (saves time when all we change is VLC code):
+  cd $TMP/tmp-$PRGNAM
+  echo "Extracting tarball with pre-compiled binary library code..."
+  tar -xvf $SRCDIR/$PRGNAM-vlcdeps-$ARCH.tar.bz2
+  #find . -name "*.la" -exec sed -i -e "s#/usr/share/vlcdeps/#$TMP/tmp-$PRGNAM#g" {} \;
+  find . -name "*.la" -exec sed -i -e "s#/mnt/hd#$TMP#g" {} \;
+  cd -
 
-# vlc wants this, but cdio chokes with "cannot find -lcddb" so build it after
-# cdio (which only used cddb for the cd-info binary which we don't use):
-make_cddb
+else
+  #if [ "xy" == "x" ]; then
+  # CD/VCD image support:
+  # Circular dependencies need these loops:
+  make_cdio --disable-vcd-info
+  make_vcd
+  make_cdio
+
+  # vlc wants this, but cdio chokes with "cannot find -lcddb" so build it after
+  # cdio (which only used cddb for the cd-info binary which we don't use):
+  make_cddb
+
+  # DVD support:
+  # I can not get dvdcss statically linked into libdvdread:
+  #make_dvdcss
+  make_dvdread
+  make_dvdnav
+
+  if [ "$STATIC_FFMPEG" == "YES" ]; then
+    # Needed before ffmpeg:
+    make_theora
+    # Only use patented code if we are allowing it:
+    if [ "${USE_PATENTS}" == "YES" ]; then
+      make_lame
+      make_amrnb
+      make_amrwb
+      make_faac
+    fi
 
-# DVD support:
-# I can not get dvdcss statically linked into libdvdread:
-#make_dvdcss
-make_dvdread
-make_dvdnav
-
-if [ "$STATIC_FFMPEG" == "YES" ]; then
-  # Needed before ffmpeg:
-  make_theora
-  # Only use patented code if we are allowing it:
-  if [ "${USE_PATENTS}" == "YES" ]; then
-    make_lame
-    make_amrnb
-    make_amrwb
-    make_faac
+    # ffmpeg uses the above static libraries:
+    make_ffmpeg
   fi
 
-  # ffmpeg uses the above static libraries:
-  make_ffmpeg
-fi
+  # qt4 is used for the vlc gui:
+  if [ "$STATIC_QT4" = "YES" ]; then
+    make_qt4
+    # These 800MB are too much for my virtual machine :
+    [ "${SPACE_CONSTRAINED}" == "YES" ] && rm -rf $TMP/tmp-$PRGNAM/qt-x11-opensource-src-${QT4}
+  fi
 
-# qt4 is used for the vlc gui:
-if [ "$STATIC_QT4" = "YES" ]; then
-  make_qt4
-  # These 800MB are too much for my virtual machine :
-  [ "${SPACE_CONSTRAINED}" == "YES" ] && rm -rf $TMP/tmp-$PRGNAM/qt-x11-opensource-src-${QT4}
+  # Additional libraries that vlc will use:
+  make_faad2
+  make_a52
+  make_dca
+  make_ebml
+  make_matroska
+  make_libmpeg2
+  make_mpcdec
+  make_twolame
+  #make_daap
+  make_upnp
+  make_oil
+  make_schroedinger
+  make_x264
+  make_live555
+  make_ass
+  make_fluid
+  make_1394
+
+  # Leave these out for now (0.9.0. testing phase)
+  #make_goom
+  #make_ggi
+
+  make_dv
+  make_dvbpsi
+
+  # Speex before shout and vlc:
+  make_speex
+  make_shout
+
+  #fi # End  ( "xy" == "x" )
 fi
 
-# Additional libraries that vlc will use:
-make_faad2
-make_a52
-make_dca
-make_ebml
-make_matroska
-make_libmpeg2
-make_mpcdec
-make_twolame
-#make_daap
-make_upnp
-make_oil
-make_schroedinger
-make_x264
-make_live555
-make_ass
-make_fluid
-make_1394
-
-# Leave these out for now (0.9.0. testing phase)
-#make_goom
-#make_ggi
-#make_dv
-
-make_dvbpsi
-
-# Speex before shout and vlc:
-make_speex
-make_shout
-
-#fi # End  ( "xy" == "x" )
-
-# And finally, let vlc collect all of the above into one app:
-make_vlc
-
-# Should we also build a package for the mozilla plugin?
-if [ "$MOZPLUGIN" == "YES" ]; then
-  build_mozplugin
-fi
+if echo "$*" | grep -qw -- --wrapvlcdeps ; then
+  # Wrap the vlcdeps tree with all pre-compiled dependencies into a tarball:
+  cd $TMP/tmp-$PRGNAM
+  tar -jcf $OUTPUT/$PRGNAM-vlcdeps-$ARCH.tar.bz2 \
+    vlcdeps \
+    live \
+    speex-$SPEEX \
+    a52dec-$A52 \
+    faad2 \
+    twolame-$TWOLAME \
+    libraw1394-${RAW1394} \
+    libavc1394-${AVC1394}
+  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'..."
+  cd -
+else
+  # Compile VLC using all the precompiled static libs in $VLCDEPSDIR :
+  make_vlc
 
-# Pack all this stuff into a Slackware package (this routine also will execute
-# the '--cleanup' functionality if requested):
-build_slackpkg "$*"
+  # Should we also build a package for the mozilla plugin?
+  if [ "$MOZPLUGIN" == "YES" ]; then
+    build_mozplugin
+  fi
 
+  # Pack all this stuff into a Slackware package (this routine also will execute
+  # the '--cleanup' functionality if requested):
+  build_slackpkg "$*"
+fi