libdvdcss: updated to 1.4.3

1 files changed, 25 insertions, 25 deletions

diff --git a/libdvdcss/build/libdvdcss.SlackBuild b/libdvdcss/build/libdvdcss.SlackBuild
index 12029ee2..0ff269ea 100755
--- a/libdvdcss/build/libdvdcss.SlackBuild
+++ b/libdvdcss/build/libdvdcss.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright 2005-2011, 2013  Eric Hameleers, Eindhoven, The Netherlands
+# Copyright 2005-2011, 2013, 2021  Eric Hameleers, Eindhoven, The Netherlands
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -48,6 +48,8 @@
 #            * New release.
 # 1.2.13-1:  30/may/2013 by Eric Hameleers <alien@slackware.com>
 #            * New release.
+# 1.4.3-1:   31/dec/2021 by Eric Hameleers <alien@slackware.com>
+#            * Update.
 # 
 # Run 'sh libdvdcss.SlackBuild' to build a Slackware package.
 # The package (.txz) plus descriptive .txt file are created in /tmp .
@@ -56,8 +58,8 @@
 # -----------------------------------------------------------------------------
 
 PRGNAM=libdvdcss
-VERSION=${VERSION:-1.2.13}
-NUMJOBS=${NUMJOBS:-" -j7 "}
+VERSION=${VERSION:-1.4.3}
+NUMJOBS=${NUMJOBS:-" -j$(nproc) "}
 BUILD=${BUILD:-1}
 TAG=${TAG:-alien}
 
@@ -79,20 +81,19 @@ SRCURL="http://download.videolan.org/pub/${PRGNAM}/${VERSION}/${PRGNAM}-${VERSIO
 ##
 
 # Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
 if [ -z "$ARCH" ]; then
-  case "$MARCH" in
-    i?86)    export ARCH=i486 ;;
-    armv7hl) export ARCH=$MARCH ;;
-    armv6hl) export ARCH=$MARCH ;;
-    armv5hl) export ARCH=$MARCH ;;
-    arm*)    export ARCH=arm ;;
+  case "$(uname -m)" in
+    i?86) ARCH=i586 ;;
+    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
-    *)       export ARCH=$MARCH ;;
+    *) ARCH=$(uname -m) ;;
   esac
+  export ARCH
 fi
+
+# Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
 case "$ARCH" in
-  i486)      SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  i?86)      SLKCFLAGS="-O2 -march=${ARCH} -mtune=i686"
              SLKLDFLAGS=""; LIBDIRSUFFIX=""
              ;;
   x86_64)    SLKCFLAGS="-O2 -fPIC"
@@ -101,21 +102,17 @@ case "$ARCH" in
   armv7hl)   SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
              SLKLDFLAGS=""; LIBDIRSUFFIX=""
              ;;
-  armv6hl)   SLKCFLAGS="-O2 -march=armv6 -mfpu=vfp -mfloat-abi=hard"
-             SLKLDFLAGS=""; LIBDIRSUFFIX=""
-             ;;
-  armv5hl)   SLKCFLAGS="-O2 -mthumb -march=armv5te -mtune=arm1176jzf-s -mfpu=vfp -mfloat-abi=softfp"
-             SLKLDFLAGS=""; LIBDIRSUFFIX=""
-             ;;
-  *)         SLKCFLAGS=${SLKCFLAGS:-"O2"}
+  *)         SLKCFLAGS=${SLKCFLAGS:-"-O2"}
              SLKLDFLAGS=${SLKLDFLAGS:-""}; LIBDIRSUFFIX=${LIBDIRSUFFIX:-""}
              ;;
 esac
+
 case "$ARCH" in
     arm*)    TARGET=$ARCH-slackware-linux-gnueabi ;;
     *)       TARGET=$ARCH-slackware-linux ;;
 esac
 
+
 # Exit the script on errors:
 set -e
 trap 'echo "$0 FAILED at line $LINENO!" | tee $OUTPUT/error-${PRGNAM}.log' ERR
@@ -173,7 +170,7 @@ echo "Extracting the source archive(s) for $PRGNAM..."
 tar -xvf ${SOURCE}
 cd ${PRGNAM}-${VERSION}
 chown -R root:root .
-chmod -R u+w,go+r-w,a+X-s .
+chmod -R u+w,go+r-w,a+rX-st .
 
 echo Building ...
 LDFLAGS="$SLKLDFLAGS" \
@@ -191,12 +188,12 @@ CXXFLAGS="$SLKCFLAGS" \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
 
 make $NUMJOBS 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
+make apidoc 2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
 make DESTDIR=$PKG install 2>&1 | tee $OUTPUT/install-${PRGNAM}.log
 
 # Don't forget the testtools:
-make csstest dvd_region 2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
-mkdir -p $PKG/usr/bin
-cp -a csstest dvd_region $PKG/usr/bin/
+make test/csstest test/dvd_region 2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
+install -D -m0755 test/csstest test/dvd_region -t $PKG/usr/bin/
 
 # Add documentation:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
@@ -209,6 +206,9 @@ find $PKG/usr/doc -type f -exec chmod 644 {} \;
 rm -rf $PKG/usr/share/doc
 rmdir $PKG/usr/share 2>/dev/null
 
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
 # Strip binaries:
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
   | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
@@ -219,9 +219,9 @@ cat $SRCDIR/slack-desc > $PKG/install/slack-desc
 
 # Build the package:
 cd $PKG
-makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
+makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
 cd $OUTPUT
-md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz.md5
+md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txz.md5
 cd -
 cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt