From 771124e1d3d4007ffd004eca6c6f39e820d9630b Mon Sep 17 00:00:00 2001
From: Heinz Wiesinger <pprkut@liwjatan.at>
Date: Thu, 13 May 2010 00:30:23 +0200
Subject: libraries/libdvdnav: Updated for version 4.1.3

---
 libraries/libdvdnav/README               | 2 --
 libraries/libdvdnav/libdvdnav.SlackBuild | 9 ++++++---
 libraries/libdvdnav/libdvdnav.info       | 2 ++
 3 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'libraries')

diff --git a/libraries/libdvdnav/README b/libraries/libdvdnav/README
index 94a0f754d2..55f8e76c37 100644
--- a/libraries/libdvdnav/README
+++ b/libraries/libdvdnav/README
@@ -1,5 +1,3 @@
 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 requires libdvdread, also available from Slackbuilds.org.
diff --git a/libraries/libdvdnav/libdvdnav.SlackBuild b/libraries/libdvdnav/libdvdnav.SlackBuild
index 69de66748c..8f6bed655a 100644
--- a/libraries/libdvdnav/libdvdnav.SlackBuild
+++ b/libraries/libdvdnav/libdvdnav.SlackBuild
@@ -35,10 +35,13 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e
@@ -58,11 +61,11 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --disable-static \
-  --build=$ARCH-slackware-linux \
-  --host=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux
 
 make
 make install-strip DESTDIR=$PKG
@@ -76,4 +79,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libdvdnav/libdvdnav.info b/libraries/libdvdnav/libdvdnav.info
index d67aebfabd..0553a8f8bb 100644
--- a/libraries/libdvdnav/libdvdnav.info
+++ b/libraries/libdvdnav/libdvdnav.info
@@ -3,6 +3,8 @@ VERSION="4.1.3"
 HOMEPAGE="http://www.mplayerhq.hu/design7/news.html"
 DOWNLOAD="http://www.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdnav-4.1.3.tar.bz2"
 MD5SUM="d62383c45b28816771e283515f2c27fa"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="ppr:kut"
 EMAIL="pprkut@liwjatan.at"
 APPROVED="Erik Hanson"
-- 
cgit v1.2.3