Update for 1.2.10 and slackware64

1 files changed, 19 insertions, 32 deletions

diff --git a/libdvdcss/build/libdvdcss.SlackBuild b/libdvdcss/build/libdvdcss.SlackBuild
index 9b868df8..6ad37dc2 100755
--- a/libdvdcss/build/libdvdcss.SlackBuild
+++ b/libdvdcss/build/libdvdcss.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright (c) 2006-2008 Eric Hameleers <alien@slackware.com>
+# Copyright (c) 2006-2009  Eric Hameleers, Eindhoven, The Netherlands
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -40,8 +40,10 @@
 #            * New SlackBuild template.
 # 1.2.9-3:   21/Jun/2008 by Eric Hameleers <alien@slackware.com>
 #            * New SlackBuild template.
+# 1.2.10-1:  01/feb/2009 by Eric Hameleers <alien@slackware.com>
+#            * Update.
 # 
-# Run 'sh libdvdcss.SlackBuild --cleanup' to build a Slackware package.
+# Run 'sh libdvdcss.SlackBuild' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
 # Install using 'installpkg'. 
 #
@@ -50,9 +52,10 @@
 # Set initial variables:
 
 PRGNAM=libdvdcss
-VERSION=${VERSION:-1.2.9}
+VERSION=${VERSION:-1.2.10}
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-3}
+NUMJOBS=${NUMJOBS:-" -j7 "}
+BUILD=${BUILD:-1}
 TAG=${TAG:-alien}
 
 DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README doc/html"
@@ -79,15 +82,8 @@ trap 'echo "$0 FAILED at line $LINENO!" | tee $OUTPUT/error-${PRGNAM}.log' ERR
 set -u
 P1=${1:-1}
 
-# Slackware 11 and up need other option (gcc > 3.3.x)
-if [ $(gcc -dumpversion | tr -d  '.' |cut -c 1-2) -gt 33 ]; then
-  MOPT=tune
-else
-  MOPT=cpu
-fi
-
 case "$ARCH" in
-  i486)      SLKCFLAGS="-O2 -march=i486 -m${MOPT}=i686"
+  i486)      SLKCFLAGS="-O2 -march=i486 -mtune=i686"
              SLKLDFLAGS=""; LIBDIRSUFFIX=""
              ;;
   s390)      SLKCFLAGS="-O2"
@@ -144,11 +140,7 @@ echo "++"
 cd $TMP/tmp-$PRGNAM
 
 echo "Extracting the source archive(s) for $PRGNAM..."
-if $(file ${SOURCE} | grep -q ": bzip2"); then
-  tar -xjvf ${SOURCE}
-elif $(file ${SOURCE} | grep -q ": gzip"); then
-  tar -xzvf ${SOURCE}
-fi
+tar -xvf ${SOURCE}
 cd ${PRGNAM}-${VERSION}
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
@@ -161,14 +153,14 @@ CXXFLAGS="$SLKCFLAGS" \
             --libdir=/usr/lib${LIBDIRSUFFIX} \
             --localstatedir=/var \
             --sysconfdir=/etc \
-            --program-prefix="" \
-            --program-suffix="" \
+            --program-prefix= \
+            --program-suffix= \
             --build=$ARCH-slackware-linux \
             2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
 (cd doc && patch -p0 < $SRCDIR/${PRGNAM}_docMakefile.diff \
    2>&1 | tee $OUTPUT/patch-${PRGNAM}.log
 )
-make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
+make $NUMJOBS 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
 
 # Install all the needed stuff to the package dir
 # Use installwatch if available, to produce a logfile of the installation
@@ -186,15 +178,17 @@ cp -a test/csstest $PKG/usr/bin/
 # Add documentation:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
-cp -a $SRCDIR/$(basename $0) $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $SRCDIR/$(basename $0) | sed \
+  -e "/^VERSION=/s/:-.*}/:-$VERSION}/" \
+  -e "/^ARCH=/s/:-.*}/:-$ARCH}/" \
+  -e "/^BUILD=/s/:-.*}/:-$BUILD}/" \
+  > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION
 find $PKG/usr/doc -type f -exec chmod 644 {} \;
 
 # Strip binaries:
-cd $PKG
-find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-cd -
+find $PKG | xargs file | grep -e "executable" -e "shared object" \
+  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
 # Add a package description:
 mkdir -p $PKG/install
@@ -206,10 +200,3 @@ makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG
 cd $OUTPUT
 md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz.md5
 cd -
-cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt
-
-# Clean up the extra stuff:
-if [ "$P1" = "--cleanup" ]; then
-  rm -rf $TMP/tmp-$PRGNAM
-  rm -rf $PKG
-fi