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/qrencode/qrencode.SlackBuild | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'deps/qrencode/qrencode.SlackBuild')

diff --git a/deps/qrencode/qrencode.SlackBuild b/deps/qrencode/qrencode.SlackBuild
index acb351f..9f492f8 100755
--- a/deps/qrencode/qrencode.SlackBuild
+++ b/deps/qrencode/qrencode.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2017  Patrick J. Volkerding, Sebeka, MN, USA
-# Copyright 2014, 2017  Eric Hameleers, Eindhoven, NL
+# Copyright 2014, 2017, 2019  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -24,12 +24,14 @@
 # -----------------------------------------------------------------------------
 
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PKGNAM=qrencode
-VERSION=${VERSION:-3.4.4}
+VERSION=${VERSION:-4.0.2}
 BUILD=${BUILD:-1}
-NUMJOBS=${NUMJOBS:-" -j4 "}
 
-CWD=$(pwd)
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
+
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
 
@@ -37,7 +39,7 @@ PKG=$TMP/package-$PKGNAM
 MARCH=$( uname -m )
 if [ -z "$ARCH" ]; then
   case "$MARCH" in
-    i?86)    export ARCH=i486 ;;
+    i?86)    export ARCH=i586 ;;
     armv7hl) export ARCH=$MARCH ;;
     armv6hl) export ARCH=$MARCH ;;
     arm*)    export ARCH=arm ;;
@@ -47,7 +49,7 @@ if [ -z "$ARCH" ]; then
 fi
 
 case "$ARCH" in
-  i486)      SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  i?86)      SLKCFLAGS="-O2 -march=${ARCH} -mtune=i686"
              SLKLDFLAGS=""; LIBDIRSUFFIX=""
              ;;
   x86_64)    SLKCFLAGS="-O2 -fPIC"
-- 
cgit v1.2.3