diff options
| author |   Eric Hameleers <alien@slackware.com> | 2019-03-07 09:53:04 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2019-03-07 09:53:04 +0000 |
| commit | 4083e00333ee448ceb427ef98fb4df50c9f07c11 (patch) | |
| tree | d762c3fe2389211932ba2c277c55b1490b94fe92 | |
| parent | d4429ab671e2fb2d2cf6a678ef69c74ac10f60b1 (diff) | |
| download | asb-4083e00333ee448ceb427ef98fb4df50c9f07c11.tar.gz asb-4083e00333ee448ceb427ef98fb4df50c9f07c11.tar.xz | |
qjackctl: updated to 0.5.5
| -rwxr-xr-x | qjackctl/build/qjackctl.SlackBuild | 35 |
1 files changed, 15 insertions, 20 deletions
diff --git a/qjackctl/build/qjackctl.SlackBuild b/qjackctl/build/qjackctl.SlackBuild index 4c756562..42d0095c 100755 --- a/qjackctl/build/qjackctl.SlackBuild +++ b/qjackctl/build/qjackctl.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # $Id$ -# Copyright 2009, 2013 Eric Hameleers, Eindhoven, NL +# Copyright 2009, 2013, 2019 Eric Hameleers, Eindhoven, NL # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -28,12 +28,14 @@ # For: qjackctl # Descr: Qt application to control the JACK sound server daemon # URL: http://qjackctl.sourceforge.net/ -# Needs: jack +# Needs: jack2 # Changelog: # 0.3.4-1: 22/sep/2009 by Eric Hameleers <alien@slackware.com> # * Initial build. # 0.3.10-1: 21/dec/2013 by Eric Hameleers <alien@slackware.com> # * Update. +# 0.5.5-1: 01/mar/2019 by Eric Hameleers <alien@slackware.com> +# * Update. # # Run 'sh qjackctl.SlackBuild' to build a Slackware package. # The package (.txz) and .txt file as well as build logs are created in /tmp . @@ -44,9 +46,9 @@ # Set initial variables: PRGNAM=qjackctl -VERSION=${VERSION:-0.3.10} +VERSION=${VERSION:-0.5.5} BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:" -j4 "} +NUMJOBS=${NUMJOBS:-" -j$(nproc) "} TAG=${TAG:-alien} DOCS="AUTHORS COPYING ChangeLog README TODO TRANSLATORS" @@ -67,20 +69,18 @@ SRCURL="http://downloads.sourceforge.net/${PRGNAM}/${PRGNAM}-${VERSION}.tar.gz" ## # Automatically determine the architecture we're building on: -MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$MARCH" in - i?86) export ARCH=i486 ;; - armv7hl) export ARCH=$MARCH ;; - armv6hl) export ARCH=$MARCH ;; - arm*) export ARCH=arm ;; + case "$(uname -m)" in + 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: - *) export ARCH=$MARCH ;; + *) ARCH=$(uname -m) ;; esac + export ARCH fi - +# Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX: 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" @@ -89,10 +89,7 @@ case "$ARCH" in armv7hl) SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" SLKLDFLAGS=""; LIBDIRSUFFIX="" ;; - armv6hl) SLKCFLAGS="-O2 -march=armv6 -mfpu=vfp -mfloat-abi=hard" - SLKLDFLAGS=""; LIBDIRSUFFIX="" - ;; - *) SLKCFLAGS=${SLKCFLAGS:-"O2"} + *) SLKCFLAGS=${SLKCFLAGS:-"-O2"} SLKLDFLAGS=${SLKLDFLAGS:-""}; LIBDIRSUFFIX=${LIBDIRSUFFIX:-""} ;; esac @@ -172,12 +169,10 @@ CFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc \ --program-prefix= \ --program-suffix= \ - --disable-portaudio \ - --enable-jack-version \ --build=$TARGET \ 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log -make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log +make $NUMJOBS 2>&1 | tee $OUTPUT/make-${PRGNAM}.log make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log # Add this to the doinst.sh: |