multimedia/k9copy-reloaded: Cleanups.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

2 files changed, 16 insertions, 25 deletions

diff --git a/multimedia/k9copy-reloaded/README b/multimedia/k9copy-reloaded/README
index 3fa76d1397..115f236e3e 100644
--- a/multimedia/k9copy-reloaded/README
+++ b/multimedia/k9copy-reloaded/README
@@ -5,13 +5,10 @@ DVDs, as well as compress a dual-layer DVD to single-layer.
 NOTE 1: This script now uses the system ffmpeg, so be sure it is
 installed before trying to run this script.
 
-NOTE 2: K9copy-reloaded is unable to open .iso files on 32-bit systems.
-This is an issue with libdvdread and not with k9copy-reloaded.
-They open just fine on 64-bit systems.
-
-NOTE 3: If you wish to build this on current (15.0 EXPERIMENTAL), you
-will need to pass CURRENT=yes to the script.
-
-NOTE 4: This program is only intended for personal backups, and is NOT
+NOTE 2: This program is only intended for personal backups, and is NOT
 intended for copying of copyrighted commercial DVDs.  Therefore, there 
 is NO CSS decription libary included in this package.
+
+NOTE 3: dvdauthor is listed as optional, but it crashes k9copy if you
+try to use it for copy without menus; it is disabled by default in
+settings.
diff --git a/multimedia/k9copy-reloaded/k9copy-reloaded.SlackBuild b/multimedia/k9copy-reloaded/k9copy-reloaded.SlackBuild
index 4f1e30b823..8c2f249b0f 100644
--- a/multimedia/k9copy-reloaded/k9copy-reloaded.SlackBuild
+++ b/multimedia/k9copy-reloaded/k9copy-reloaded.SlackBuild
@@ -61,16 +61,15 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-
 rm -rf $SRCNAM
 tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
 cd $SRCNAM
 chown -R root:root .
-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 {} \;
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # Insert a blank CmakeLists.txt file in various subs
 # or the build will fail
@@ -92,32 +91,27 @@ patch -p1 < $CWD/patches/k9copy-gcc7.patch
 # and libdvdnav, but NONE of then work properly (the program builds,
 # but the backups are corrupt and will not play).  I may revisit it
 # later, but for now, we must patch the internal dvdnav to properly
-# link to the internal dvdread:
+# link to the internal dvdread: otherwise, the backups come out with
+# corrupted .IFO files:
 patch -p1 < $CWD/patches/k9copy-dvdnav.patch
 
-# In current, dvdauthor crashes the program if we try to use it
-# for copy without menus, so we disable it by default in settings:
+# In 15.0, dvdauthor crashes the program if we try to use it,
+# so we disable it by default in settings:
 patch -p1 < $CWD/patches/k9copy-uncheck-dvdauthor.patch
 
 # Patch for missing "Language=" entry in .po files:
 patch -p1 < $CWD/patches/k9copy-missing-language-in-po-files.patch
 
-# Patch for i18n (mitigates I18N_ARGUMENT_MISSING messages:
+# Patch for i18n (mitigates I18N_ARGUMENT_MISSING messages):
 patch -p1 < $CWD/patches/k9copy-i18n.patch
 
-if [ "${CURRENT:-no}" = "yes" ];then
-  QT5="ON"
-else
-  QT5="OFF"
-fi
-
 mkdir -p build
 cd build
   cmake \
     -DCMAKE_C_FLAGS="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKCFLAGS -std=c++11" \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DQT5_BUILD="$QT5" \
+    -DQT5_BUILD="ON" \
     -DCMAKE_BUILD_TYPE=Release ..
   make
   make install DESTDIR=$PKG