From 953d2fb8cfe5e8684f1e3ec44393b1cfcb5a5f11 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: May 03 2010 19:07:52 +0000 Subject: fix udev rules, update to 1.0.23 --- diff --git a/.cvsignore b/.cvsignore index d108371..cb2e1aa 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -alsa-tools-1.0.22-pruned.tar.bz2 +alsa-tools-1.0.23-pruned.tar.bz2 diff --git a/90-alsa-tools-firmware.rules b/90-alsa-tools-firmware.rules index 69b0e72..790cddf 100644 --- a/90-alsa-tools-firmware.rules +++ b/90-alsa-tools-firmware.rules @@ -1,12 +1,12 @@ # TASCAM US-428 usb sound card. -BUS=="usb", ACTION=="add", ATTRS{idVendor}=="1604", ATTRS{idProduct}=="8000", RUN+="/lib/udev/tascam_fw" -BUS=="usb", ACTION=="add", ATTRS{idVendor}=="1604", ATTRS{idProduct}=="8001", RUN+="/lib/udev/tascam_fpga" +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. -BUS=="usb", ACTION=="add", ATTRS{idVendor}=="1604", ATTRS{idProduct}=="8004", RUN+="/lib/udev/tascam_fw" -BUS=="usb", ACTION=="add", ATTRS{idVendor}=="1604", ATTRS{idProduct}=="8005", RUN+="/lib/udev/tascam_fpga" +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. -BUS=="usb", ACTION=="add", ATTRS{idVendor}=="1604", ATTRS{idProduct}=="8006", RUN+="/lib/udev/tascam_fw" -BUS=="usb", ACTION=="add", ATTRS{idVendor}=="1604", ATTRS{idProduct}=="8007", RUN+="/lib/udev/tascam_fpga" +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 index 8f1f89a..de04796 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -6,9 +6,9 @@ %ifarch ppc ppc64 # sb16_csp doesn't build on PPC; see bug #219010 -%{?!_without_tools: %global builddirstools as10k1 echomixer envy24control hdspconf hdspmixer rmedigicontrol sbiload sscape_ctl us428control } +%{?!_without_tools: %global builddirstools as10k1 echomixer envy24control hdspconf hdspmixer hwmixvolume rmedigicontrol sbiload sscape_ctl us428control } %else -%{?!_without_tools: %global builddirstools as10k1 echomixer envy24control hdspconf hdspmixer rmedigicontrol sbiload sb16_csp sscape_ctl us428control } +%{?!_without_tools: %global builddirstools as10k1 echomixer envy24control hdspconf hdspmixer hwmixvolume rmedigicontrol sbiload sb16_csp sscape_ctl us428control } %endif %{?!_without_firmware: %global builddirsfirmw hdsploader mixartloader usx2yloader vxloader } @@ -22,8 +22,8 @@ Summary: Specialist tools for ALSA Name: alsa-tools -Version: 1.0.22 -Release: 2%{?dist} +Version: 1.0.23 +Release: 1%{?dist} # Checked at least one source file from all the sub-projects contained in # the source tarball and they are consistent GPLv2+ - TJ 2007-11-15 @@ -39,6 +39,10 @@ Source2: envy24control.png Source3: echomixer.desktop Source4: echomixer.png Source5: 90-alsa-tools-firmware.rules +# Resized version of public domain clipart found here: +# http://www.openclipart.org/detail/17428 +Source6: hwmixvolume.png +Source7: hwmixvolume.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel >= %{version} %if 0%{!?_without_tools:1} @@ -47,6 +51,8 @@ BuildRequires: gtk2-devel BuildRequires: fltk-devel Buildrequires: desktop-file-utils Requires: xorg-x11-fonts-misc +# Needed for hwmixvolume +Requires: python-alsa %endif %description @@ -61,6 +67,8 @@ certain sound cards. * echomixer - Mixer for Echo Audio (indigo) devices * envy24control - Control tool for Envy24 (ice1712) based soundcards * hdspmixer - Mixer for the RME Hammerfall DSP cards +* hwmixvolume - Control the volume of individual streams on sound cards that + use hardware mixing * rmedigicontrol - Control panel for RME Hammerfall cards * sbiload - An OPL2/3 FM instrument loader for ALSA sequencer * sscape_ctl - ALSA SoundScape control utility @@ -119,6 +127,9 @@ do hdspmixer) (cd $i ; %makeinstall pixmapdir=${RPM_BUILD_ROOT}%{_datadir}/pixmaps desktopdir=${RPM_BUILD_ROOT}%{_datadir}/applications ) || exit 1 ;; + hwmixvolume) + (cd $i ; %makeinstall ; install -m 644 %{SOURCE6} %{buildroot}%{_datadir}/pixmaps/ ; install -m 644 %{SOURCE7} ${RPM_BUILD_ROOT}%{_datadir}/applications/ ) || exit 1 + ;; usx2yloader) (cd $i ; %makeinstall hotplugdir=${RPM_BUILD_ROOT}%{_sysconfdir}/hotplug/usb) || exit 1 ;; @@ -168,6 +179,7 @@ install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d %doc %{_docdir}/%{name}-%{version}/envy24control %doc %{_docdir}/%{name}-%{version}/hdspconf %doc %{_docdir}/%{name}-%{version}/hdspmixer +%doc %{_docdir}/%{name}-%{version}/hwmixvolume %doc %{_docdir}/%{name}-%{version}/rmedigicontrol %doc %{_docdir}/%{name}-%{version}/sbiload %{_bindir}/as10k1 @@ -175,6 +187,7 @@ install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d %{_bindir}/envy24control %{_bindir}/hdspconf %{_bindir}/hdspmixer +%{_bindir}/hwmixvolume %{_bindir}/rmedigicontrol %{_bindir}/sbiload %{_bindir}/sscape_ctl @@ -183,11 +196,13 @@ install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d %{_datadir}/applications/fedora-envy24control.desktop %{_datadir}/applications/fedora-hdspconf.desktop %{_datadir}/applications/fedora-hdspmixer.desktop +%{_datadir}/applications/fedora-hwmixvolume.desktop %{_datadir}/man/man1/envy24control.1.gz %{_datadir}/pixmaps/echomixer.png %{_datadir}/pixmaps/envy24control.png %{_datadir}/pixmaps/hdspconf.png %{_datadir}/pixmaps/hdspmixer.png +%{_datadir}/pixmaps/hwmixvolume.png %{_datadir}/sounds/* # sb16_csp stuff which is excluded for PPCx @@ -217,6 +232,9 @@ install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d %endif %changelog +* Mon May 03 2010 Tom "spot" Callaway - 1.0.23-1 +- update to 1.0.23 + * Sat Mar 06 2010 Tim Jackson - 1.0.22-2 - Don't own /usr/share/sounds (#569415) diff --git a/echomixer.desktop b/echomixer.desktop index 113552d..ee77e00 100644 --- a/echomixer.desktop +++ b/echomixer.desktop @@ -4,7 +4,7 @@ Name=Echomixer GenericName=Control Echo Digital Audio sound cards Comment=Mixer and GUI control utility for Echo Digital Audio sound cards Exec=echomixer -Icon=echomixer.png +Icon=echomixer Terminal=false Type=Application Categories=Application;AudioVideo; diff --git a/envy24control.desktop b/envy24control.desktop index b087355..ef814c0 100644 --- a/envy24control.desktop +++ b/envy24control.desktop @@ -4,7 +4,7 @@ Name=Envy24 Control GenericName=Envy24 Control Utility Comment=Mixer and GUI control utility for Envy24-based sound cards Exec=envy24control -Icon=envy24control.png +Icon=envy24control Terminal=false Type=Application Categories=Application;AudioVideo; diff --git a/hwmixvolume.desktop b/hwmixvolume.desktop new file mode 100644 index 0000000..e3ea9c7 --- /dev/null +++ b/hwmixvolume.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Hwmixvolume +GenericName=Control the volume of individual streams on sound cards that use hardware mixing +Comment=Control the volume of individual streams on sound cards that use hardware mixing +Exec=hwmixvolume +Icon=hwmixvolume +Terminal=false +Type=Application +Categories=Application;AudioVideo; +Version=0.9.4 diff --git a/hwmixvolume.png b/hwmixvolume.png new file mode 100644 index 0000000..28226ee Binary files /dev/null and b/hwmixvolume.png differ diff --git a/sources b/sources index cfc1e1b..1564120 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8305f7137aa5542731df8fa351554645 alsa-tools-1.0.22-pruned.tar.bz2 +97c71d428558755b45b4d1dca1aede59 alsa-tools-1.0.23-pruned.tar.bz2