multimedia/mplayer: Updated for version svn_20090413

5 files changed, 38 insertions, 43 deletions

diff --git a/multimedia/mplayer/README b/multimedia/mplayer/README
index b261eef7b3833..67da873a07801 100644
--- a/multimedia/mplayer/README
+++ b/multimedia/mplayer/README
@@ -1,9 +1,9 @@
-MPlayer plays most MPEG, VOB, AVI, OGG/OGM, VIVO, ASF/WMA/WMV, QT/MOV/MP4, 
-FLI, RM, NuppelVideo, YUV4MPEG, FILM, RoQ, PVA files, supported by many 
-native, XAnim, and Win32 DLL codecs. You can watch VideoCD, SVCD, DVD, 3ivx, 
-DivX 3/4/5 and even WMV movies, too (without the avifile library). 
- 
-The required codecs are available from the MPlayer site, and we have a 
+MPlayer plays most MPEG, VOB, AVI, OGG/OGM, VIVO, ASF/WMA/WMV, QT/MOV/MP4,
+FLI, RM, NuppelVideo, YUV4MPEG, FILM, RoQ, PVA files, supported by many
+native, XAnim, and Win32 DLL codecs. You can watch VideoCD, SVCD, DVD, 3ivx,
+DivX 3/4/5 and even WMV movies, too (without the avifile library).
+
+The required codecs are available from the MPlayer site, and we have a
 SlackBuild script for them as well.  If you have already installed the
 codecs on your own, then make sure the CODECSDIR variable in the script
 is defined correctly (or pass the correct value on the command line when
@@ -22,9 +22,5 @@ You can speed-up decoding and encoding by passing RUNTIME_CPU=no to the build
 script.
 
 MPlayer supports DVD-Menu-Navigation; for it to work as expected, you will
-need the run the script with DVDNAV=yes and have the external libdvdnav
-package installed.  This will disable MPlayer's internal libdvdread and 
-rely on the libdvdread version installed by libdvdnav. Only with this option
-set will you be able to navigate through the menus.  Additionally, you need
-to either write "mouse-movements=yes" into your mplayer.conf or start mplayer
+need to either write "mouse-movements=yes" into your mplayer.conf or start mplayer
 as "mplayer dvdnav:// -mouse-movements"
diff --git a/multimedia/mplayer/doinst.sh b/multimedia/mplayer/doinst.sh
index 7896df199e1dc..1381c7ce40660 100644
--- a/multimedia/mplayer/doinst.sh
+++ b/multimedia/mplayer/doinst.sh
@@ -17,3 +17,9 @@ if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications
 fi
 
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
+
diff --git a/multimedia/mplayer/mplayer.SlackBuild b/multimedia/mplayer/mplayer.SlackBuild
index 80d71ce8d2570..b074372775ddf 100644
--- a/multimedia/mplayer/mplayer.SlackBuild
+++ b/multimedia/mplayer/mplayer.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for MPlayer
 
-# Copyright 2006-2008  Robby Workman, Northport, AL, USA
+# Copyright 2006-2009  Robby Workman, Northport, AL, USA
 # Copyright 2007-2008  Eric Hameleers <alien@slackware.com>
 # All rights reserved.
 #
@@ -26,7 +26,7 @@
 # Thanks to Heinz Wiesinger and Niki Kovacs for suggestions and code
 
 PRGNAM=mplayer
-VERSION=${VERSION:-svn_r27865}
+VERSION=${VERSION:-svn_20090413}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
@@ -55,18 +55,6 @@ else
     do_cpu="dis"
 fi
 
-# This will configure MPlayer with correct support for DVD Menus.
-# MPlayer will normally find libdvdnav automatically if the correct version 
-# is installed. However, only with this option set to "yes" (and the external
-# libdvdnav installed) will you be able to navigate through the menus.
-DVDNAV=${DVDNAV:-no}
-
-if [ "$DVDNAV" = "yes" ]; then
-    do_dvdnav="--disable-dvdread-internal"
-else
-    do_dvdnav=""
-fi
-
 # The default MPlayer theme is Blue
 # http://www.mplayerhq.hu/MPlayer/skins/Blue-1.7.tar.bz2
 # Others may work fine here, but the script has not been tested with them
@@ -76,13 +64,13 @@ THEME=Blue
 THEME_VERSION=1.7
 
 # The fonts listed below should exist on a stock Slackware system.
-# If you want to change the default font after installation, that is probably 
+# If you want to change the default font after installation, that is probably
 # best done by making a link to your preferred font in $HOME/.mplayer/ by:
 #   cd $HOME/.mplayer
-#   ln -s /path/to/preferred/font subfont.ttf 
+#   ln -s /path/to/preferred/font subfont.ttf
 OSDFONTS="LiberationSans-Regular.ttf DejaVuSans.ttf Arialuni.ttf arial.ttf Vera.ttf"
 
-# Change this with something like:  LANGUAGES=cs ./MPlayer.SlackBuild 
+# Change this with something like:  LANGUAGES=cs ./MPlayer.SlackBuild
 # Choices are: bg cs de dk el en es fr hu it ja ko mk nb
 #              nl pl ro ru sk sv tr uk pt_BR zh_CN zh_TW
 # If you need more than one, they should be comma-separated -- e.g. "en,es,pt_BR"
@@ -105,7 +93,7 @@ find . \
 
 # The MPlayer developers will not support and/or deal with bug reports
 # using custom CFLAGS, and the intent here is not to build a redistributable
-# package anyway, we won't :-)
+# package anyway, so we won't :-)
 ./configure \
   --prefix=/usr \
   --mandir=/usr/man \
@@ -115,21 +103,24 @@ find . \
   --enable-menu \
   --${do_cpu}able-runtime-cpudetection \
   --codecsdir="$CODECSDIR" \
-  --language="$LANGUAGES" \
-  $do_dvdnav
+  --language="$LANGUAGES"
 
 make
 make install DESTDIR=$PKG
 
 # Now let's build the html docs
 ( cd DOCS/xml
-  for i in $(echo $LANGUAGES | tr , ' ') ; do 
-    make html-single-$i ;
+  for i in $(echo $LANGUAGES | tr , ' ') ; do
+    make MAKEFLAGS="-j1" html-single-$i ;
   done
 )
 
-( find $PKG | xargs file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null )
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null || true
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
+)
 
 ( cd $PKG/usr/man
   find . -type f -exec gzip -9 {} \;
@@ -157,11 +148,13 @@ else
 fi
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS Changelog Copyright LICENSE README DOCS/tech \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS Changelog Copyright LICENSE README DOCS/tech \
+    $PKG/usr/doc/$PRGNAM-$VERSION
 # This isn't exactly ideal, but it's better than having the entire
 # script fail simply because the docs wouldn't build
 ( cp -a DOCS/HTML-single $PKG/usr/doc/$PRGNAM-$VERSION/html 2>/dev/null )
+find $PKG/usr/doc/$PRGNAM-$VERSION -type d -name '.svn' | xargs rm -rf 
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 # Don't clobber an existing config file
@@ -178,9 +171,9 @@ cat << EOF >> $PKG/install/doinst.sh
 if [ ! -f usr/share/mplayer/subfont.ttf ]; then
   for font in $OSDFONTS ; do
     if [ -f usr/share/fonts/TTF/\$font ]; then
-      ( cd usr/share/mplayer 
+      ( cd usr/share/mplayer
         rm -f subfont.ttf
-        ln -fs /usr/share/fonts/TTF/\$font subfont.ttf 
+        ln -fs /usr/share/fonts/TTF/\$font subfont.ttf
       )
       break
     fi
diff --git a/multimedia/mplayer/mplayer.info b/multimedia/mplayer/mplayer.info
index b24c367312e23..82a5aaf2ab089 100644
--- a/multimedia/mplayer/mplayer.info
+++ b/multimedia/mplayer/mplayer.info
@@ -1,8 +1,8 @@
 PRGNAM="mplayer"
-VERSION="svn_r27865"
+VERSION="svn_20090413"
 HOMEPAGE="http://www.mplayerhq.hu/"
-DOWNLOAD="http://slackbuilds.org/sources/12.1/mplayer-svn_r27865.tar.bz2"
-MD5SUM="b2d1bc8e297e39243e242119901240b8"
+DOWNLOAD="http://slackbuilds.org/sources/12.2/mplayer-svn_20090413.tar.bz2"
+MD5SUM="e238fb50d89b26df988d38d5d5266008"
 MAINTAINER="Robby Workman"
 EMAIL="rw@rlworkman.net"
 APPROVED="dsomero"
diff --git a/multimedia/mplayer/slack-desc b/multimedia/mplayer/slack-desc
index ef043df631c87..c28937c99d4a4 100644
--- a/multimedia/mplayer/slack-desc
+++ b/multimedia/mplayer/slack-desc
@@ -5,7 +5,7 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-       |-----handy-ruler----------------------------------------------------|
+       |-----handy-ruler-------------------------------------------------------|
 mplayer: mplayer (media player for *nix)
 mplayer:
 mplayer: Media player for linux (runs on many other Unices and non-x86