4 files changed, 57 insertions, 16 deletions
diff --git a/libraries/libdvdcss/libdvdcss-1.2.9-latex-character-encoding.patch b/libraries/libdvdcss/libdvdcss-1.2.9-latex-character-encoding.patch
new file mode 100644
index 0000000000..ab7bd89c85
--- /dev/null
+++ b/libraries/libdvdcss/libdvdcss-1.2.9-latex-character-encoding.patch
@@ -0,0 +1,24 @@
+Index: libdvdcss-1.2.9/src/dvdcss/dvdcss.h
+===================================================================
+--- libdvdcss-1.2.9.orig/src/dvdcss/dvdcss.h
++++ libdvdcss-1.2.9/src/dvdcss/dvdcss.h
+@@ -1,6 +1,6 @@
+ /**
+  * \file dvdcss.h
+- * \author Stéphane Borel <stef@via.ecp.fr>
++ * \author StÃ©phane Borel <stef@via.ecp.fr>
+  * \author Samuel Hocevar <sam@zoy.org>
+  * \brief The \e libdvdcss public header.
+  *
+diff -ur libdvdcss-1.2.9/doc/header.html libdvdcss-1.2.9-doc/doc/header.html
+--- libdvdcss-1.2.9/doc/header.html	2004-02-24 15:46:49.000000000 +0000
++++ libdvdcss-1.2.9-doc/doc/header.html	2007-05-29 14:17:24.000000000 +0100
+@@ -1,7 +1,7 @@
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+ <html>
+   <head>
+-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
++    <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
+     <title>libdvdcss documentation</title>
+     <link href="/main.css" rel="stylesheet" type="text/css">
+     <link href="/doxygen.css" rel="stylesheet" type="text/css">
diff --git a/libraries/libdvdcss/libdvdcss.SlackBuild b/libraries/libdvdcss/libdvdcss.SlackBuild
index 6be1c09018..4a1b5b99bc 100644
--- a/libraries/libdvdcss/libdvdcss.SlackBuild
+++ b/libraries/libdvdcss/libdvdcss.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libdvdcss
 
-# Copyright 2006  Robby Workman  (http://rlworkman.net)
+# Copyright 2006-2007  Robby Workman  (http://rlworkman.net)
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,14 +22,12 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified by the SlackBuilds.org project
-
 PRGNAM=libdvdcss
 VERSION=1.2.9
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
-CWD=`pwd`
+CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -40,14 +38,24 @@ elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG/usr $OUTPUT
-cd $TMP || exit 1
+cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xjvf $CWD/$PRGNAM-$VERSION.tar.bz2 || 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 .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+# Fix build error on docs with patch from Gentoo
+# Thanks to XGizzmo for sending the link :)
+patch -p1 < $CWD/libdvdcss-1.2.9-latex-character-encoding.patch
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -56,11 +64,10 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --enable-shared=yes \
-  --enable-static=no \
-  || exit 1
+  --enable-static=no
 
-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
@@ -68,7 +75,8 @@ make install DESTDIR=$PKG || exit 1
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING INSTALL NEWS README Changelog  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING INSTALL NEWS README ChangeLog \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/libraries/libdvdcss/libdvdcss.info b/libraries/libdvdcss/libdvdcss.info
index a7c0b52550..09ac3538f6 100644
--- a/libraries/libdvdcss/libdvdcss.info
+++ b/libraries/libdvdcss/libdvdcss.info
@@ -5,4 +5,4 @@ DOWNLOAD="http://download.videolan.org/pub/libdvdcss/1.2.9/libdvdcss-1.2.9.tar.b
 MD5SUM="553383d898826c285afb2ee453b07868"
 MAINTAINER="Robby Workman"
 EMAIL="rw@rlworkman.net"
-APPROVED="robw810"
+APPROVED="BP{k}"
diff --git a/libraries/libdvdcss/slack-desc b/libraries/libdvdcss/slack-desc
index 28f8bf9c3a..acd0bbd9bf 100644
--- a/libraries/libdvdcss/slack-desc
+++ b/libraries/libdvdcss/slack-desc
@@ -1,4 +1,12 @@
-libdvdcss: DVD decryption library
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+         |-----handy-ruler------------------------------------------------------|
+libdvdcss: libdvdcss (DVD decryption library)
 libdvdcss: 
 libdvdcss: libdvdcss is a cross-platform library for transparent DVD device
 libdvdcss: access with on-the-fly CSS decryption.  It is used by libdvdread
@@ -8,3 +16,4 @@ libdvdcss: drive to be region locked.
 libdvdcss:
 libdvdcss: Home Page: http://developers.videolan.org/libdvdcss/
 libdvdcss:
+libdvdcss: