audio/alsaequal: Fixed build/use on x86_64

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
This commit is contained in:
David Woodfall 2011-03-05 17:05:51 -06:00 committed by Robby Workman
parent d71bb2d103
commit c6cf8b80af
2 changed files with 50 additions and 6 deletions

View file

@ -2,7 +2,7 @@
# Slackware build script for alsaequal
# Copyright 2010 David Woodfall <dave@dawoodfall.net>
# Copyright 2011 David Woodfall <dave@dawoodfall.net>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@ -24,7 +24,7 @@
PRGNAM=alsaequal
VERSION=${VERSION:-0.6}
BUILD=${BUILD:-1}
BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@ -57,7 +57,7 @@ fi
set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
mkdir -p $TMP $PKG/usr/lib${LIBDIRSUFFIX}/alsa-lib $OUTPUT
cd $TMP
rm -rf $PRGNAM
tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
@ -69,10 +69,11 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
make CFLAGS="$SLKCFLAGS" Q=
# Fixes for x86_64
sed "s/@LIBDIRSUFFIX@/$LIBDIRSUFFIX/g" $CWD/lib64fix.diff | patch -p1
mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/alsa-lib
cp -a libasound_module_*_equal.so $PKG/usr/lib${LIBDIRSUFFIX}/alsa-lib
make CFLAGS="$SLKCFLAGS" Q=
make install DESTDIR=$PKG
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true

View file

@ -0,0 +1,43 @@
diff -Naur alsaequal-orig/Makefile alsaequal/Makefile
--- alsaequal-orig/Makefile 2010-03-05 17:30:39.000000000 +0000
+++ alsaequal/Makefile 2011-01-17 22:13:10.156344120 +0000
@@ -45,11 +45,11 @@
install: all
@echo Installing...
- $(Q)install -m 644 $(SND_PCM_BIN) ${DESTDIR}/usr/lib/alsa-lib/
- $(Q)install -m 644 $(SND_CTL_BIN) ${DESTDIR}/usr/lib/alsa-lib/
+ $(Q)install -m 644 $(SND_PCM_BIN) ${DESTDIR}/usr/lib@LIBDIRSUFFIX@/alsa-lib/
+ $(Q)install -m 644 $(SND_CTL_BIN) ${DESTDIR}/usr/lib@LIBDIRSUFFIX@/alsa-lib/
uninstall:
@echo Un-installing...
- $(Q)rm ${DESTDIR}/usr/lib/alsa-lib/$(SND_PCM_BIN)
- $(Q)rm ${DESTDIR}/usr/lib/alsa-lib/$(SND_CTL_BIN)
+ $(Q)rm ${DESTDIR}/usr/lib@LIBDIRSUFFIX@/alsa-lib/$(SND_PCM_BIN)
+ $(Q)rm ${DESTDIR}/usr/lib@LIBDIRSUFFIX@/alsa-lib/$(SND_CTL_BIN)
diff -Naur alsaequal-orig/ctl_equal.c alsaequal/ctl_equal.c
--- alsaequal-orig/ctl_equal.c 2009-01-31 22:06:47.000000000 +0000
+++ alsaequal/ctl_equal.c 2011-01-17 23:08:54.273018904 +0000
@@ -166,7 +166,7 @@
snd_config_iterator_t it, next;
snd_ctl_equal_t *equal;
const char *controls = ".alsaequal.bin";
- const char *library = "/usr/lib/ladspa/caps.so";
+ const char *library = "/usr/lib@LIBDIRSUFFIX@/ladspa/caps.so";
const char *module = "Eq";
long channels = 2;
const char *sufix = " Playback Volume";
diff -Naur alsaequal-orig/pcm_equal.c alsaequal/pcm_equal.c
--- alsaequal-orig/pcm_equal.c 2010-02-01 22:55:00.000000000 +0000
+++ alsaequal/pcm_equal.c 2011-01-17 23:07:56.424897961 +0000
@@ -150,7 +150,7 @@
snd_pcm_equal_t *equal;
snd_config_t *sconf = NULL;
const char *controls = ".alsaequal.bin";
- const char *library = "/usr/lib/ladspa/caps.so";
+ const char *library = "/usr/lib@LIBDIRSUFFIX@/ladspa/caps.so";
const char *module = "Eq";
long channels = 2;
int err;