libraries/libdvdnav: Updated for version 4.1.3

4 files changed, 17 insertions, 33 deletions

diff --git a/libraries/libdvdnav/README b/libraries/libdvdnav/README
index 3d382ef64aa10..94a0f754d2d55 100644
--- a/libraries/libdvdnav/README
+++ b/libraries/libdvdnav/README
@@ -1,6 +1,5 @@
-This is mplayer's fork of libdvdnav. libdvdnav is a library that allows easy 
-use of sophisticated DVD navigation features such as DVD menus, multiangle 
+This is mplayer's fork of libdvdnav. libdvdnav is a library that allows easy
+use of sophisticated DVD navigation features such as DVD menus, multiangle
 playback, and even interactive DVD games.
 
-libdvdnav does conflict with libdvdread, as a modified version of libdvdread 
-is already included.  Most apps will work with this version too.
+libdvdnav requires libdvdread, also available from Slackbuilds.org.
diff --git a/libraries/libdvdnav/ifo_print.diff b/libraries/libdvdnav/ifo_print.diff
deleted file mode 100644
index 99e2c4290745d..0000000000000
--- a/libraries/libdvdnav/ifo_print.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- libdvdnav-4.1.1-orig/src/dvdread/ifo_print.h	2004-01-11 22:43:13.000000000 +0100
-+++ libdvdnav-4.1.1/src/dvdread/ifo_print.h	2008-04-01 10:31:18.000000000 +0200
-@@ -24,7 +24,7 @@
- #ifdef DVDNAV_COMPILE
- #  include "ifo_types.h"
- #else
--#  include <dvdnav/ifo_types.h> /*  Only for vm_cmd_t  */
-+#  include <dvdread/ifo_types.h> /*  Only for vm_cmd_t  */
- #endif
- 
- void ifo_print(dvd_reader_t *dvd, int title);
diff --git a/libraries/libdvdnav/libdvdnav.SlackBuild b/libraries/libdvdnav/libdvdnav.SlackBuild
index 68d7343387e38..69de66748c3da 100644
--- a/libraries/libdvdnav/libdvdnav.SlackBuild
+++ b/libraries/libdvdnav/libdvdnav.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libdvdnav
 
-# Copyright 2007-2008 Heinz Wiesinger <hmwiesinger@gmx.at>
+# Copyright 2007-2008 Heinz Wiesinger <pprkut@liwjatan.at>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,9 +23,9 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libdvdnav
-VERSION=4.1.1
+VERSION=4.1.3
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -37,6 +37,8 @@ if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
 fi
 
 set -e
@@ -45,13 +47,11 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-patch -p1 -i $CWD/ifo_print.diff
-
 ./autogen.sh
 
 CFLAGS="$SLKCFLAGS" \
@@ -60,17 +60,13 @@ CXXFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  --mandir=/usr/man \
-  --disable-static
+  --disable-static \
+  --build=$ARCH-slackware-linux \
+  --host=$ARCH-slackware-linux
 
 make
 make install-strip DESTDIR=$PKG
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS ChangeLog COPYING DEVELOPMENT-POLICY.txt \
   INSTALL NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/libraries/libdvdnav/libdvdnav.info b/libraries/libdvdnav/libdvdnav.info
index e835253cacce6..d67aebfabd425 100644
--- a/libraries/libdvdnav/libdvdnav.info
+++ b/libraries/libdvdnav/libdvdnav.info
@@ -1,8 +1,8 @@
 PRGNAM="libdvdnav"
-VERSION="4.1.1"
+VERSION="4.1.3"
 HOMEPAGE="http://www.mplayerhq.hu/design7/news.html"
-DOWNLOAD="http://www.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdnav-4.1.1.tar.gz"
-MD5SUM="91ff52cade291e79060f87fd431fa1ab"
+DOWNLOAD="http://www.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdnav-4.1.3.tar.bz2"
+MD5SUM="d62383c45b28816771e283515f2c27fa"
 MAINTAINER="ppr:kut"
-EMAIL="HMWiesinger@gmx.at"
-APPROVED="David Somero"
+EMAIL="pprkut@liwjatan.at"
+APPROVED="Erik Hanson"