commit alsa-tools for openSUSE:Factory
Hello community, here is the log from the commit of package alsa-tools for openSUSE:Factory checked in at 2014-09-06 12:18:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/alsa-tools (Old) and /work/SRC/openSUSE:Factory/.alsa-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "alsa-tools" Changes: -------- --- /work/SRC/openSUSE:Factory/alsa-tools/alsa-tools.changes 2014-08-27 07:47:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.alsa-tools.new/alsa-tools.changes 2014-09-06 16:53:53.000000000 +0200 @@ -1,0 +2,9 @@ +Fri Sep 5 16:52:33 CEST 2014 - tiwai@suse.de + +- Split to subpckage for each program included in alsa-tools repo: + as10k1, hda-verb, hdsploader, ld10k1, ld10k1-devel, us428control, + usx2yloader, sbiload, cspctl, sscape-ctl, hwmixvolume, echomixer, + envy24contorl, rmedigicontrol, hdajackretesk, hdspconf, hdspmixer. + alsa-tools, alsa-tools-gui and alsa-tools-devel are obsoleted + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa-tools.spec ++++++ --- /var/tmp/diff_new_pack.r0gHDa/_old 2014-09-06 16:53:54.000000000 +0200 +++ /var/tmp/diff_new_pack.r0gHDa/_new 2014-09-06 16:53:54.000000000 +0200 @@ -18,6 +18,9 @@ %define package_version 1.0.28 # +%define build_hwdep_loader 0 +%define have_fltk 1 +%define have_gtk2 1 %if 0%{?suse_version} > 1140 %define have_gtk3 1 %else @@ -44,42 +47,259 @@ Patch100: alsa-tools-desktop-fix.dif Patch101: alsa-tools-no_m4_dir.dif BuildRequires: alsa-devel -BuildRequires: fdupes -BuildRequires: fltk-devel BuildRequires: gcc-c++ -BuildRequires: gtk2-devel BuildRequires: libtool BuildRequires: update-desktop-files BuildRequires: xorg-x11-devel -Requires: alsa-firmware -Requires: fxload BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if %{have_fltk} +BuildRequires: fltk-devel +%endif +%if %{have_gtk2} +BuildRequires: gtk2-devel +%endif %if %{have_gtk3} BuildRequires: gtk3-devel %endif %description -Various tools for ALSA including DSP loaders. +This is a meta package for collection of sub-packages. -%package gui -Summary: Various ALSA Tools with GUI +%package -n as10k1 +Version: A0.99 +Release: 0 +Summary: Emu10k1 DSP assembler Group: Productivity/Multimedia/Sound/Utilities -Requires: pyalsa -Requires: python-gtk +Provides: alsa-tools = 1.0.28 +Obsoletes: alsa-tools <= 1.0.28 + +%description -n as10k1 +Assmbler for emu10k1 DSP chip present in Creative SB Live, PCI 512 and +Emu APS sound cards. + +%package -n hda-verb +Version: 0.4 +Release: 0 +Summary: HD-audio jack retasking tool +Group: Productivity/Multimedia/Sound/Utilities +Provides: alsa-tools:/usr/bin/hda-verb + +%description -n hda-verb +hda-verb is a small program to send HD-audio commands to the given +ALSA hwdep device on the hd-audio interface. + +%package -n hdsploader +Version: 1.2 +Release: 0 +Summary: Firmware loader for RME Hammerfall DSP cards +Group: Productivity/Multimedia/Sound/Utilities +Requires: alsa-firmware +Provides: alsa-tools:/usr/bin/hdsploader + +%description -n hdsploader +This is the firmware loader program for RME Hammerfall DSP cards. + +%package -n ld10k1 +Version: 0.1.8p1 +Release: 0 +Summary: Emu10k1 patch loader for ALSA +Group: Productivity/Multimedia/Sound/Utilities +Provides: alsa-tools:/usr/bin/lo10k1 -%description gui -Various tools for ALSA with GUI for controlling the configuration and -the mixer of sepcific sound cards. +%description -n ld10k1 +This package contains the patch loader program for Emu10k1 and Emu10k1 on ALSA. -%package devel +%package -n ld10k1-devel +Version: 0.1.8p1 +Release: 0 Summary: Include Files and Libraries mandatory for Development -Group: Development/Languages/C and C++ -Requires: alsa-tools = %{version} +Group: Development/Libraries/C and C++ +Requires: ld10k1 +Provides: alsa-tools-devel = 1.0.28 +Obsoletes: alsa-tools-devel <= 1.0.28 -%description devel +%description -n ld10k1-devel This package contains all necessary include files and libraries needed to develop applications that require these. +%package -n us428control +Version: 0.4.6 +Release: 0 +Summary: Sound Blaster 16 ASP/CSP control program +Group: Productivity/Multimedia/Sound/Utilities +Requires: alsa-firmware +Provides: alsa-tools:/usr/bin/us428control + +%description -n us428control +This package contains a control tool for Tascam US-X2Y audio devices + +%package -n usx2yloader +Version: 0.3 +Release: 0 +Summary: Second phase firmware loader for Tascam USX2Y USB soundcards +Group: Productivity/Multimedia/Sound/Utilities +Requires: alsa-firmware +Requires: fxload +Provides: alsa-tools:/usr/bin/usx2yloader + +%description -n usx2yloader +Usx2yloader is a helper program to load the 2nd Phase firmware binaries +onto the Tascam USX2Y USB soundcards. + +%package -n sbiload +Version: 0.4.0 +Release: 0 +Summary: OPL2/3 FM instrument loader +Group: Productivity/Multimedia/Sound/Utilities +Provides: alsa-tools:/usr/bin/sbiload + +%description -n sbiload +sbiload is an OPL2/3 FM instrument loader for ALSA hwdep. + +%ifarch %ix86 +%package -n cspctl +Version: 0.3.5a +Release: 0 +Summary: Sound Blaster 16 ASP/CSP control program +Group: Productivity/Multimedia/Sound/Utilities +Requires: kernel-firmware +Provides: alsa-tools:/usr/bin/cspctl + +%description -n cspctl +cspctl is a control program for Sound Blaster 16 ASP/CSP chips. + +%package -n sscape-ctl +Version: 0.1.0 +Release: 0 +Summary: Sound Blaster 16 ASP/CSP control program +Group: Productivity/Multimedia/Sound/Utilities +Provides: alsa-tools:/usr/bin/sscape_ctl + +%description -n sscape-ctl +This package contains a control utility program for SoundScape cards +%endif + +%if %{build_hwdep_loader} +%package -n mixartloader +Version: 1.0 +Release: 0 +Summary: Firmware loader for Digigram miXart boards +Group: Productivity/Multimedia/Sound/Utilities +Requires: alsa-firmware + +%description -n mixartloader +mixartloader is a helper program to load the firmware binaries +onto the Digigram miXart board sound drivers. + +%package -n pcxhrloader +Version: 1.0 +Release: 0 +Summary: Firmware loader for Digigram pcxhr boards +Group: Productivity/Multimedia/Sound/Utilities +Requires: alsa-firmware + +%description -n pcxhrloader +pcxhrloader is a helper program to load the firmware binaries +onto Digigram PCXHR compatible board sound drivers. + +%package -n vxloader +Version: 1.0 +Release: 0 +Summary: Firmware loader for Digigram VX-board sound cards +Group: Productivity/Multimedia/Sound/Utilities +Requires: alsa-firmware + +%description -n vxloader +mixartloader is a helper program to load the firmware binaries +onto the Digigram VX-board sound drivers. +%endif + +%package -n hwmixvolume +Version: 0.9 +Release: 0 +Summary: GUI tool to set individual hardware stream volumes +Group: Productivity/Multimedia/Sound/Utilities +Requires: pyalsa +Requires: python-gtk +Provides: alsa-tools-gui = 1.0.28 +Obsoletes: alsa-tools-gui <= 1.0.28 + +%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, VIA VT823x southbridge, Yamaha DS-1 + +%if %{have_gtk2} +%package -n echomixer +Version: 1.0.5 +Release: 0 +Summary: Echoaudio console application +Group: Productivity/Multimedia/Sound/Utilities +Provides: alsa-tools-gui:/usr/bin/echomixer + +%description -n echomixer +This is Linux-equivalent of the Echoaudio console application. + +%package -n envy24control +Version: 0.6.0 +Release: 0 +Summary: Control tool for Envy24 (ice1712) based soundcards +Group: Productivity/Multimedia/Sound/Utilities +Provides: alsa-tools-gui:/usr/bin/envy24control + +%description -n envy24control +envy24control is a GUI control tool for Envy24 (ice1712) based sound cards. + +%package -n rmedigicontrol +Version: 0.3.5a +Release: 0 +Summary: GUI control tool for RME Digi32 and RME Digi96 soundcards +Group: Productivity/Multimedia/Sound/Utilities +Provides: alsa-tools-gui:/usr/bin/rmedigicontrol + +%description -n rmedigicontrol +Rmedigicontrol is a control tool for RME Digi32 and RME Digi96 soundcards. +It depends on ALSA and GTK+ and offers a graphical frontend for all your +switches. +%endif + +%if %{have_gtk3} +%package -n hdajackretask +Version: 0.20120413 +Release: 0 +Summary: HD-audio jack retasking tool +Group: Productivity/Multimedia/Sound/Utilities +Provides: alsa-tools-gui:/usr/bin/hdajackretask + +%description -n hdajackretask +hdajackretask is a GUI tool to make it easy to retask HD-audio jacks. +%endif + +%if %{have_fltk} +%package -n hdspconf +Version: 1.4 +Release: 0 +Summary: GUI to control Hammerfall HDSP settings +Group: Productivity/Multimedia/Sound/Utilities +Provides: alsa-tools-gui:/usr/bin/hdspconf + +%description -n hdspconf +HDSPConf is a GUI to control the Hammerfall HDSP Alsa Settings. +Up to four hdsp cards are supported. + +%package -n hdspmixer +Version: 1.11 +Release: 0 +Summary: GUI tool to control advanced routing of RME Hammerfall DSP cards +Group: Productivity/Multimedia/Sound/Utilities +Provides: alsa-tools-gui:/usr/bin/hdspmixer + +%description -n hdspmixer +HDSPMixer is the Linux equivalent of the Totalmix application from RME. +It is a tool to control the advanced routing features of the RME +Hammerfall DSP soundcard series. +%endif + %prep %setup -q -a 2 -n %{name}-%{package_version} cp %{SOURCE1} . @@ -90,20 +310,32 @@ %patch100 -p1 %patch101 -p1 -%build -export AUTOMAKE_JOBS="%{?_smp_mflags}" -ALL_PACKS="envy24control seq/sbiload hdspconf hdsploader hdspmixer rmedigicontrol echomixer usx2yloader us428control as10k1 ld10k1 hwmixvolume hda-verb" -%ifarch %{ix86} +ALL_PACKS="seq/sbiload hdsploader usx2yloader us428control as10k1 ld10k1 hwmixvolume hda-verb" +%ifarch %ix86 ALL_PACKS="$ALL_PACKS sb16_csp sscape_ctl" %endif + +%if %{build_hwdep_loader} +ALL_PACKS="$ALL_PACKS pcxhrloader mixartloader vxloader" +%endif + +%if %{have_gtk2} +ALL_PACKS="$ALL_PACKS envy24control rmedigicontrol echomixer" +%endif + %if %{have_gtk3} ALL_PACKS="$ALL_PACKS hdajackretask" %endif -for d in $ALL_PACKS; do + +%if %{have_fltk} +ALL_PACKS="$ALL_PACKS hdspconf hdspmixer" +%endif +echo "$ALL_PACKS" > .allpacks + +%build +export AUTOMAKE_JOBS="%{?_smp_mflags}" +for d in `cat .allpacks`; do (cd $d - # aclocal - # test -f Makefile.am && automake -a --foreign - # autoconf autoreconf -fi %configure make %{?_smp_mflags} @@ -113,19 +345,12 @@ make -C as10k1/examples dsp %{?_smp_mflags} %install -ALL_PACKS="envy24control seq/sbiload hdspconf hdsploader hdspmixer rmedigicontrol echomixer usx2yloader us428control as10k1 ld10k1 hwmixvolume hda-verb" -%ifarch %{ix86} -ALL_PACKS="$ALL_PACKS sb16_csp sscape_ctl" -%endif -%if %{have_gtk3} -ALL_PACKS="$ALL_PACKS hdajackretask" -%endif -for d in $ALL_PACKS; do +for d in `cat .allpacks`; do (cd $d make DESTDIR=%{buildroot} install %{?_smp_mflags} ) done -rm -f %{buildroot}%{_libdir}/liblo10k1.la +find %{buildroot} -type f -name "*.la" -delete -print # remove obsolete hotplug files rm -rf %{buildroot}%{_sysconfdir}/hotplug # install pixmaps @@ -139,77 +364,165 @@ %suse_update_desktop_file -i rmedigicontrol AudioVideo Mixer GTK %suse_update_desktop_file hdspconf AudioVideo Utility %suse_update_desktop_file hdspmixer AudioVideo Mixer -# install documents -mkdir -p %{buildroot}%{_docdir}/%{name} -for d in $ALL_PACKS; do - (cd $d - n=${d##*/} - mkdir -p %{buildroot}%{_docdir}/%{name}/$n - for f in AUTHORS COPYING* ChangeLog NEWS README* TODO; do - test -s $f || continue - install -c -m 0644 $f %{buildroot}%{_docdir}/%{name}/$n - done - ) -done -# extra doc for ld10k1 -mkdir -p %{buildroot}%{_docdir}/%{name}/ld10k1/doc -cp ld10k1/doc/README %{buildroot}%{_docdir}/%{name}/ld10k1/doc -cp ld10k1/doc/*.txt %{buildroot}%{_docdir}/%{name}/ld10k1/doc -cp ld10k1/doc/*_usage %{buildroot}%{_docdir}/%{name}/ld10k1/doc # opl3 sounds mkdir -p %{buildroot}%{_datadir}/sounds/opl3 install -c -m 0644 *.o3 *.sb %{buildroot}%{_datadir}/sounds/opl3 -(cd as10k1 -mkdir -p %{buildroot}%{_docdir}/%{name}/as10k1/examples -cp examples/*.asm examples/*.emu10k1 %{buildroot}%{_docdir}/%{name}/as10k1/examples -) -%fdupes -s %{buildroot} +# clean up Makefiles in doc and examples subdirs for installation +rm -f as10k1/examples/Makefile* +rm -f ld10k1/doc/Makefile* -%post -p /sbin/ldconfig +%post -n ld10k1 -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%postun -n ld10k1 -p /sbin/ldconfig -%files +%files -n as10k1 %defattr(-, root, root) -%doc %{_docdir}/%{name} -%{_bindir}/sbiload -%ifarch %{ix86} -%{_bindir}/sscape_ctl -%{_bindir}/cspctl -%endif -%{_bindir}/hdsploader -%{_bindir}/usx2yloader -%{_bindir}/us428control -%{_mandir}/man?/* -%{_datadir}/sounds/opl3 %{_bindir}/as10k1 +%doc as10k1/COPYING +%doc as10k1/README +%doc as10k1/examples + +%files -n hda-verb +%defattr(-, root, root) +%{_bindir}/hda-verb +%doc hda-verb/ChangeLog +%doc hda-verb/README + +%files -n ld10k1 +%defattr(-, root, root) %{_sbindir}/ld10k1 %{_sbindir}/ld10k1d %{_sbindir}/dl10k1 %{_bindir}/lo10k1 %{_bindir}/init_* -%{_bindir}/hda-verb %{_datadir}/ld10k1 %{_libdir}/liblo10k1.so.* +%doc ld10k1/AUTHORS +%doc ld10k1/COPYING +%doc ld10k1/README +%doc ld10k1/doc + +%files -n ld10k1-devel +%defattr(-, root, root) +%{_includedir}/lo10k1 +%{_libdir}/liblo10k1.so +%{_datadir}/aclocal/*.m4 + +%files -n sbiload +%defattr(-, root, root) +%{_bindir}/sbiload +%{_datadir}/sounds/opl3 +%doc seq/sbiload/COPYING +%doc seq/sbiload/README + +%files -n hdsploader +%defattr(-, root, root) +%{_bindir}/hdsploader +%doc hdsploader/AUTHORS +%doc hdsploader/ChangeLog +%doc hdsploader/COPYING +%doc hdsploader/README + +%files -n usx2yloader +%defattr(-, root, root) +%{_bindir}/usx2yloader +%doc usx2yloader/README + +%files -n us428control +%defattr(-, root, root) +%{_bindir}/us428control + +%files -n hwmixvolume +%defattr(-, root, root) +%{_bindir}/hwmixvolume +%doc hwmixvolume/README + +%if %{build_hwdep_loader} +%files -n pcxhrloader +%defattr(-, root, root) +%{_bindir}/pcxhrloader +%doc pcxhrloader/README + +%files -n mixartloader +%defattr(-, root, root) +%{_bindir}/mixartloader +%doc mixartloader/README + +%files -n vxloader +%defattr(-, root, root) +%{_bindir}/vxloader +%doc vxloader/README +%endif + +%ifarch %ix86 +%files -n sscape-ctl +%defattr(-, root, root) +%{_bindir}/sscape_ctl + +%files -n cspctl +%defattr(-, root, root) +%{_bindir}/cspctl +%doc sb16_csp/README +%{_mandir}/man?/cspctl.* +%endif -%files gui +%if %{have_gtk2} +%files -n envy24control %defattr(-, root, root) %{_bindir}/envy24control +%{_datadir}/applications/envy24control.desktop +%{_datadir}/pixmaps/envy24.png +%{_mandir}/man?/envy24control.* +%doc envy24control/AUTHORS +%doc envy24control/COPYING +%doc envy24control/README* + +%files -n rmedigicontrol +%defattr(-, root, root) %{_bindir}/rmedigicontrol -%{_bindir}/hdspconf -%{_bindir}/hdspmixer +%{_datadir}/applications/rmedigicontrol.desktop +%{_datadir}/pixmaps/rme.png +%doc rmedigicontrol/AUTHORS +%doc rmedigicontrol/COPYING +%doc rmedigicontrol/README + +%files -n echomixer +%defattr(-, root, root) %{_bindir}/echomixer -%{_bindir}/hwmixvolume +%doc echomixer/AUTHORS +%doc echomixer/ChangeLog +%doc echomixer/COPYING +%doc echomixer/README +%endif + %if %{have_gtk3} +%files -n hdajackretask +%defattr(-, root, root) %{_bindir}/hdajackretask +%doc hdajackretask/AUTHORS +%doc hdajackretask/README %endif -%{_datadir}/applications/*.desktop -%{_datadir}/pixmaps/* -%files devel +%if %{have_fltk} +%files -n hdspconf %defattr(-, root, root) -%{_includedir}/lo10k1 -%{_libdir}/liblo10k1.so -%{_datadir}/aclocal/*.m4 +%{_bindir}/hdspconf +%{_datadir}/applications/hdspconf.desktop +%{_datadir}/pixmaps/hdspconf.png +%doc hdspconf/AUTHORS +%doc hdspconf/ChangeLog +%doc hdspconf/COPYING +%doc hdspconf/README + +%files -n hdspmixer +%defattr(-, root, root) +%{_bindir}/hdspmixer +%{_datadir}/applications/hdspmixer.desktop +%{_datadir}/pixmaps/hdspmixer.png +%doc hdspconf/AUTHORS +%doc hdspconf/ChangeLog +%doc hdspconf/COPYING +%doc hdspconf/README +%endif %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de