From faa80e7dad4c49ff3fb490a3c7f9c66ca6fe0ba5 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Tue, 6 Aug 2019 14:29:25 +0200
Subject: Packages rebuilt/upgraded due to newer ffmpeg/libevent in -current

Deps:
  - rebuilt qt5 (for the new libevent).
  - rebuilt OpenAL and mlt (for the new ffmpeg).
  - upgraded opencv, qrencode, qtav, sip and QScintilla.
  - removed PyQT (since this now properly landed in -current)
Frameworks:
  - rebuilt prison (for the new qrencode) and kfilemetadata5 (new ffmpeg).
Plasma:
  - rebuilt ksysguard (for the new libevent).
Applications:
  - rebuilt ffmpegthumbs and k3b (for the new ffmpeg).
Applications-extra:
  - upgraded digikam and krita.
---
 deps/qtav/.url            |  2 +-
 deps/qtav/qtav.SlackBuild | 24 +++++++++++++++++-------
 2 files changed, 18 insertions(+), 8 deletions(-)

(limited to 'deps/qtav')

diff --git a/deps/qtav/.url b/deps/qtav/.url
index e35c34f..c496827 100644
--- a/deps/qtav/.url
+++ b/deps/qtav/.url
@@ -1 +1 @@
-https://github.com/wang-bin/QtAV/archive/v1.12.0.tar.gz
+https://github.com/wang-bin/QtAV/archive/v1.13.0.tar.gz
diff --git a/deps/qtav/qtav.SlackBuild b/deps/qtav/qtav.SlackBuild
index f5138ca..7fc9398 100755
--- a/deps/qtav/qtav.SlackBuild
+++ b/deps/qtav/qtav.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2017  Eric Hameleers, Eindhoven, NL
+# Copyright 2017, 2019  Eric Hameleers, Eindhoven, NL
 # Copyright 2017  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
@@ -24,13 +24,15 @@
 # -----------------------------------------------------------------------------
 
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PKGNAM=qtav
 SRCNAM=QtAV
-VERSION=${VERSION:-1.12.0}
+VERSION=${VERSION:-1.13.0}
 BUILD=${BUILD:-1}
-NUMJOBS=${NUMJOBS:-" -j4 "}
 
-CWD=$(pwd)
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
+
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
 
@@ -45,12 +47,20 @@ if [ -z "$ARCH" ]; then
   export ARCH
 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 "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+  exit 0
+fi
+
 if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  SLKCFLAGS="-O2 -march=${ARCH} -mtune=i686"
   SLKLDFLAGS=""
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  SLKCFLAGS="-O2 -march=${ARCH} -mtune=i686"
   SLKLDFLAGS=""
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
@@ -76,7 +86,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/$SRCNAM-$VERSION.tar.?z || exit 1
 cd $SRCNAM-$VERSION || exit 1
 
 # Fix bogus permissions:
-- 
cgit v1.2.3