1 files changed, 20 insertions, 2 deletions
diff --git a/multimedia/dvdbackup/dvdbackup.SlackBuild b/multimedia/dvdbackup/dvdbackup.SlackBuild
index ab324bce25..8ada2fb78e 100644
--- a/multimedia/dvdbackup/dvdbackup.SlackBuild
+++ b/multimedia/dvdbackup/dvdbackup.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for dvdbackup
 
 # Copyright 2013 John Vogel Corning, New York US
+# Copyright 2017 Lenard Spencer <lspencer31_at_cfl_dot_rr_dot_com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,12 +25,12 @@
 
 PRGNAM=dvdbackup
 VERSION=${VERSION:-0.4.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i686 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -54,6 +55,8 @@ else
   LIBDIRSUFFIX=""
 fi
 
+CURRENT=${CURRENT:-"no"}
+
 set -e
 
 rm -rf $PKG
@@ -69,10 +72,20 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Patch to not clobber the DVD title
+if [ {$CLOBBER:-"yes"} == "no" ]; then
+  patch -p1 < $CWD/patches/dvdbackup_no-convert-title.patch
+fi
+
 # Patches from lauchpad bazaar repo.
 patch -p0 < $CWD/patches/do_not_treat_automake_warnings_as_errors.patch
 patch -p0 < $CWD/patches/remove_PATH_MAX_limitation.patch
 
+# Patch for the new libdvdread
+if [ "$CURRENT" = "yes" ]; then
+  patch -p1 < $CWD/patches/dvdbackup-build-with-new-libdvdread.patch
+fi
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -98,6 +111,11 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+if [ "$CURRENT" = "yes" ]; then
+  # Don't ship .la files:
+  rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc