slackbuilds/audio/alsaequal/lib64fix+EqRename.diff

62 lines
2.4 KiB
Diff

diff -Naur a/Makefile b/Makefile
--- a/Makefile 2010-03-05 17:30:39.000000000 +0000
+++ b/Makefile 2014-02-12 20:57:50.432081552 +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 a/ctl_equal.c b/ctl_equal.c
--- a/ctl_equal.c 2009-01-31 22:06:47.000000000 +0000
+++ b/ctl_equal.c 2014-02-12 21:12:08.155101938 +0000
@@ -166,8 +166,8 @@
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 *module = "Eq";
+ const char *library = "/usr/lib@LIBDIRSUFFIX@/ladspa/caps.so";
+ const char *module = "Eq10";
long channels = 2;
const char *sufix = " Playback Volume";
int err, i, index;
@@ -263,9 +263,10 @@
for(i = 0; i < equal->num_input_controls; i++) {
if(equal->control_data->control[i].type == LADSPA_CNTRL_INPUT) {
index = equal->control_data->control[i].index;
- if(equal->klass->PortDescriptors[index] !=
- (LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL)) {
- SNDERR("Problem with control file %s, %d.", controls, index);
+ //if(equal->klass->PortDescriptors[index] !=
+ // (LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL)) {
+ if((0xf & equal->control_data->control[i].type) != LADSPA_CNTRL_INPUT) {
+ SNDERR("Problem with control file %s, %d.", controls, index);
return -1;
}
equal->control_info[i].min =
diff -Naur a/pcm_equal.c b/pcm_equal.c
--- a/pcm_equal.c 2010-02-01 22:55:00.000000000 +0000
+++ b/pcm_equal.c 2014-02-12 20:49:41.297069927 +0000
@@ -150,8 +150,8 @@
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 *module = "Eq";
+ const char *library = "/usr/lib@LIBDIRSUFFIX@/ladspa/caps.so";
+ const char *module = "Eq10";
long channels = 2;
int err;