From 780a8bb7752241f169bbbc7b48129ee489574f10 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Sun, 25 Jun 2017 12:33:35 +0200 Subject: Updated deps for upcoming KDE 5_17.06 On slackware-current, we switch to Qt 5.9 which is going to be a LTS release (Long Term Support). --- deps/qtav/.url | 1 + deps/qtav/qtav.SlackBuild | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 deps/qtav/.url (limited to 'deps/qtav') diff --git a/deps/qtav/.url b/deps/qtav/.url new file mode 100644 index 0000000..91cdfc3 --- /dev/null +++ b/deps/qtav/.url @@ -0,0 +1 @@ +https://github.com/wang-bin/QtAV#tag=1.11.0 diff --git a/deps/qtav/qtav.SlackBuild b/deps/qtav/qtav.SlackBuild index 75119c0..5491f7c 100755 --- a/deps/qtav/qtav.SlackBuild +++ b/deps/qtav/qtav.SlackBuild @@ -27,7 +27,7 @@ PKGNAM=qtav SRCNAM=QtAV VERSION=${VERSION:-1.11.0} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j4 "} CWD=$(pwd) @@ -37,7 +37,7 @@ PKG=$TMP/package-$PKGNAM # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -49,6 +49,10 @@ if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" SLKLDFLAGS="" LIBDIRSUFFIX="" +elif [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + SLKLDFLAGS="" + LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" SLKLDFLAGS="-L/usr/lib64" -- cgit v1.2.3