.gear/rules | 2 + .../tags/6dd954bed767c340b7925779802331698d4526fe | 8 + .gear/tags/list | 1 + alsa-tools.spec | 278 ++++++++++++++++++++ echomixer/configure.in | 1 - envy24control/configure.in | 1 - envy24control/strstr_icase_blank.c | 2 +- hdspconf/configure.in | 1 + hdspconf/src/Makefile.am | 2 + hdspmixer/configure.in | 1 + hdspmixer/src/Makefile.am | 2 + mixartloader/Makefile.am | 2 +- pcxhrloader/Makefile.am | 2 +- qlo10k1/configure.in | 12 - rmedigicontrol/configure.in | 1 - usx2yloader/Makefile.am | 2 +- usx2yloader/tascam_fw.in | 2 +- vxloader/Makefile.am | 2 +- 18 files changed, 301 insertions(+), 21 deletions(-) diff --git a/.gear/rules b/.gear/rules new file mode 100644 index 0000000..4b0460c --- /dev/null +++ b/.gear/rules @@ -0,0 +1,2 @@ +tar: v@version@:. +diff: v@version@:. . diff --git a/.gear/tags/6dd954bed767c340b7925779802331698d4526fe b/.gear/tags/6dd954bed767c340b7925779802331698d4526fe new file mode 100644 index 0000000..469fe8f --- /dev/null +++ b/.gear/tags/6dd954bed767c340b7925779802331698d4526fe @@ -0,0 +1,8 @@ +object 50343797287e7944821b06537dae6eded99a727c +type commit +tag v1.0.20 +tagger Jaroslav Kysela 1241593645 +0200 + +Release v1.0.20 + +Signed-off-by: Jaroslav Kysela diff --git a/.gear/tags/list b/.gear/tags/list new file mode 100644 index 0000000..dd97531 --- /dev/null +++ b/.gear/tags/list @@ -0,0 +1 @@ +6dd954bed767c340b7925779802331698d4526fe v1.0.20 diff --git a/alsa-tools.spec b/alsa-tools.spec new file mode 100644 index 0000000..3e35c5a --- /dev/null +++ b/alsa-tools.spec @@ -0,0 +1,278 @@ +Name: alsa-tools +Version: 1.0.20 +Release: alt3 +Summary: Advanced Linux Sound Architecture (ALSA) tools +Summary(ru_RU.UTF-8): Инструменты ALSA +Summary(uk_UA.UTF-8): Інструменти ALSA +License: GPL +Group: System/Kernel and hardware +Url: http://www.alsa-project.org/ +Packager: Valery Inozemtsev + +Obsoletes: alsa2-tools < 0.9.4 +Provides: alsa2-tools = %version +Requires: libalsa >= %version +# due to %_bindir/as10k1 +Conflicts: emu10k1-tools +# someone remind me how to cheat SourceIfExists clones +Provides: /etc/default/ld10k1 + +Source: %name-%version.tar +Patch: %name-%version-%release.patch + +BuildRequires: gcc-c++ libgtk+2-devel +BuildRequires: libalsa-devel >= %version + +%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 +(kernel sound drivers), 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 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 -q +%patch -p1 + +mv seq/sbiload sbiload +rm -fr {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 + %make DESTDIR=%buildroot install + cd .. + fi +done + +%files +%exclude %_bindir/lo10k1 +%_bindir/* +%_datadir/sounds/opl3 +%_man1dir/* + +%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 + +%changelog +* Tue Jun 23 2009 Valery Inozemtsev 1.0.20-alt3 +- fixed firmware path + +* Sun May 17 2009 Valery Inozemtsev 1.0.20-alt2 +- rebuild + +* Thu May 07 2009 Valery Inozemtsev 1.0.20-alt1 +- 1.0.20 + +* Mon Jan 19 2009 Valery Inozemtsev 1.0.19-alt1 +- 1.0.19 + +* Wed Oct 29 2008 Valery Inozemtsev 1.0.18-alt1 +- 1.0.18 + +* Wed Jul 16 2008 Valery Inozemtsev 1.0.17-alt1 +- 1.0.17 + +* Thu May 01 2008 Valery Inozemtsev 1.0.16-alt1 +- 1.0.16 + +* Sun Jan 27 2008 Valery Inozemtsev 1.0.15-alt1 +- 1.0.15 +- qlo10k1 build +- spec cleanup +- update build dependencies + +* Tue Sep 18 2007 Kirill A. Shutemov 1.0.14-alt1.1 +- NMU +- Drop BuildRequires: kernel-headers-std. Use glibc-kernheaders instead. + +* Mon Jun 11 2007 Michael Shigorin 1.0.14-alt1 +- 1.0.14 +- updated buildrequires +- set _unpackaged_files_terminate_build + +* Mon Oct 16 2006 Michael Shigorin 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 1.0.11-alt1 +- 1.0.11 + +* Wed Apr 05 2006 Michael Shigorin 1.0.11-alt0.4 +- 1.0.11rc4 +- spec cleanup + +* Sat Mar 04 2006 Michael Shigorin 1.0.11-alt0.3 +- 1.0.11rc3 + +* Sun Feb 05 2006 Michael Shigorin 1.0.10-alt2 +- s/XFree86-devel-static/XFree86-devel/ + +* Wed Nov 16 2005 Michael Shigorin 1.0.10-alt1 +- 1.0.10 + +* Thu Jun 23 2005 Michael Shigorin 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 1.0.9-alt0 +- 1.0.9 +- removed gcc34 patch + +* Wed Feb 23 2005 Michael Shigorin 1.0.8-alt2 +- rebuilt with gcc3.4 (and gentoo patch for that matter) + +* Thu Jan 13 2005 Michael Shigorin 1.0.8-alt1 +- 1.0.8 + +* Thu Dec 16 2004 Michael Shigorin 1.0.7-alt1 +- 1.0.7 + +* Sat Jun 26 2004 Michael Shigorin 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 1.0.5-alt1 +- 1.0.5 + +* Sat Apr 03 2004 Michael Shigorin 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 1.0.3-alt2 +- got back missing envy24control binary + (thanks to Sergey Pinaev for noticing) +- added Conflicts: emu10k1-tools + +* Tue Mar 02 2004 Michael Shigorin 1.0.3-alt1 +- 1.0.3 + +* Thu Jan 29 2004 Michael Shigorin 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 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 1.0.1-alt1 +- 1.0.1 + +* Wed Oct 22 2003 Michael Shigorin 0.9.8-alt1 +- 0.9.8 +- updated buildrequires +- spec cleanup + +* Fri Sep 26 2003 Michael Shigorin 0.9.7-alt1 +- 0.9.7 +- updated --with-soundbase value to reflect unified alsa headers location + +* Wed Jul 30 2003 Michael Shigorin 0.9.6-alt1 +- 0.9.6 + +* Tue Jul 15 2003 Michael Shigorin 0.9.5-alt1 +- 0.9.5 + +* Mon Jun 23 2003 Michael Shigorin 0.9.4-alt1 +- 0.9.4 +- renamed to alsa-tools + +* Wed Apr 02 2003 Michael Shigorin 0.9.1-alt0.1 +- 0.9.1 (unofficial build) + +* Tue Feb 04 2003 Rider 0.9.0rc7-alt2 +- 0.9.0rc7 + +* Mon Jan 20 2003 Rider 0.9.0rc6-alt2 +- build requires fix (autoconf & automake) + +* Tue Nov 26 2002 Konstantin Volckov 0.9.0rc6-alt1 +- 0.9.0rc6 +- Rebuilt in new environment + +* Mon Jun 07 2002 Konstantin Volckov 0.9.0rc1-alt1 +- 0.9.0rc1 + +* Thu Feb 28 2002 Konstantin Volckov 0.9.0beta12-alt1 +- 0.9.0beta12 + +* Wed Dec 26 2001 Konstantin Volckov 0.9.0beta10-alt1 +- 0.9.0beta10 +- Removed as10k1 to avoid conflicts with emu10k1-utils + +* Wed Nov 21 2001 Konstantin Volckov 0.9.0beta9-alt1 +- 0.9.0beta9 + +* Fri Oct 12 2001 Konstantin Volckov 0.9.0beta8-alt1 +- 0.9.0beta8 + +* Fri Sep 21 2001 Konstantin Volckov 0.9.0beta7-alt1 +- First build for Sisyphus diff --git a/echomixer/configure.in b/echomixer/configure.in index 2aca4ef..63dd0c4 100644 --- a/echomixer/configure.in +++ b/echomixer/configure.in @@ -15,7 +15,6 @@ PKG_CHECK_MODULES(ECHOMIXER, gtk+-2.0 alsa >= 1.0.0) else -AM_PATH_GTK(1.2.0) AM_PATH_ALSA(1.0.0) ECHOMIXER_CFLAGS="$CFLAGS $ALSA_CFLAGS $GTK_CFLAGS" ECHOMIXER_LIBS="$LIBS $ALSA_LIBS $GTK_LIBS" diff --git a/envy24control/configure.in b/envy24control/configure.in index 30dc8a8..65b8107 100644 --- a/envy24control/configure.in +++ b/envy24control/configure.in @@ -14,7 +14,6 @@ PKG_CHECK_MODULES(ENVY24CONTROL, gtk+-2.0 alsa >= 0.9.0) else -AM_PATH_GTK(1.0.1) AM_PATH_ALSA(1.0.0) ENVY24CONTROL_CFLAGS="$CFLAGS $ALSA_CFLAGS $GTK_CFLAGS" ENVY24CONTROL_LIBS="$LIBS $ALSA_LIBS $GTK_LIBS" diff --git a/envy24control/strstr_icase_blank.c b/envy24control/strstr_icase_blank.c index af44854..1dbe5dc 100644 --- a/envy24control/strstr_icase_blank.c +++ b/envy24control/strstr_icase_blank.c @@ -48,7 +48,7 @@ int strstr_icase_blank(const char * const string1, const char * const string2) char search_string[MAX_SEARCH_FIELD_LENGTH]; char *pstr; int pos_first_non_blank; - int isblank(int c); +// int isblank(int c); strncpy(search_string, string2, MAX_SEARCH_FIELD_LENGTH); search_string[MAX_SEARCH_FIELD_LENGTH - 1] = '\0'; diff --git a/hdspconf/configure.in b/hdspconf/configure.in index 1aa6feb..615ddf0 100644 --- a/hdspconf/configure.in +++ b/hdspconf/configure.in @@ -34,6 +34,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" LDFLAGS="$LDFLAGS $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.in b/hdspmixer/configure.in index 8f2c498..141610f 100644 --- a/hdspmixer/configure.in +++ b/hdspmixer/configure.in @@ -34,6 +34,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 9bb83af..72a0f1a 100644 --- a/hdspmixer/src/Makefile.am +++ b/hdspmixer/src/Makefile.am @@ -56,3 +56,5 @@ hdspmixer_SOURCES = \ pixmaps.cxx \ pixmaps.h \ defines.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.in b/qlo10k1/configure.in index 86c32a0..17a1e86 100644 --- a/qlo10k1/configure.in +++ b/qlo10k1/configure.in @@ -9,18 +9,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 @@ -31,7 +20,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/rmedigicontrol/configure.in b/rmedigicontrol/configure.in index 1bb1986..e6a3986 100644 --- a/rmedigicontrol/configure.in +++ b/rmedigicontrol/configure.in @@ -14,7 +14,6 @@ PKG_CHECK_MODULES(RMEDIGICONTROL, gtk+-2.0 alsa >= 1.0.0) else -AM_PATH_GTK(1.0.1) AM_PATH_ALSA(1.0.0) RMEDIGICONTROL_CFLAGS="$CFLAGS $ALSA_CFLAGS $GTK_CFLAGS" RMEDIGICONTROL_LIBS="$LIBS $ALSA_LIBS $GTK_LIBS" 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 14bbc6c..81f1902 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