summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/alsa-tools/README67
-rw-r--r--audio/alsa-tools/alsa-tools.SlackBuild38
-rw-r--r--audio/alsa-tools/alsa-tools.info12
3 files changed, 76 insertions, 41 deletions
diff --git a/audio/alsa-tools/README b/audio/alsa-tools/README
index 4d2f15ff7e..a08fa787cd 100644
--- a/audio/alsa-tools/README
+++ b/audio/alsa-tools/README
@@ -11,30 +11,43 @@ with the alsa-tools source). Also included is the SlackBuild author's
Included tools:
-ac3dec - simple AC3 stream decoder
-as10k1 - assembler for the emu10k1 DSP chip present in Creative soundcards
-cspctl - Sound Blaster 16 ASP/CSP control program
-dl10k1 - loads dumps previously created with lo10k1 & ld10k1
-echomixer - Linux equivalent of the Echoaudio console application
-envy24control - Control tool for Envy24 (ice1712) based soundcards
-extract_ac3 - extract AC3 streams from VOB files
-hdspconf - GUI to control the Hammerfall HDSP Alsa Settings
-hdsploader - firmware loader for the RME Hammerfall DSP cards
-hdspmixer - Linux equivalent of the Totalmix application from RME
-hwmixvolume - hardware mixer control for cards using hardware mixing
-init_audigy, init_audigy_eq10, init_live - initialize Creative cards
-ld10k1 - dump patches stored in an EMU10K1/EMU10K2 card
-ld10k1d - daemon for lo10k1
-lo10k1 - EMU10K1 (EMU10K2) patch loader for ALSA
-mixartloader - Firmware loader for Digigram miXart soundcards
-pcxhrloader - Firmware loader for Digigram pcxhr compatible soundcards
-qlo10k1 - GUI for loading patches on EMU10K1/EMU10K2 cards
-rmedigicontrol - control tool for RME Digi32 and RME Digi96 soundcards
-sbiload - OPL2/3 FM instrument loader for ALSA hwdep
-sscape_ctl - ALSA SoundScape control utility
-us428control - Tascam US-428 control surface daemon
-usx2yloader - 2nd Phase Firmware loader for Tascam USX2Y USB soundcards
-vxloader - Firmware loader for Digigram VX soundcards
-
-One of the tools (qlo10k1) uses Qt3. If you need this tool, install qt3,
-and pass QT3=yes in the environment for alsa-tools.SlackBuild.
+ as10k1 - assembler for emu10k1 DSP chip present in Creative soundcards
+ cspctl - Sound Blaster 16 ASP/CSP control program
+ dl10k1 - loads dumps previously created with lo10k1 & ld10k1
+* echomixer - Linux equivalent of the Echoaudio console application
+* envy24control - Control tool for Envy24 (ice1712) based soundcards
+ hda-verb - send a HD-audio command to an intel-hda hwdep device
+* hdajackretask - retask the hardware jacks on intel-hda devices
+* hdspconf - GUI to control the Hammerfall HDSP Alsa Settings
+ hdsploader - firmware loader for the RME Hammerfall DSP cards
+* hdspmixer - Linux equivalent of the Totalmix application from RME
+ hwmixvolume - hardware mixer control for cards using hardware mixing
+ init_audigy, init_audigy_eq10, init_live - initialize Creative cards
+ ld10k1 - dump patches stored in an EMU10K1/EMU10K2 card
+ ld10k1d - daemon for lo10k1
+ lo10k1 - EMU10K1 (EMU10K2) patch loader for ALSA
+ mixartloader - Firmware loader for Digigram miXart soundcards
+ pcxhrloader - Firmware loader for Digigram pcxhr compatible soundcards
+* qlo10k1 - GUI for loading patches on EMU10K1/EMU10K2 cards
+* rmedigicontrol - control tool for RME Digi32 and RME Digi96 soundcards
+ sbiload - OPL2/3 FM instrument loader for ALSA hwdep
+ sscape_ctl - ALSA SoundScape control utility
+ us428control - Tascam US-428 control surface daemon
+ usx2yloader - 2nd Phase Firmware loader for Tascam USX2Y USB soundcards
+ vxloader - Firmware loader for Digigram VX soundcards
+
+(Older versions included the tools "ac3dec" and "extract_ac3", which
+were removed from 1.0.27, probably for legal reasons)
+
+Tools marked with an * are GUI tools that require X. To build on an X-less
+system, set GUI=no in the environment.
+
+Optional dependencies:
+
+qt3 - only used for qlo10k1 tool (used for loading patches into emu10k1
+ cards with a hardware MIDI synth). This tool won't be built, if
+ qt3 is not installed (or QT3=no or GUI=no is set in the environment).
+
+fltk - only used for the hdspconf and hdspmixer tools (only useful for
+ Hammerfall HDSP cards). This tool won't be built, if fltk is not
+ installed (or FLTK=no or GUI=no is set in the environment).
diff --git a/audio/alsa-tools/alsa-tools.SlackBuild b/audio/alsa-tools/alsa-tools.SlackBuild
index 893f855438..f3ce60bec4 100644
--- a/audio/alsa-tools/alsa-tools.SlackBuild
+++ b/audio/alsa-tools/alsa-tools.SlackBuild
@@ -4,7 +4,7 @@
# Written by B. Watson (yalhcru@gmail.com)
-# Licensed under the WTFPL. See http://sam.zoy.org/wtfpl/ for details.
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
# I am *not* going to create separate packages for each of the individual
# tools, as some distros do. They're small enough that it's worth the
@@ -14,7 +14,7 @@
# *** I agree. --rworkman :-)
PRGNAM=alsa-tools
-VERSION=${VERSION:-1.0.26.1}
+VERSION=${VERSION:-1.0.27}
BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
@@ -48,7 +48,7 @@ fi
set -e
FIRMWARE=alsa-firmware
-FIRMVER=1.0.25
+FIRMVER=1.0.27
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
@@ -68,24 +68,41 @@ find . \
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+# allow disabling all the GUI apps
+if [ "${GUI:-yes}" != "yes" ]; then
+ QT3=no
+ FLTK=no
+ rm -rf echomixer envy24control hdajackretask rmedigicontrol
+fi
+
# qlo10k1 depends on Qt3, which no longer ships with Slackware.
# This supports the SBo qt3 build. It's not enough to source qt.sh,
# the qt3 bin directories need to come first in $PATH too.
# If you got your Qt3 from some other source, you may have to
# fiddle with QTDIR and PATH yourself.
-if [ "${QT3:-no}" = "yes" ]; then
+if [ -e /opt/kde3/lib$LIBDIRSUFFIX/qt3 -a "${QT3:-yes}" = "yes" ]; then
source /etc/profile.d/qt.sh
- export PATH=/opt/kde3/lib/qt3/bin:/opt/kde3/bin:$PATH
+ export PATH=/opt/kde3/lib$LIBDIRSUFFIX/qt3/bin:/opt/kde3/bin:$PATH
else
rm -rf qlo10k1
fi
-# one loop to build them all
+# hdspconf and hdspmixer depend on fltk. Don't build them if disabled or
+# not installed.
+if [ -e /usr/bin/fltk-config -a "${FLTK:-yes}" = "yes" ]; then
+ : do nothing
+else
+ rm -rf hdspconf hdspmixer
+fi
+
+# one loop to build them all. The -include stddef.h fixes qlo10k1 'ptrdiff_t doesn't
+# name a type' errors, and doesn't hurt anything else.
for subdir in $( find . -name configure | sed -e 's,^\./,,' -e 's,/configure,,' ); do
cd $subdir
+ LDFLAGS="-L/usr/lib$LIBDIRSUFFIX" \
CFLAGS="$SLKCFLAGS" \
- CXXFLAGS="$SLKCFLAGS" \
+ CXXFLAGS="$SLKCFLAGS -include stddef.h" \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -130,7 +147,12 @@ CXXFLAGS="$SLKCFLAGS" \
make
make install-strip DESTDIR=$PKG
-# remove the hotplug scripts, since Slackware 13.37 doesn't use hotplug.
+# Niels Horn pointed out that some of the firmware shipped with this
+# package conflicts with Slackware's kernel-firmware package. The files
+# are identical, so just leave them out of this build.
+( cd $PKG/lib/firmware ; rm -rf ess korg sb16 yamaha )
+
+# remove the hotplug scripts, since Slackware 13.37 & up doesn't use hotplug.
# Instead, they've been converted to udev rules.
rm -rf $PKG/etc/hotplug
diff --git a/audio/alsa-tools/alsa-tools.info b/audio/alsa-tools/alsa-tools.info
index 66eb28300d..d2c5603c85 100644
--- a/audio/alsa-tools/alsa-tools.info
+++ b/audio/alsa-tools/alsa-tools.info
@@ -1,12 +1,12 @@
PRGNAM="alsa-tools"
-VERSION="1.0.26.1"
+VERSION="1.0.27"
HOMEPAGE="http://www.alsa-project.org/"
-DOWNLOAD="http://alsa.cybermirror.org/tools/alsa-tools-1.0.26.1.tar.bz2 \
- http://alsa.cybermirror.org/firmware/alsa-firmware-1.0.25.tar.bz2"
-MD5SUM="805526ea5d6c40e1f2c94cee86141230 \
- f1939da45b162c83a726c54a470ef139"
+DOWNLOAD="http://alsa.cybermirror.org/tools/alsa-tools-1.0.27.tar.bz2 \
+ http://alsa.cybermirror.org/firmware/alsa-firmware-1.0.27.tar.bz2"
+MD5SUM="1ea381d00a6069a98613aa7effa4cb51 \
+ b373b350d5151dd7d64db2fc12936b04"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="fltk"
+REQUIRES=""
MAINTAINER="B. Watson"
EMAIL="yalhcru@gmail.com"