This is a patch for the k9copy-reloaded SBo script to enable it to build on -current/15.0.  This should only be applied in Matteo's branch.  Thanks.

-------------------------------------------------------------------------------------------------------

diff -Naur k9copy-reloaded/README k9copy-reloaded.new/README
--- k9copy-reloaded/README    2018-03-26 11:18:28.000000000 -0400
+++ k9copy-reloaded.new/README    2018-03-31 17:06:22.622971383 -0400
@@ -16,7 +16,6 @@
 intended for copying of copyrighted commercial DVDs.  Therefore, there
 is NO CSS decription libary included in this package.

-Requires libmpeg2, dvdauthor
+Requires libmpeg2, dvdauthor, and gcc5

 http://k9copy-reloaded.sourceforge.net
-
diff -Naur k9copy-reloaded/k9copy-reloaded.SlackBuild k9copy-reloaded.new/k9copy-reloaded.SlackBuild --- k9copy-reloaded/k9copy-reloaded.SlackBuild    2018-03-31 16:58:18.968151120 -0400 +++ k9copy-reloaded.new/k9copy-reloaded.SlackBuild    2018-03-31 17:05:19.067463726 -0400
@@ -2,7 +2,7 @@

 # Slackware build script for k9copy-reloaded

-# Copyright 2016 by Lenard Spencer (lspencer31-at-cfl-rr-com)
+# Copyright 2018 by Lenard Spencer (lspencer31-at-cfl-rr-com)
 # All rights reserved.
 #
 # ffmpeg static library section borrowed (stolen?) from xine-lib.SlackBuild
@@ -29,11 +29,10 @@
 PRGNAM=k9copy-reloaded
 SRCNAM=k9copy
 VERSION=${VERSION:-3.0.3}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 FFMPEG_VERSION=${FFMPEG_VERSION:-2.8.13}
 TAG=${TAG:-_SBo}

-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
@@ -68,12 +67,22 @@
   FFARCHOPTS=""
 fi

-set -e # Exit on most errors
+set -e

 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP

+# check for gcc5 and abort if not found:
+if ! [ -x /usr/bin/gcc-5 ]; then
+  echo "Cannot find the gcc5 package.  Please install the gcc5 package"
+  echo "and rerun the SlackBuild script."
+  exit 1
+fi
+
+# Set gcc-5 vars to make it build with gcc5:
+source /etc/profile.d/gcc5.sh
+
 rm -rf ffmpeg*
 tar xvf $CWD/ffmpeg-$FFMPEG_VERSION.tar.?z* || exit 1
 cd ffmpeg* || exit 1
@@ -93,6 +102,12 @@
   CXXFLAGS="$SLKCFLAGS -fvisibility=hidden -I/usr/include/openmj2-2.1" \
   ./configure \
     --prefix=$FFMPEGDIR/usr \
+    --cc=gcc-5 \
+    --cxx=g++-5 \
+    --ar=gcc-ar-5 \
+    --nm=gcc-nm-5 \
+    --ranlib=gcc-ranlib-5 \
+    --dep-cc=gcc-5 \
     --libdir=$FFMPEGDIR/usr/lib${LIBDIRSUFFIX} \
     --shlibdir=$FFMPEGDIR/usr/lib${LIBDIRSUFFIX} \
     --enable-gpl \
diff -Naur k9copy-reloaded/k9copy-reloaded.info k9copy-reloaded.new/k9copy-reloaded.info --- k9copy-reloaded/k9copy-reloaded.info    2017-12-04 15:04:49.000000000 -0500 +++ k9copy-reloaded.new/k9copy-reloaded.info    2018-03-31 17:02:14.924988370 -0400
@@ -7,6 +7,6 @@
         9a0c752a490f7e30476eb46948a36d0e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="dvdauthor libmpeg2"
+REQUIRES="dvdauthor libmpeg2 gcc5"
 MAINTAINER="Lenard Spencer"
 EMAIL="lspencer31-at-cfl-rr-com"

_______________________________________________
SlackBuilds-users mailing list
SlackBuilds-users@slackbuilds.org
https://lists.slackbuilds.org/mailman/listinfo/slackbuilds-users
Archives - https://lists.slackbuilds.org/pipermail/slackbuilds-users/
FAQ - https://slackbuilds.org/faq/

Reply via email to