libraries/libdvdread: Updated for version 4.1.3

4 files changed, 41 insertions, 39 deletions

diff --git a/libraries/libdvdread/README b/libraries/libdvdread/README
index 0f24710af0..692e65236c 100644
--- a/libraries/libdvdread/README
+++ b/libraries/libdvdread/README
@@ -1,7 +1,4 @@
-libdvdread provides a simple foundation for reading DVD video 
-disks.  It provides the functionality that is required to access
-many DVDs.  It parses IFO files, reads NAV-blocks, and performs
+This is mplayer's fork of libdvdread. libdvdread provides a simple foundation
+for reading DVD video disks.  It provides the functionality that is required
+to access many DVDs.  It parses IFO files, reads NAV-blocks, and performs
 CSS authentication and descrambling.
-
-libdvdread conflicts with libdvdnav, as a modified version of libdvdread 
-is already included in libdvdnav.
\ No newline at end of file
diff --git a/libraries/libdvdread/libdvdread.SlackBuild b/libraries/libdvdread/libdvdread.SlackBuild
index aac614f23e..1ab1f25c7e 100644
--- a/libraries/libdvdread/libdvdread.SlackBuild
+++ b/libraries/libdvdread/libdvdread.SlackBuild
@@ -2,7 +2,8 @@
 
 # Slackware build script for libdvdread
 
-# Copyright 2006-2007  Robby Workman  (http://rlworkman.net)
+# Copyright 2006-2007 Robby Workman <http://rlworkman.net>
+# Copyright 2008 Heinz Wiesinger <pprkut@liwjatan.at>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,13 +24,13 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # Modified by the SlackBuilds.org project
-# Modified by core <eroc@linuxmail.org> for libdvdread-0.9.7
 
 PRGNAM=libdvdread
-VERSION=0.9.7
+VERSION=4.1.3
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -39,37 +40,41 @@ 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
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
+cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
-cd $PRGNAM-$VERSION || exit 1
+tar -xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R a-s,u+w,go+r-w .
 
+./autogen.sh
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  --enable-static=no \
-  --enable-shared=yes \
-  || exit 1
+  --disable-static \
+  --build=$ARCH-slackware-linux \
+  --host=$ARCH-slackware-linux
 
-make || exit 1
-make install DESTDIR=$PKG || exit 1 
+make
+make install DESTDIR=$PKG
 
-( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-)
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS ChangeLog COPYING INSTALL NEWS README TODO \
+cp -a AUTHORS ChangeLog COPYING DEVELOPMENT-POLICY.txt INSTALL NEWS README TODO \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/libraries/libdvdread/libdvdread.info b/libraries/libdvdread/libdvdread.info
index 26f4d2c0a0..0ac83a7852 100644
--- a/libraries/libdvdread/libdvdread.info
+++ b/libraries/libdvdread/libdvdread.info
@@ -1,8 +1,8 @@
 PRGNAM="libdvdread"
-VERSION="0.9.7"
-HOMEPAGE="http://www.dtek.chalmers.se/~dvd/downloads.shtml"
-DOWNLOAD="http://www.dtek.chalmers.se/groups/dvd/dist/libdvdread-0.9.7.tar.gz"
-MD5SUM="078788c9241ae16763529e1235502337"
-MAINTAINER="core"
-EMAIL="eroc@linuxmail.org"
-APPROVED="BP{k},rworkman"
+VERSION="4.1.3"
+HOMEPAGE="http://www.mplayerhq.hu/design7/news.html"
+DOWNLOAD="http://www2.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdread-4.1.3.tar.bz2"
+MD5SUM="6dc068d442c85a3cdd5ad3da75f6c6e8"
+MAINTAINER="ppr:kut"
+EMAIL="pprkut@liwjatan.at"
+APPROVED="Erik Hanson"
diff --git a/libraries/libdvdread/slack-desc b/libraries/libdvdread/slack-desc
index 4a01be8915..4bc8a79b8d 100644
--- a/libraries/libdvdread/slack-desc
+++ b/libraries/libdvdread/slack-desc
@@ -7,13 +7,13 @@
 
       |-----handy-ruler------------------------------------------------------|
 libdvdread: libdvdread (library for reading DVD video disks)
-libdvdread: 
-libdvdread: libdvdread provides a simple foundation for reading DVD video 
-libdvdread: disks.  It provides the functionality that is required to access
-libdvdread: many DVDs.  It parses IFO files, reads NAV-blocks, and performs
-libdvdread: CSS authentication and descrambling.
-libdvdread: 
-libdvdread: Homepage: http://www.dtek.chalmers.se/~dvd/downloads.shtml
-libdvdread: 
-libdvdread: 
-libdvdread: 
+libdvdread:
+libdvdread: This is mplayer's fork of libdvdread. libdvdread provides a
+libdvdread: simple foundation for reading DVD video disks. It provides the
+libdvdread: functionality that is required to access many DVDs. It parses
+libdvdread: IFO files, reads NAV-blocks, and performs CSS authentication and
+libdvdread: descrambling.
+libdvdread:
+libdvdread: Homepage: http://www.mplayerhq.hu/design7/news.html
+libdvdread:
+libdvdread: