4 files changed, 31 insertions, 45 deletions
diff --git a/multimedia/minitube/README b/multimedia/minitube/README
index e8fd048258..9ddd0dd3e0 100644
--- a/multimedia/minitube/README
+++ b/multimedia/minitube/README
@@ -1,4 +1,5 @@
-Minitube is a YouTube desktop client.  With it you can watch YouTube videos in
-a new way: you type a keyword, Minitube gives you an endless video stream. 
-Minitube does not require the Flash Player.  Minitube is not about cloning 
-the original YouTube web interface, it aims to create a new TV-like experience.
+Minitube is a YouTube desktop client. With it you can watch YouTube
+videos in a new way: you type a keyword, Minitube gives you an endless
+video stream. Minitube does not require the Flash Player. Minitube
+is not about cloning the original YouTube web interface, it aims to
+create a new TV-like experience.
diff --git a/multimedia/minitube/minitube-gcc47.patch b/multimedia/minitube/minitube-gcc47.patch
deleted file mode 100644
index 6283b1fe99..0000000000
--- a/multimedia/minitube/minitube-gcc47.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur minitube-20120813_338dac6.orig/src/qtsingleapplication/qtlocalpeer.cpp minitube-20120813_338dac6/src/qtsingleapplication/qtlocalpeer.cpp
---- minitube-20120813_338dac6.orig/src/qtsingleapplication/qtlocalpeer.cpp	2012-08-13 17:09:04.000000000 +0200
-+++ minitube-20120813_338dac6/src/qtsingleapplication/qtlocalpeer.cpp	2012-09-12 13:00:44.330889268 +0200
-@@ -58,6 +58,7 @@
- #endif
- #if defined(Q_OS_UNIX)
- #include <time.h>
-+#include <unistd.h>
- #endif
- 
- namespace QtLP_Private {
diff --git a/multimedia/minitube/minitube.SlackBuild b/multimedia/minitube/minitube.SlackBuild
index 8309580504..115089f486 100644
--- a/multimedia/minitube/minitube.SlackBuild
+++ b/multimedia/minitube/minitube.SlackBuild
@@ -2,7 +2,9 @@
 
 # Slackware build script for minitube
 
-# Copyright 2009 Mikhail Zotov < mikhail dot ru at gmail dot com >
+# Copyright 2009  Mikhail Zotov
+# Copyright 2021-2023  Johannes Schoepfer, Germany
+# All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
@@ -21,27 +23,24 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Version number bumped by /dev/ammo42
+# 20220320 bkw: Modified by SlackBuilds.org: fix 32-bit build.
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=minitube
-VERSION=${VERSION:-2.1.3}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-3.9.3}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -51,18 +50,15 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
+# 20220320 bkw: we need -fPIC even for 32-bit.
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686 -fPIC"
 elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686 -fPIC"
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC -m64"
-  LIBDIRSUFFIX="64"
+  SLKCFLAGS="-O2 -fPIC"
 else
   SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -71,18 +67,18 @@ 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.bz2
 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 {} \;
-
-# Fix building with gcc-4.7.x
-patch -p1 < $CWD/minitube-gcc47.patch
-
+ \( -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 mpv >= 0.35, thanks to Chris Willing
+sed -i -e '/mpv_opengl_init_params/ s/, nullptr};/};/' \
+  lib/media/src/mpv/mpvwidget.cpp
 qmake
 # Use our SLKCFLAGS plus the hardcoded ones from the Makefile
 make \
@@ -92,7 +88,7 @@ make install INSTALL_ROOT=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS CHANGES COPYING INSTALL TODO \
+  AUTHORS CHANGES COPYING TODO \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/multimedia/minitube/minitube.info b/multimedia/minitube/minitube.info
index ab76d9715c..3c1af2e382 100644
--- a/multimedia/minitube/minitube.info
+++ b/multimedia/minitube/minitube.info
@@ -1,10 +1,10 @@
 PRGNAM="minitube"
-VERSION="2.1.3"
+VERSION="3.9.3"
 HOMEPAGE="https://flavio.tordini.org/minitube"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/minitube-2.1.3.tar.xz"
-MD5SUM="3f0d44da75b275b442fde4a21af2f115"
+DOWNLOAD="https://github.com/flaviotordini/minitube/releases/download/3.9.3/minitube-3.9.3.tar.bz2"
+MD5SUM="f6eddbba90988051bf62339df73481a6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="mpv"
 MAINTAINER="Johannes Schoepfer"
 EMAIL="slackbuilds@schoepfer.info"