Port the enhancements made in vlcgit.SlackBuild into this script

1 files changed, 25 insertions, 7 deletions

diff --git a/vlc/build/vlc.SlackBuild b/vlc/build/vlc.SlackBuild
index b9ff5c8d..00da9697 100755
--- a/vlc/build/vlc.SlackBuild
+++ b/vlc/build/vlc.SlackBuild
@@ -585,6 +585,7 @@ SRCURL[6]="http://downloads.sourceforge.net/lame/lame-$LAME.tar.gz"
 SRCPAT[6]="YES"
 USE[6]="YES"
 
+# DV video, used by most digital (firewire) camcorders:
 SOURCE[7]="$SRCDIR/libdv-${DV}.tar.gz"
 SRCURL[7]="http://downloads.sourceforge.net/libdv/libdv-${DV}.tar.gz"
 SRCPAT[7]="NO"
@@ -794,16 +795,19 @@ SRCURL[41]="http://sourceforge.net/projects/projectm/files/${PROJECTM}/projectM-
 SRCPAT[41]="NO"
 USE[41]="YES"
 
+# VAAPI for video hardware acceleration:
 SOURCE[42]="$SRCDIR/libva_${LIBVA}.tar.gz"
 SRCURL[42]="http://www.splitted-desktop.com/~gbeauchesne/libva/libva_${LIBVA}.tar.gz"
 SRCPAT[42]="NO"
 USE[42]="YES"
 
+# Mozilla xulrunner is used to build the browser plugin:
 SOURCE[43]="$SRCDIR/xulrunner-${XUL}.source.tar.bz2"
 SRCURL[43]="http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/${XUL}/source/xulrunner-${XUL}.source.tar.bz2"
 SRCPAT[43]="NO"
 USE[43]="YES"
 
+# Google's VP8 codec:
 SOURCE[44]="$SRCDIR/libvpx-${VPX}.tar.bz2"
 SRCURL[44]="http://webm.googlecode.com/files/libvpx-${VPX}.tar.bz2"
 #SRCURL[44]=""
@@ -982,6 +986,7 @@ if [ "$STATIC_FFMPEG" != "YES" ]; then
   USE[6]="NO" # lame
   USE[8]="NO" # faac
   USE[35]="NO" # theora
+  USE[44]="NO" # vpx
 fi
 
 # Source file availability:
@@ -3075,13 +3080,7 @@ echo -e "**\n**  building the package ...\n**"
 #
 cd $TMP/tmp-$PRGNAM/${PRGNAM}-${SRCVER}
 
-# Use installwatch if available, to produce a logfile of the installation
-# process that is more easily readable:
-if $(which installwatch > /dev/null 2>&1); then
-  installwatch -o $OUTPUT/install-${PRGNAM}.log make DESTDIR=$PKG install
-else
-  make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
-fi
+make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
 
 # Even though I modified vlc-config to exclude access_mmap from building, it
 # does get built... so now we remove it forcibly:
@@ -3094,6 +3093,9 @@ fi
 # are adding support for it:
 if [ -d $VLCDEPSDIR/usr/share/vlc/projectM ]; then
   cp -a $VLCDEPSDIR/usr/share/vlc/projectM $PKG/usr/share/vlc/
+  # Add missing directory:
+  mkdir $PKG/usr/share/vlc/projectM/textures
+  # Replace fonts with symlinks to preserve space:
   rm $PKG/usr/share/vlc/projectM/fonts/*
   ln -sf /usr/share/fonts/TTF/DejaVuSans.ttf $PKG/usr/share/vlc/projectM/fonts/Vera.ttf
   ln -sf /usr/share/fonts/TTF/DejaVuSansMono.ttf $PKG/usr/share/vlc/projectM/fonts/VeraMono.ttf
@@ -3122,6 +3124,18 @@ if [ -x usr/bin/update-desktop-database ]; then
 2>&1
 fi
 
+# Update hicolor theme cache:
+if [ -d usr/share/icons/hicolor ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    chroot . /usr/bin/gtk-update-icon-cache -f -t usr/share/icons/hicolor 1> /dev/null 2> /dev/null
+  fi
+fi
+
+# Update the mime database:
+if [ -x usr/bin/update-mime-database ]; then
+  chroot . /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
 # Remove old cache data and regenerate the file:
 chroot . <<EOCR 2>/dev/null
 cd /usr/lib${LIBDIRSUFFIX}/vlc
@@ -3149,6 +3163,10 @@ gzip -9c doc/vlc.1 > $PKG/usr/man/man1/vlc.1.gz
 mkdir -p $PKG/$(cd /usr/share/vim/vim*/syntax ; pwd)
 cp extras/analyser/vlc.vim $PKG/$(cd /usr/share/vim/vim*/syntax ; pwd)/
 
+# Remove traces of our temporary install location from libtool files:
+find $PKG/usr/lib${LIBDIRSUFFIX} -name "*.la" -o -name "*.pc" \
+  | xargs sed -i -e "s#$VLCDEPSDIR##g"
+
 # Add package documentation:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 mv $PKG/usr/share/doc/vlc/* $PKG/usr/doc/$PRGNAM-$VERSION || true