5 files changed, 35 insertions, 28 deletions
diff --git a/multimedia/avidemux/README b/multimedia/avidemux/README
index 18c21f4f53..39e6cb56a1 100644
--- a/multimedia/avidemux/README
+++ b/multimedia/avidemux/README
@@ -1,6 +1,8 @@
-Avidemux is a free video editor designed for simple cutting, filtering and 
-encoding tasks. It supports many file types, including AVI, DVD compatible 
-MPEG files, MP4 and ASF, using a variety of codecs. Tasks can be automated 
-using projects, job queue and powerful scripting capabilities.
+Avidemux is a free video editor designed for simple cutting, filtering
+and encoding tasks. It supports many file types, including AVI, DVD
+compatible MPEG files, MP4 and ASF, using a variety of codecs. Tasks
+can be automated using projects, job queue and powerful scripting
+capabilities.
 
-Optional dependencies are aften, amrnb, jack, nv-codec-headers, and x265.
+Optional dependencies are aften, amrnb, jack, nv-codec-headers,
+and x265.
diff --git a/multimedia/avidemux/avidemux.SlackBuild b/multimedia/avidemux/avidemux.SlackBuild
index d6d537e9c6..37202fb9d3 100644
--- a/multimedia/avidemux/avidemux.SlackBuild
+++ b/multimedia/avidemux/avidemux.SlackBuild
@@ -5,7 +5,7 @@
 # Derived from a SlackBuild by Eric Hameleers.
 # Copyright 2009, 2010, 2011, 2013  Eric Hameleers, Eindhoven, NL
 # Copyright 2015 John Vogel Corning, NY USA
-# Copyright 2017-2021 Matteo Bernardini, Pisa, IT
+# Copyright 2017-2022 Matteo Bernardini, Pisa, IT
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,10 +25,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220402 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - man page was getting installed as a *file* called /usr/man/man1. fix.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=avidemux
-VERSION=${VERSION:-2.7.8}
+VERSION=${VERSION:-2.8.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -41,9 +44,6 @@ if [ -z "$ARCH" ]; then
   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
@@ -80,11 +80,12 @@ 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 {} \+
 
-patch -p1 < $CWD/qt-5.15.diff
+# Thanks FreeBSD guys!
+[[ "$ARCH" = "i586" ]] && patch -p0 < $CWD/extra-patch-i386-nosse.patch
 
 sed -i 's|../avidemux/qt4|../avidemux/qt4 -DLRELEASE_EXECUTABLE=/usr/bin/lrelease-qt5|' bootStrap.bash || exit 1
 sed -i 's|0.19|1.0|' avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt || exit 1
@@ -97,7 +98,8 @@ make -C buildPluginsCLI DESTDIR="$PKG" install
 make -C buildPluginsCommon DESTDIR="$PKG" install
 
 install -Dm 644 avidemux_icon.png $PKG/usr/share/pixmaps/avidemux.png
-install -Dm 644 man/avidemux.1 $PKG/usr/man/man1
+mkdir -p $PKG/usr/man/man1
+gzip -9c < man/avidemux.1 > $PKG/usr/man/man1/avidemux.1.gz
 
 make -C buildQt5 DESTDIR="$PKG" install
 make -C buildPluginsQt5 DESTDIR="$PKG" install
diff --git a/multimedia/avidemux/avidemux.info b/multimedia/avidemux/avidemux.info
index 3b55b87854..948c45dcc6 100644
--- a/multimedia/avidemux/avidemux.info
+++ b/multimedia/avidemux/avidemux.info
@@ -1,8 +1,8 @@
 PRGNAM="avidemux"
-VERSION="2.7.8"
+VERSION="2.8.1"
 HOMEPAGE="http://avidemux.org"
-DOWNLOAD="http://downloads.sf.net/avidemux/avidemux_2.7.8.tar.gz"
-MD5SUM="15e2389c9c526b03bd3779a6a6da9db4"
+DOWNLOAD="http://downloads.sf.net/avidemux/avidemux_2.8.1.tar.gz"
+MD5SUM="fee41934cba460ec0fde2a453d5a6307"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="faac faad2 libdca x264 xvidcore"
diff --git a/multimedia/avidemux/extra-patch-i386-nosse.patch b/multimedia/avidemux/extra-patch-i386-nosse.patch
new file mode 100644
index 0000000000..fbad75fb59
--- /dev/null
+++ b/multimedia/avidemux/extra-patch-i386-nosse.patch
@@ -0,0 +1,14 @@
+--- avidemux/common/ADM_audioFilter/src/ADM_soundtouch/STTypes.h.orig	2022-09-17 13:59:16 UTC
++++ avidemux/common/ADM_audioFilter/src/ADM_soundtouch/STTypes.h
+@@ -153,11 +153,6 @@ namespace soundtouch
+         // efficient autovectorization
+         typedef float LONG_SAMPLETYPE;
+ 
+-        #ifdef SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS
+-            // Allow SSE optimizations
+-            #define SOUNDTOUCH_ALLOW_SSE       1
+-        #endif
+-
+     #endif  // SOUNDTOUCH_INTEGER_SAMPLES
+ 
+     #if ((SOUNDTOUCH_ALLOW_SSE) || (__SSE__) || (SOUNDTOUCH_USE_NEON))
diff --git a/multimedia/avidemux/qt-5.15.diff b/multimedia/avidemux/qt-5.15.diff
deleted file mode 100644
index 5ebe3753c2..0000000000
--- a/multimedia/avidemux/qt-5.15.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -u -r avidemux_2.7.4/avidemux/qt4/ADM_UIs/src/T_RubberControl.cpp avidemux_2.7.4-fix/avidemux/qt4/ADM_UIs/src/T_RubberControl.cpp
---- avidemux_2.7.4/avidemux/qt4/ADM_UIs/src/T_RubberControl.cpp	2019-08-15 07:25:39.000000000 +0000
-+++ avidemux_2.7.4-fix/avidemux/qt4/ADM_UIs/src/T_RubberControl.cpp	2020-06-05 13:48:28.014061206 +0000
-@@ -8,6 +8,7 @@
- ***************************************************************************///
- 
- #include <QPainter>
-+#include <QPainterPath>
- #include <QRubberBand>
- #include <QBoxLayout>
- #include <QSizeGrip>