Репозитории ALT
| S: | 1.2.5-alt2 |
| D: | 1.0.16-alt1 |
| 5.1: | 1.0.20-alt3 |
| 4.1: | 1.0.15-alt1 |
| 4.0: | 1.0.14-alt1.1 |
| 3.0: | 1.0.9-alt1 |
Другие репозитории
| Upstream: | 1.0.16rc1 |
Группа :: Система/Ядро и оборудование
Пакет: alsa-tools
навигация по пакетам
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: alsa-tools-1.2.5-alt2.patch
Скачать
Скачать
.gear/rules | 3 +
.../tags/9e1072bbc1f121a164ba9830553b89c10ed4afc9 | 14 +
.gear/tags/list | 1 +
90-alsa-tools-firmware.rules | 12 +
alsa-tools.spec | 424 +++++++++++++++++++++
hdspconf/configure.ac | 1 +
hdspconf/src/Makefile.am | 2 +
hdspmixer/configure.ac | 1 +
hdspmixer/src/Makefile.am | 3 +-
mixartloader/Makefile.am | 2 +-
pcxhrloader/Makefile.am | 2 +-
qlo10k1/configure.ac | 12 -
usx2yloader/Makefile.am | 2 +-
usx2yloader/tascam_fw.in | 2 +-
vxloader/Makefile.am | 2 +-
15 files changed, 465 insertions(+), 18 deletions(-)
diff --git a/.gear/rules b/.gear/rules
new file mode 100644
index 0000000..0393b3a
--- /dev/null
+++ b/.gear/rules
@@ -0,0 +1,3 @@
+tar: v@version@:.
+diff: v@version@:. .
+copy: *.rules
diff --git a/.gear/tags/9e1072bbc1f121a164ba9830553b89c10ed4afc9 b/.gear/tags/9e1072bbc1f121a164ba9830553b89c10ed4afc9
new file mode 100644
index 0000000..779cbcd
--- /dev/null
+++ b/.gear/tags/9e1072bbc1f121a164ba9830553b89c10ed4afc9
@@ -0,0 +1,14 @@
+object 78e579b3e30076be9e69c410434621b205318dfb
+type commit
+tag v1.2.5
+tagger Jaroslav Kysela <perex@perex.cz> 1622454708 +0200
+
+Release v1.2.5
+
+Core
+ - Release v1.2.5
+hdspmixer
+ - hdspmixer: add output loopback buttons
+ - hdspmixer: enhance saving of presets
+
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
diff --git a/.gear/tags/list b/.gear/tags/list
new file mode 100644
index 0000000..026ccd8
--- /dev/null
+++ b/.gear/tags/list
@@ -0,0 +1 @@
+9e1072bbc1f121a164ba9830553b89c10ed4afc9 v1.2.5
diff --git a/90-alsa-tools-firmware.rules b/90-alsa-tools-firmware.rules
new file mode 100644
index 0000000..790cddf
--- /dev/null
+++ b/90-alsa-tools-firmware.rules
@@ -0,0 +1,12 @@
+# TASCAM US-428 usb sound card.
+SUBSYSTEM=="usb", ACTION=="add", ATTRS{idVendor}=="1604", ATTRS{idProduct}=="8000", RUN+="/lib/udev/tascam_fw"+SUBSYSTEM=="usb", ACTION=="add", ATTRS{idVendor}=="1604", ATTRS{idProduct}=="8001", RUN+="/lib/udev/tascam_fpga"+
+# TASCAM US-224 usb sound card.
+SUBSYSTEM=="usb", ACTION=="add", ATTRS{idVendor}=="1604", ATTRS{idProduct}=="8004", RUN+="/lib/udev/tascam_fw"+SUBSYSTEM=="usb", ACTION=="add", ATTRS{idVendor}=="1604", ATTRS{idProduct}=="8005", RUN+="/lib/udev/tascam_fpga"+
+# TASCAM US-122 usb sound card.
+SUBSYSTEM=="usb", ACTION=="add", ATTRS{idVendor}=="1604", ATTRS{idProduct}=="8006", RUN+="/lib/udev/tascam_fw"+SUBSYSTEM=="usb", ACTION=="add", ATTRS{idVendor}=="1604", ATTRS{idProduct}=="8007", RUN+="/lib/udev/tascam_fpga"+
diff --git a/alsa-tools.spec b/alsa-tools.spec
new file mode 100644
index 0000000..eac2357
--- /dev/null
+++ b/alsa-tools.spec
@@ -0,0 +1,424 @@
+%define basever 1.1.0
+
+Name: alsa-tools
+Version: 1.2.5
+Release: alt2
+
+Summary: Advanced Linux Sound Architecture (ALSA) tools
+License: GPLv2+
+Group: System/Kernel and hardware
+
+Url: http://www.alsa-project.org/
+Source0: %name-%version.tar
+Source1: 90-alsa-tools-firmware.rules
+Patch: %name-%version-%release.patch
+Packager: Valery Inozemtsev <shrek@altlinux.ru>
+
+Obsoletes: hda-verb < 0.4
+Obsoletes: alsa2-tools < 0.9.4
+Provides: alsa2-tools = %version
+Requires: libalsa >= %basever
+# echomixer
+Requires: fonts-bitmap-misc
+# due to %%_bindir/as10k1
+Conflicts: emu10k1-tools
+# someone remind me how to cheat SourceIfExists clones
+Provides: /etc/default/ld10k1
+
+BuildRequires: gcc-c++ libgtk+2-devel libgtk+3-devel
+BuildRequires: libalsa-devel >= %basever
+BuildRequires: rpm-build-python3
+
+%define udevdir /lib/udev
+
+Summary(ru_RU.UTF-8): п≤п╫я│я┌я─я┐п╪п╣п╫я┌я▀ ALSA
+Summary(uk_UA.UTF-8): п├п╫я│я┌я─я┐п╪п╣п╫я┌п╦ ALSA
+
+%description
+Advanced Linux Sound Architecture (ALSA) tools. Modularized architecture
+with support for a large range of ISA and PCI cards. Fully compatible
+with OSS/Lite but contains many enhanced features.
+
+You may install this package if you really want use this low-level utils
+with some audio cards.
+
+%description -l ru_RU.UTF-8
+п÷п╟п╨п╣я┌ я│п╬п╢п╣я─п╤п╦я┌ п╦п╫я│я┌я─я┐п╪п╣п╫я┌я▀ ALSA (я│п╬п╡я─п╣п╪п╣п╫п╫п╬п╧ п╥п╡я┐п╨п╬п╡п╬п╧ п©п╬п╢я│п╦я│я┌п╣п╪я▀ Linux),
+п©я─п╣п╢п╫п╟п╥п╫п╟я┤п╣п╫п╫я▀п╣ п╢п╩я▐ п╫п╦п╥п╨п╬я┐я─п╬п╡п╫п╣п╡п╬п╧ я─п╟п╠п╬я┌я▀ я│ п╫п╣п╨п╬я┌п╬я─я▀п╪п╦ п╥п╡я┐п╨п╬п╡я▀п╪п╦ п╨п╟я─я┌п╟п╪п╦
+(п╫п╟ я┤п╦п©п╟я┘ Envy24, EMU10K1).
+
+%description -l uk_UA.UTF-8
+п÷п╟п╨я┐п╫п╬п╨ п╪я√я│я┌п╦я┌я▄ я√п╫я│я┌я─я┐п╪п╣п╫я┌п╦ ALSA (я│я┐я┤п╟я│п╫п╬я≈ п╥п╡я┐п╨п╬п╡п╬я≈ п©я√п╢я│п╦я│я┌п╣п╪п╦ Linux),
+я┴п╬ п╥п╟я│я┌п╬я│п╬п╡я┐я▌я┌я▄я│я▐ п╢п╩я▐ п╫п╦п╥я▄п╨п╬я─я√п╡п╫п╣п╡п╬я≈ я─п╬п╠п╬я┌п╦ я√п╥ п╢п╣я▐п╨п╦п╪п╦ п╥п╡я┐п╨п╬п╡п╦п╪п╦
+п╨п╟я─я┌п╨п╟п╪п╦ (п╫п╟ я┤я√п©п╟я┘ Envy24, EMU10K1).
+
+%package -n hwmixvolume
+Summary: Control individual streams volume on hardware-mixing soundcards
+Group: System/Kernel and hardware
+BuildArch: noarch
+
+%description -n hwmixvolume
+This tool allows you to control the volume of individual streams
+on sound cards that use hardware mixing, i.e., those based on the
+following chips:
+* Creative Emu10k1 (SoundBlaster Live!) (driver: snd-emu10k1)
+* VIA VT823x southbridge (driver: snd-via82xx)
+* Yamaha DS-1 (YMF-724/740/744/754) (driver: snd-ymfpci)
+
+It is recommended to use at least Linux kernel 2.6.32
+or alsa-driver 1.0.22; otherwise, the name of the program
+that is using a stream cannot be shown.
+
+%package -n hdajackretask
+Summary: ALSA soundcard jack task manipulation tool
+Group: System/Kernel and hardware
+
+%description -n hdajackretask
+Most HDA Intel soundcards are to some degree retaskable, i.e. can
+be used for more than one thing. This tool is a GUI to make it
+easy to retask your jacks - e g, turn your Mic jack into an extra
+Headphone, or why not make them both line outs and connect them
+to your surround receiver?
+
+%package -n ld10k1
+Summary: EMU10K1 patch loader/linker
+Group: System/Kernel and hardware
+
+%description -n ld10k1
+EMU10K1 patch loader/linker, see also as10k1
+
+%package -n liblo10k1
+Summary: lo10k1 library
+Group: System/Libraries
+
+%description -n liblo10k1
+lo10k1 library
+
+%package -n liblo10k1-devel
+Summary: lo10k1 library, development part
+Group: Development/C
+
+%description -n liblo10k1-devel
+lo10k1 library, development part
+
+%prep
+%setup
+%patch -p1
+
+sed -E -i '1 s@^(#![[:space:]]*)%_bindir/(env[[:space:]]+)?python\>@\1%__python3@' hwmixvolume/hwmixvolume
+
+mv seq/sbiload sbiload
+rm -rf {seq,hdsp*,qlo10k1}+
+%build
+export PATH=$PATH:$(pwd)/as10k1
+for d in *; do
+ if [ -d $d ]; then
+ cd $d
+ %autoreconf
+ %configure
+ %make_build
+ cd ..
+ fi
+done
+
+%install
+for d in *; do
+ if [ -d $d ]; then
+ cd $d
+ %makeinstall_std
+ cd ..
+ fi
+done
+
+# convert hotplug stuff to udev
+rm -f %buildroot%_sysconfdir/hotplug/usb/tascam_fw.usermap
+mkdir -p %buildroot{%udevdir,%_udevrulesdir}+mv %buildroot%_sysconfdir/hotplug/usb/* %buildroot%udevdir/
+install -pm644 %SOURCE1 %buildroot%_udevrulesdir/
+
+%files
+%exclude %_bindir/hdajackretask
+%exclude %_bindir/hwmixvolume
+%exclude %_bindir/lo10k1
+%_bindir/*
+%_datadir/sounds/opl3
+%_man1dir/*
+%_udevrulesdir/*.rules
+%udevdir/tascam_fpga
+%udevdir/tascam_fw
+
+%files -n hdajackretask
+%_bindir/hdajackretask
+
+%files -n hwmixvolume
+%_bindir/hwmixvolume
+
+%files -n ld10k1
+%_bindir/lo10k1
+%_sbindir/*
+%_datadir/ld10k1
+
+%files -n liblo10k1
+%_libdir/liblo10k1.so.*
+
+%files -n liblo10k1-devel
+%_includedir/lo10k1
+%_libdir/liblo10k1.so
+%_datadir/aclocal/ld10k1.m4
+
+# TODO:
+# - consider http://cvs.fedoraproject.org/viewvc/rpms/alsa-tools/devel/
+
+%changelog
+* Thu Oct 21 2021 Grigory Ustinov <grenka@altlinux.org> 1.2.5-alt2
+- Use python3 for hwmixvolume.
+
+* Tue Jun 01 2021 Michael Shigorin <mike@altlinux.org> 1.2.5-alt1
+- 1.2.5
+
+* Thu May 27 2021 Michael Shigorin <mike@altlinux.org> 1.2.2-alt2
+- explicit BR: rpm-build-python
+
+* Fri Feb 21 2020 Michael Shigorin <mike@altlinux.org> 1.2.2-alt1
+- 1.2.2
+- hwmixvolume: python2
+- (hopefully) fixed ancient changelog record's bogus date
+
+* Wed Oct 17 2018 Michael Shigorin <mike@altlinux.org> 1.1.7-alt1
+- 1.1.7
+
+* Wed Apr 04 2018 Michael Shigorin <mike@altlinux.org> 1.1.6-alt1
+- 1.1.6
+
+* Sat Dec 02 2017 Igor Vlasenko <viy@altlinux.ru> 1.1.5-alt2
+- NMU: added Obsoletes: hda-verb
+
+* Wed Nov 22 2017 Michael Shigorin <mike@altlinux.org> 1.1.5-alt1
+- 1.1.5
+
+* Mon May 29 2017 Michael Shigorin <mike@altlinux.org> 1.1.3-alt1
+- 1.1.3
+
+* Mon Nov 09 2015 Michael Shigorin <mike@altlinux.org> 1.1.0-alt1
+- 1.1.0
+
+* Mon Mar 02 2015 Michael Shigorin <mike@altlinux.org> 1.0.29-alt2
+- moved 90-alsa-tools-firmware.rules file
+ from %_sysconfdir/udev/rules.d/
+ to %_udevrulesdir/
+
+* Fri Feb 27 2015 Michael Shigorin <mike@altlinux.org> 1.0.29-alt1
+- 1.0.29
+
+* Wed Jun 18 2014 Michael Shigorin <mike@altlinux.org> 1.0.28-alt1
+- 1.0.28
+
+* Sat Apr 13 2013 Michael Shigorin <mike@altlinux.org> 1.0.27-alt2
+- retag
+
+* Sat Apr 13 2013 Michael Shigorin <mike@altlinux.org> 1.0.27-alt1
+- 1.0.27
+
+* Fri Sep 07 2012 Michael Shigorin <mike@altlinux.org> 1.0.26.1-alt4
+- fixed udev rules (closes: #27623)
+
+* Fri Sep 07 2012 Michael Shigorin <mike@altlinux.org> 1.0.26.1-alt3
+- merge gears repo
+
+* Fri Sep 07 2012 Michael Shigorin <mike@altlinux.org> 1.0.26.1-alt2
+- retag
+
+* Thu Sep 06 2012 Michael Shigorin <mike@altlinux.org> 1.0.26.1-alt1
+- 10.26.1
+- added hdajackretask subpackage (requires GTK3)
+
+* Mon Nov 14 2011 Vitaly Kuznetsov <vitty@altlinux.ru> 1.0.24.1-alt2.1.1
+- Rebuild with Python-2.7
+
+* Fri Jun 24 2011 Michael Shigorin <mike@altlinux.org> 1.0.24.1-alt2.1
+- hwmixvolume made noarch
+
+* Fri Jun 24 2011 Michael Shigorin <mike@altlinux.org> 1.0.24.1-alt2
+- moved hwmixvolume into a subpackage of its own (requires pygtk)
+ + thanks sr@ for bringing attention to this
+
+* Wed Feb 16 2011 Michael Shigorin <mike@altlinux.org> 1.0.24.1-alt1
+- 1.0.24.1
+
+* Thu Oct 21 2010 Michael Shigorin <mike@altlinux.org> 1.0.23-alt1
+- 1.0.23
+
+* Thu Dec 17 2009 Michael Shigorin <mike@altlinux.org> 1.0.22-alt2
+- adapted hotplug->udev tascam handling from fedora spec
+- added fonts-bitmap-misc dependency for echomixer (RH#503284)
+
+* Thu Dec 17 2009 Michael Shigorin <mike@altlinux.org> 1.0.22-alt1
+- 1.0.22
+
+* Tue Jun 23 2009 Valery Inozemtsev <shrek@altlinux.ru> 1.0.20-alt3
+- fixed firmware path
+
+* Sun May 17 2009 Valery Inozemtsev <shrek@altlinux.ru> 1.0.20-alt2
+- rebuild
+
+* Thu May 07 2009 Valery Inozemtsev <shrek@altlinux.ru> 1.0.20-alt1
+- 1.0.20
+
+* Mon Jan 19 2009 Valery Inozemtsev <shrek@altlinux.ru> 1.0.19-alt1
+- 1.0.19
+
+* Wed Oct 29 2008 Valery Inozemtsev <shrek@altlinux.ru> 1.0.18-alt1
+- 1.0.18
+
+* Wed Jul 16 2008 Valery Inozemtsev <shrek@altlinux.ru> 1.0.17-alt1
+- 1.0.17
+
+* Thu May 01 2008 Valery Inozemtsev <shrek@altlinux.ru> 1.0.16-alt1
+- 1.0.16
+
+* Sun Jan 27 2008 Valery Inozemtsev <shrek@altlinux.ru> 1.0.15-alt1
+- 1.0.15
+- qlo10k1 build
+- spec cleanup
+- update build dependencies
+
+* Tue Sep 18 2007 Kirill A. Shutemov <kas@altlinux.ru> 1.0.14-alt1.1
+- NMU
+- Drop BuildRequires: kernel-headers-std. Use glibc-kernheaders instead.
+
+* Mon Jun 11 2007 Michael Shigorin <mike@altlinux.org> 1.0.14-alt1
+- 1.0.14
+- updated buildrequires
+- set _unpackaged_files_terminate_build
+
+* Mon Oct 16 2006 Michael Shigorin <mike@altlinux.org> 1.0.13-alt1
+- 1.0.13 (codename Dirty Hack)
+- s/2\.4/2.6/
+- disabled new-and-ugly qlo10k1 build for now
+- worked around echomixer, envy24control, rmedigicontrol
+ build regressions with --as-needed
+- split off ld10k1, liblo10k1{,devel} subpackages+
+* Wed Apr 19 2006 Michael Shigorin <mike@altlinux.org> 1.0.11-alt1
+- 1.0.11
+
+* Wed Apr 05 2006 Michael Shigorin <mike@altlinux.org> 1.0.11-alt0.4
+- 1.0.11rc4
+- spec cleanup
+
+* Sat Mar 04 2006 Michael Shigorin <mike@altlinux.org> 1.0.11-alt0.3
+- 1.0.11rc3
+
+* Sun Feb 05 2006 Michael Shigorin <mike@altlinux.org> 1.0.10-alt2
+- s/XFree86-devel-static/XFree86-devel/
+
+* Wed Nov 16 2005 Michael Shigorin <mike@altlinux.org> 1.0.10-alt1
+- 1.0.10
+
+* Thu Jun 23 2005 Michael Shigorin <mike@altlinux.org> 1.0.9-alt1
+- 1.0.9
+- NB: %_datadir/emu10k1 asm files renamed in upstream
+- found echomixer, adding menufile. :)
+
+* Thu Jun 09 2005 Michael Shigorin <mike@altlinux.ru> 1.0.9-alt0
+- 1.0.9
+- removed gcc34 patch
+
+* Wed Feb 23 2005 Michael Shigorin <mike@altlinux.ru> 1.0.8-alt2
+- rebuilt with gcc3.4 (and gentoo patch for that matter)
+
+* Thu Jan 13 2005 Michael Shigorin <mike@altlinux.ru> 1.0.8-alt1
+- 1.0.8
+
+* Thu Dec 16 2004 Michael Shigorin <mike@altlinux.ru> 1.0.7-alt1
+- 1.0.7
+
+* Sat Jun 26 2004 Michael Shigorin <mike@altlinux.ru> 1.0.5-alt2
+- fixed thinko in Conflicts:
+- added ru/uk package info
+- renamed %_menudir/*.menu to drop ".menu" suffix
+- updated kernel headers version
+
+* Mon May 31 2004 Michael Shigorin <mike@altlinux.ru> 1.0.5-alt1
+- 1.0.5
+
+* Sat Apr 03 2004 Michael Shigorin <mike@altlinux.ru> 1.0.4-alt1
+- 1.0.4
+- added menufiles for envy24control and hdspconf, thanks to Sergey Pinaev (dfo@)
+ for notifyin' and buggin' till it was done :-)
+
+* Sun Mar 21 2004 Michael Shigorin <mike@altlinux.ru> 1.0.3-alt2
+- got back missing envy24control binary
+ (thanks to Sergey Pinaev <dfo antex ru> for noticing)
+- added Conflicts: emu10k1-tools
+
+* Tue Mar 02 2004 Michael Shigorin <mike@altlinux.ru> 1.0.3-alt1
+- 1.0.3
+
+* Thu Jan 29 2004 Michael Shigorin <mike@altlinux.ru> 1.0.2-alt2
+- 1.0.2, Final Upload by ALSA Project (TM) 20040129 18:35 +0200
+- thanks to Sergey Vlasov (vsu@) for alerting about re-uploads
+
+* Wed Jan 28 2004 Michael Shigorin <mike@altlinux.ru> 1.0.2-alt1
+- 1.0.2
+- removed "alsa" dependency for the time being
+- spec cleanup: cycle over found targets instead of copy/paste blocks
+ (also fixes #3230)
+- revamped docs unclash/installation
+- refreshed build deps
+- fixed CLAGS typo
+
+* Thu Jan 15 2004 Michael Shigorin <mike@altlinux.ru> 1.0.1-alt1
+- 1.0.1
+
+* Wed Oct 22 2003 Michael Shigorin <mike@altlinux.ru> 0.9.8-alt1
+- 0.9.8
+- updated buildrequires
+- spec cleanup
+
+* Fri Sep 26 2003 Michael Shigorin <mike@altlinux.ru> 0.9.7-alt1
+- 0.9.7
+- updated --with-soundbase value to reflect unified alsa headers location
+
+* Wed Jul 30 2003 Michael Shigorin <mike@altlinux.ru> 0.9.6-alt1
+- 0.9.6
+
+* Tue Jul 15 2003 Michael Shigorin <mike@altlinux.ru> 0.9.5-alt1
+- 0.9.5
+
+* Mon Jun 23 2003 Michael Shigorin <mike@altlinux.ru> 0.9.4-alt1
+- 0.9.4
+- renamed to alsa-tools
+
+* Wed Apr 02 2003 Michael Shigorin <mike@altlinux.ru> 0.9.1-alt0.1
+- 0.9.1 (unofficial build)
+
+* Tue Feb 04 2003 Rider <rider@altlinux.ru> 0.9.0rc7-alt2
+- 0.9.0rc7
+
+* Mon Jan 20 2003 Rider <rider@altlinux.ru> 0.9.0rc6-alt2
+- build requires fix (autoconf & automake)
+
+* Tue Nov 26 2002 Konstantin Volckov <goldhead@altlinux.ru> 0.9.0rc6-alt1
+- 0.9.0rc6
+- Rebuilt in new environment
+
+* Fri Jun 07 2002 Konstantin Volckov <goldhead@altlinux.ru> 0.9.0rc1-alt1
+- 0.9.0rc1
+
+* Thu Feb 28 2002 Konstantin Volckov <goldhead@altlinux.ru> 0.9.0beta12-alt1
+- 0.9.0beta12
+
+* Wed Dec 26 2001 Konstantin Volckov <goldhead@altlinux.ru> 0.9.0beta10-alt1
+- 0.9.0beta10
+- Removed as10k1 to avoid conflicts with emu10k1-utils
+
+* Wed Nov 21 2001 Konstantin Volckov <goldhead@altlinux.ru> 0.9.0beta9-alt1
+- 0.9.0beta9
+
+* Fri Oct 12 2001 Konstantin Volckov <goldhead@altlinux.ru> 0.9.0beta8-alt1
+- 0.9.0beta8
+
+* Fri Sep 21 2001 Konstantin Volckov <goldhead@altlinux.ru> 0.9.0beta7-alt1
+- First build for Sisyphus
diff --git a/hdspconf/configure.ac b/hdspconf/configure.ac
index e11d481..76068d3 100644
--- a/hdspconf/configure.ac
+++ b/hdspconf/configure.ac
@@ -35,6 +35,7 @@ if test "$FLTK_CONFIG" = "no" && ! test "`hostname -f`" = "alsa.alsa-project.org
fi
FLTK_CXXFLAGS="`$FLTK_CONFIG $fltk_config_args --cxxflags` -fno-exceptions"
FLTK_LIBS=`$FLTK_CONFIG $fltk_config_args --ldflags`
+AC_SUBST(FLTK_LIBS)
CXXFLAGS="$CXXFLAGS $ALSA_CFLAGS $FLTK_CXXFLAGS"
LIBS="$LIBS $ALSA_LIBS $FLTK_LIBS"
diff --git a/hdspconf/src/Makefile.am b/hdspconf/src/Makefile.am
index 9f29a4d..86e5c5c 100644
--- a/hdspconf/src/Makefile.am
+++ b/hdspconf/src/Makefile.am
@@ -38,3 +38,5 @@ hdspconf_SOURCES = \
pixmaps.h \
labels.cxx \
labels.h
+
+hdspconf_LDADD = $(ALSA_LIBS) $(FLTK_LIBS)
diff --git a/hdspmixer/configure.ac b/hdspmixer/configure.ac
index 167e4f4..621decf 100644
--- a/hdspmixer/configure.ac
+++ b/hdspmixer/configure.ac
@@ -16,6 +16,7 @@ if test "$FLTK_CONFIG" = "no" && ! test "`hostname -f`" = "alsa.alsa-project.org
fi
FLTK_CXXFLAGS="`$FLTK_CONFIG --cxxflags` -fno-exceptions"
FLTK_LIBS="`$FLTK_CONFIG --ldflags`"
+AC_SUBST(FLTK_LIBS)
CXXFLAGS="$CXXFLAGS $ALSA_CFLAGS $FLTK_CXXFLAGS"
LIBS="$LIBS $ALSA_LIBS $FLTK_LIBS"
diff --git a/hdspmixer/src/Makefile.am b/hdspmixer/src/Makefile.am
index ebc4c3c..7683f08 100644
--- a/hdspmixer/src/Makefile.am
+++ b/hdspmixer/src/Makefile.am
@@ -60,4 +60,5 @@ hdspmixer_SOURCES = \
defines.h \
channelmap.cxx \
channelmap.h
-
+
+hdspmixer_LDADD = $(ALSA_LIBS) $(FLTK_LIBS)
diff --git a/mixartloader/Makefile.am b/mixartloader/Makefile.am
index 1b488c4..2b7ca3b 100644
--- a/mixartloader/Makefile.am
+++ b/mixartloader/Makefile.am
@@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = 1.3 foreign
MYNAME = mixartloader
-AM_CFLAGS = -DDATAPATH=\"$(datadir)/alsa/firmware/$(MYNAME)\"
+AM_CFLAGS = -DDATAPATH=\"/lib/firmware/$(MYNAME)\"
bin_PROGRAMS = mixartloader
diff --git a/pcxhrloader/Makefile.am b/pcxhrloader/Makefile.am
index e6a0107..ab0b07d 100644
--- a/pcxhrloader/Makefile.am
+++ b/pcxhrloader/Makefile.am
@@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = 1.3 foreign
MYNAME = pcxhrloader
-AM_CFLAGS = -DDATAPATH=\"$(datadir)/alsa/firmware/$(MYNAME)\"
+AM_CFLAGS = -DDATAPATH=\"/lib/firmware/$(MYNAME)\"
bin_PROGRAMS = pcxhrloader
diff --git a/qlo10k1/configure.ac b/qlo10k1/configure.ac
index 6e698d4..21ff54a 100644
--- a/qlo10k1/configure.ac
+++ b/qlo10k1/configure.ac
@@ -11,18 +11,7 @@ AC_PROG_LIBTOOL
AC_C_BIGENDIAN
gw_CHECK_QT
-dnl Check ld10k1 availability
-AC_ARG_WITH(ld10k1,
- [ --with-ld10k1 local|system Specify the ld10k1 installation (default=local)],
- ld10k1="$withval",
- ld10k1="local")
-
-if test "$ld10k1" = "system"; then
- AM_PATH_LD10K1(0.1.8)
-else
- if test "$ld10k1" = "local"; then
ld10k1="../ld10k1"
- fi
test -d "$ld10k1" || AC_MSG_ERROR([Cannot find ld10k1 directory $ld10k1])
rm -f ld10k1
ln -s $ld10k1 ld10k1
@@ -33,7 +22,6 @@ else
LD10K1_LIBS="-L$ld10k1/src -llo10k1"
AC_SUBST(LD10K1_CFLAGS)
AC_SUBST(LD10K1_LIBS)
-fi
AC_OUTPUT(Makefile
src/Makefile)
diff --git a/usx2yloader/Makefile.am b/usx2yloader/Makefile.am
index 4cc9a70..dc5a50b 100644
--- a/usx2yloader/Makefile.am
+++ b/usx2yloader/Makefile.am
@@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = 1.3 foreign
MYNAME = usx2yloader
-AM_CFLAGS = -DDATAPATH=\"$(datadir)/alsa/firmware/$(MYNAME)\"
+AM_CFLAGS = -DDATAPATH=\"/lib/firmware/$(MYNAME)\"
bin_PROGRAMS = usx2yloader
diff --git a/usx2yloader/tascam_fw.in b/usx2yloader/tascam_fw.in
index d3145e3..61fcbae 100644
--- a/usx2yloader/tascam_fw.in
+++ b/usx2yloader/tascam_fw.in
@@ -6,7 +6,7 @@ prefix=@prefix@
exec_prefix=@exec_prefix@
FIRMWARE=
-FIRMWAREDIR=@datadir@/alsa/firmware/usx2yloader
+FIRMWAREDIR=/lib/firmware/usx2yloader
FLAGS=
LOADER=/sbin/fxload
LOADERFIRMWARE=$FIRMWAREDIR/tascam_loader.ihx
diff --git a/vxloader/Makefile.am b/vxloader/Makefile.am
index 415d776..0316722 100644
--- a/vxloader/Makefile.am
+++ b/vxloader/Makefile.am
@@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = 1.3 foreign
MYNAME = vxloader
-AM_CFLAGS = -DDATAPATH=\"$(datadir)/alsa/firmware/$(MYNAME)\"
+AM_CFLAGS = -DDATAPATH=\"/lib/firmware/$(MYNAME)\"
bin_PROGRAMS = vxloader