summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libraries/libdvdcss/libdvdcss-1.2.9-latex-character-encoding.patch24
-rw-r--r--libraries/libdvdcss/libdvdcss.SlackBuild24
-rw-r--r--libraries/libdvdcss/libdvdcss.info8
3 files changed, 15 insertions, 41 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
deleted file mode 100644
index ab7bd89c85..0000000000
--- a/libraries/libdvdcss/libdvdcss-1.2.9-latex-character-encoding.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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 4a1b5b99bc..9c8f89f482 100644
--- a/libraries/libdvdcss/libdvdcss.SlackBuild
+++ b/libraries/libdvdcss/libdvdcss.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for libdvdcss
-# Copyright 2006-2007 Robby Workman (http://rlworkman.net)
+# Copyright 2006-2008 Robby Workman, Northport, Alabama, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,10 +23,11 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=libdvdcss
-VERSION=1.2.9
+VERSION=1.2.10
ARCH=${ARCH:-i486}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
+
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
@@ -41,7 +42,7 @@ fi
set -e
rm -rf $PKG
-mkdir -p $TMP $PKG/usr $OUTPUT
+mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
@@ -53,26 +54,23 @@ find . \
\( -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" \
./configure \
--prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
+ --mandir=/usr/man \
+ --docdir=/usr/doc/$PRGNAM-$VERSION \
--enable-shared=yes \
- --enable-static=no
+ --enable-static=no \
+ --build=$ARCH-slackware-linux
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 COPYING INSTALL NEWS README ChangeLog \
diff --git a/libraries/libdvdcss/libdvdcss.info b/libraries/libdvdcss/libdvdcss.info
index 09ac3538f6..9717b6f2c9 100644
--- a/libraries/libdvdcss/libdvdcss.info
+++ b/libraries/libdvdcss/libdvdcss.info
@@ -1,8 +1,8 @@
PRGNAM="libdvdcss"
-VERSION="1.2.9"
+VERSION="1.2.10"
HOMEPAGE="http://developers.videolan.org/libdvdcss/"
-DOWNLOAD="http://download.videolan.org/pub/libdvdcss/1.2.9/libdvdcss-1.2.9.tar.bz2"
-MD5SUM="553383d898826c285afb2ee453b07868"
+DOWNLOAD="http://download.videolan.org/pub/libdvdcss/1.2.10/libdvdcss-1.2.10.tar.bz2"
+MD5SUM="ebd5370b79ac5a83e5c61b24a214cf74"
MAINTAINER="Robby Workman"
EMAIL="rw@rlworkman.net"
-APPROVED="BP{k}"
+APPROVED="dsomero"