multimedia/bombono-dvd: Updated for version 1.2.4.

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

1 files changed, 17 insertions, 22 deletions

diff --git a/multimedia/bombono-dvd/bombono-dvd.SlackBuild b/multimedia/bombono-dvd/bombono-dvd.SlackBuild
index 5b90d4d6d94d..3febf0b17fb9 100644
--- a/multimedia/bombono-dvd/bombono-dvd.SlackBuild
+++ b/multimedia/bombono-dvd/bombono-dvd.SlackBuild
@@ -23,13 +23,13 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=bombono-dvd
-VERSION=${VERSION:-1.2.2}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.2.4}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
   TARGET="i386"
 elif [ "$ARCH" = "i686" ]; then
@@ -60,17 +60,15 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 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 \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -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 {} \;
 
-# Fix for glib>=2.31
-#sed -i "s|^\#include <glib/.*\.h>$||" src/mgui/author/gb_devices.c
 # Let us specify our CFLAGS
 sed -i "s|-O2||" SConstruct
 # Allow use of cdrtools as an alternative to cdrkit, thanks gentoo
@@ -78,21 +76,21 @@ 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
-# Fix for ffmpeg-2.6.3 - thanks to Gentoo and John Vogel
-patch -p1 < $CWD/patches/bombono-dvd-1.2.2-ffmpeg26.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/fix_crefoftemp_bug.patch
 patch -p1 < $CWD/patches/autoptr2uniqueptr.patch
-patch -p1 < $CWD/patches/stream_bool_cast.patch
 patch -p1 < $CWD/patches/boost.patch
 
+# Fix for ffmpeg-3
+patch -p1 < $CWD/patches/ffmpeg3.patch
+
 # Build package
 scons \
   CFLAGS="$SLKCFLAGS" \
   CXXFLAGS="$SLKCFLAGS -Wno-unused-local-typedefs" \
-  CPPFLAGS="-std=c++11 \
+  CPPFLAGS="-std=c++14 \
 	-DBOOST_SYSTEM_NO_DEPRECATED \
 	-DBOOST_FILESYSTEM_NO_DEPRECATED \
 	-DBOOST_FILESYSTEM_VERSION=3" \
@@ -112,7 +110,7 @@ scons \
   DESTDIR=$PKG \
   install
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+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
 
 mv $PKG/usr/share/man $PKG/usr/
@@ -120,11 +118,8 @@ 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
 
-# Copy documentation
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  COPYING README \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install