1 files changed, 25 insertions, 22 deletions
diff --git a/multimedia/bombono-dvd/bombono-dvd.SlackBuild b/multimedia/bombono-dvd/bombono-dvd.SlackBuild
index 4ad1cf1197..b36426d4eb 100644
--- a/multimedia/bombono-dvd/bombono-dvd.SlackBuild
+++ b/multimedia/bombono-dvd/bombono-dvd.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for bombono-dvd
 # Maintained by Klaatu @member.fsf.org
@@ -23,10 +23,15 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220215 bkw: Modified by SlackBuilds.org, fix build on 15.0.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=bombono-dvd
 VERSION=${VERSION:-1.2.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +41,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -66,26 +75,23 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -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 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+
+# 20220215 bkw: ported the stupid scons stuff to python3, since
+# 15.0's scons doesn't do python2.
+patch -p1 < $CWD/patches/scons.diff
 
-# specify our CFLAGS
-sed -i "s|-O2||" SConstruct
 # Allow use of cdrtools as an alternative to cdrkit, thanks gentoo
 patch -p1 < $CWD/patches/bombono-dvd-1.2.0-cdrtools.patch
 
-# Fix for the newer ffmpeg - thanks ArchLinux
-patch -p1 < $CWD/patches/fix_ffmpeg_codecid.patch
-
-# Credit to ARCH Linux
-patch -p1 < $CWD/patches/fix_ptr2bool_cast.patch
-patch -p1 < $CWD/patches/fix_c++11_literal_warnings.patch
-patch -p1 < $CWD/patches/autoptr2uniqueptr.patch
-patch -p1 < $CWD/patches/boost.patch
+# 20220215 bkw: more boost breakage. this is upstream's commit e0956f48d5,
+# but slightly edited to remove the reference to README (which won't apply).
+patch -p1 < $CWD/patches/boost-1.78.diff
 
-# Fix for ffmpeg-3
-patch -p1 < $CWD/patches/ffmpeg3.patch
+# specify our CFLAGS
+sed -i "s|-O2||" SConstruct
 
 # Build package
 scons \
@@ -111,13 +117,10 @@ scons \
   DESTDIR=$PKG \
   install
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+strip $PKG/usr/bin/*
 
 mv $PKG/usr/share/man $PKG/usr/
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+gzip -9 $PKG/usr/man/man*/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
@@ -128,4 +131,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE