summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Jim Brewster <geminijim@gmail.com>2012-02-19 14:49:59 -0600
committer Robby Workman <rworkman@slackbuilds.org>2012-02-20 12:20:46 -0600
commit57c5231db012420e75f2a682adfc15ae9b048efc (patch)
tree14d5ea0f1736f0f51b5293cadf8f725afa4e4bf7
parent68863f69bf98f108f346343caf4cc88430dc69f4 (diff)
downloadslackbuilds-57c5231db012420e75f2a682adfc15ae9b048efc.tar.gz
slackbuilds-57c5231db012420e75f2a682adfc15ae9b048efc.tar.xz
audio/qjackctl: Fix build on x86_64; new maintainer
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
-rw-r--r--audio/qjackctl/README2
-rw-r--r--audio/qjackctl/desktopfile.gzbin205 -> 0 bytes
-rw-r--r--audio/qjackctl/qjackctl.SlackBuild12
-rw-r--r--audio/qjackctl/qjackctl.desktop9
-rw-r--r--audio/qjackctl/qjackctl.info4
5 files changed, 21 insertions, 6 deletions
diff --git a/audio/qjackctl/README b/audio/qjackctl/README
index e3a826079b..b57887650d 100644
--- a/audio/qjackctl/README
+++ b/audio/qjackctl/README
@@ -1,3 +1,3 @@
QjackCtl is a simple Qt application to control the JACK sound server.
-Requires: jack-audio-connection-kit available at SlackBuilds.org
+This requires jack-audio-connection-kit.
diff --git a/audio/qjackctl/desktopfile.gz b/audio/qjackctl/desktopfile.gz
deleted file mode 100644
index 6a1888301c..0000000000
--- a/audio/qjackctl/desktopfile.gz
+++ /dev/null
Binary files differ
diff --git a/audio/qjackctl/qjackctl.SlackBuild b/audio/qjackctl/qjackctl.SlackBuild
index 0359aab729..1244c4591b 100644
--- a/audio/qjackctl/qjackctl.SlackBuild
+++ b/audio/qjackctl/qjackctl.SlackBuild
@@ -2,7 +2,8 @@
#
# Slackware build script for QjackCtl
#
-# Copyright 2009 Erik W. Hanson, Minneapolis, MN, USA
+# Copyright 2009, Erik W. Hanson, Minneapolis, MN, USA
+# Copyright 2012, James M. Brewster, Baltimore, MD, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,7 +25,7 @@
PRGNAM=qjackctl
VERSION=0.3.4
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
# Automatically determine the architecture we're building on:
@@ -71,6 +72,11 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# Tell qmake about our SLKCFLAGS. Required to compile on x86_64
+# system. Thanks to Lyle Sigurdson <lyle@sent.com> on
+# linuxquestions.org for this patch.
+echo "QMAKE_CXXFLAGS_RELEASE=$SLKCFLAGS" >> qjackctl.pro.in
+
CFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
@@ -89,7 +95,7 @@ find $PKG | xargs file | egrep "ELF.*executable" | cut -f 1 -d : \
| xargs strip --strip-unneeded 2> /dev/null
# Make sure we have a standard-compliant desktop file
-zcat $CWD/desktopfile.gz > $PKG/usr/share/applications/qjackctl.desktop
+cat $CWD/qjackctl.desktop > $PKG/usr/share/applications/qjackctl.desktop
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a AUTHORS COPYING ChangeLog INSTALL README TODO TRANSLATORS \
diff --git a/audio/qjackctl/qjackctl.desktop b/audio/qjackctl/qjackctl.desktop
new file mode 100644
index 0000000000..6d1055b64c
--- /dev/null
+++ b/audio/qjackctl/qjackctl.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=QjackCtl
+GenericName=JACK Control
+Comment=QjackCtl is a JACK Audio Connection Kit Qt GUI Interface
+Exec=qjackctl
+Icon=qjackctl
+Categories=Audio;AudioVideo;X-MIDI;X-JACK;X-ALSA;Qt;
+Terminal=false
+Type=Application
diff --git a/audio/qjackctl/qjackctl.info b/audio/qjackctl/qjackctl.info
index 66a3fba85a..64a4e9cb04 100644
--- a/audio/qjackctl/qjackctl.info
+++ b/audio/qjackctl/qjackctl.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://downloads.sourceforge.net/qjackctl/qjackctl-0.3.4.tar.gz"
MD5SUM="65736e83650468256ba22aa5d35fd0cb"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-MAINTAINER="Erik Hanson"
-EMAIL="erik@slackbuilds.org"
+MAINTAINER="Jim Brewster"
+EMAIL="geminijim@gmail.com"
APPROVED="rworkman"