From 7049c1d65335a50c2444ae44f93e02ae474db1ef Mon Sep 17 00:00:00 2001 From: Tim Jackson Date: Sun, 10 Jan 2010 13:43:48 +0000 Subject: [PATCH] Update to alsa-tools 1.0.22 (#520594) --- .cvsignore | 2 +- alsa-tools.spec | 19 ++++++++++++------- echomixer.desktop | 11 +++++++++++ echomixer.png | Bin 0 -> 841 bytes envy24control.desktop | 11 +++++++++++ envy24control.png | Bin 0 -> 945 bytes sources | 6 +----- 7 files changed, 36 insertions(+), 13 deletions(-) create mode 100644 echomixer.desktop create mode 100644 echomixer.png create mode 100644 envy24control.desktop create mode 100644 envy24control.png diff --git a/.cvsignore b/.cvsignore index 1137b6a..d108371 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -alsa-tools-1.0.20-pruned.tar.bz2 +alsa-tools-1.0.22-pruned.tar.bz2 diff --git a/alsa-tools.spec b/alsa-tools.spec index 2e67931..4f8f186 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -6,12 +6,12 @@ %ifarch ppc ppc64 # sb16_csp doesn't build on PPC; see bug #219010 -%{?!_without_tools: %define builddirstools as10k1 echomixer envy24control hdspconf hdspmixer rmedigicontrol sbiload sscape_ctl us428control } +%{?!_without_tools: %global builddirstools as10k1 echomixer envy24control hdspconf hdspmixer rmedigicontrol sbiload sscape_ctl us428control } %else -%{?!_without_tools: %define builddirstools as10k1 echomixer envy24control hdspconf hdspmixer rmedigicontrol sbiload sb16_csp sscape_ctl us428control } +%{?!_without_tools: %global builddirstools as10k1 echomixer envy24control hdspconf hdspmixer rmedigicontrol sbiload sb16_csp sscape_ctl us428control } %endif -%{?!_without_firmware: %define builddirsfirmw hdsploader mixartloader usx2yloader vxloader } +%{?!_without_firmware: %global builddirsfirmw hdsploader mixartloader usx2yloader vxloader } # The source tarball has been pruned to remove the "ac3dec" directory, due # to legal concerns that the contents might be subject to patent claims @@ -22,8 +22,8 @@ Summary: Specialist tools for ALSA Name: alsa-tools -Version: 1.0.20 -Release: 4%{?dist} +Version: 1.0.22 +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,7 +39,6 @@ Source2: envy24control.png Source3: echomixer.desktop Source4: echomixer.png Source5: 90-alsa-tools-firmware.rules -Patch0: alsa-tools-1.0.20-glibc2.10.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel >= %{version} %if 0%{!?_without_tools:1} @@ -88,7 +87,6 @@ The following tools are available: %prep %setup -q -n %{name}-%{version} -%patch0 %build @@ -219,6 +217,13 @@ install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d %endif %changelog +* Sun Jan 10 2010 Tim Jackson - 1.0.22-1 +- Update to 1.0.22 +- use %%global instead of %%define + +* Thu Sep 03 2009 Tim Jackson - 1.0.21-1 +- Update to 1.0.21 + * Wed Aug 26 2009 Tim Jackson - 1.0.20-4 - Add missing dep on xorg-x11-fonts-misc (#503284) diff --git a/echomixer.desktop b/echomixer.desktop new file mode 100644 index 0000000..113552d --- /dev/null +++ b/echomixer.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Encoding=UTF-8 +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 +Terminal=false +Type=Application +Categories=Application;AudioVideo; +Version=0.9.4 diff --git a/echomixer.png b/echomixer.png new file mode 100644 index 0000000000000000000000000000000000000000..48c4b92a7ba27f9b9d5d43197a6ad4791adab1b8 GIT binary patch literal 841 zcmV-P1GfB$P)=@uP=5;4D_`a2ZsTfjht< z@S4P8FbUiP?gLFAr!j$stV6&j(HKkuHCaOld!V~r0IC{KpdWL9Bb+W@qBJ`n>+hde z-VHf{kHBPf>3N%Y-ln1x$cd7tG(o5UTod`c2&{^vzJyX~o|)-NtnF66EGL}69~r8qfwdv~j=(Lf|@Z6eXaG1FlHwHZYMa2L>af z9q|L!!28>TAk+kI1K))YKeRz;THKfc_BG1r4)9#FBTECfguquca-bw6t^x-dWpoNy z5I-=kkpum)3R2M2K*$Eh#0M_{Ux9hx6}WB+*NNvZ+XwpzCy*7=deR5k$Bt}ra+axL zIo5V->z{^XDII}MUd+8%O5d+5kx^F~xd3Qsl+l#HDNi(=d!|iBFUx~_l7u=L{U%GT zBdf?MYzUOpIkFw8#ucEhv6V=RnfWEHwJHu+;syG!QSpYxCYp!ZL=(9cqT#L!6oD6z z%@)XHaNcp^a;bW$J76{ z5*_JAQ^2C!%W2?1is(hgt{9p3Qh}Fg?b7aj(aZbgi?O@vx zLXBfEP8Yl5VB9WN&%!bm#xckDj7_g?hSW-&5{1G9=L$stTBVS&g*FH4IT~|Yxa~CQ zR))P|$asB<-O4s&%`ENZy<~_J_iL4_#bWPCwc0D^^CSGV%3q=u1k{4yO!oc_sIMz# T%a})400000NkvXXu0mjf$*^>{ literal 0 HcmV?d00001 diff --git a/envy24control.desktop b/envy24control.desktop new file mode 100644 index 0000000..b087355 --- /dev/null +++ b/envy24control.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Envy24 Control +GenericName=Envy24 Control Utility +Comment=Mixer and GUI control utility for Envy24-based sound cards +Exec=envy24control +Icon=envy24control.png +Terminal=false +Type=Application +Categories=Application;AudioVideo; +Version=0.9.4 diff --git a/envy24control.png b/envy24control.png new file mode 100644 index 0000000000000000000000000000000000000000..73c47d67a25ee245181731883e709d0f7f5f4c15 GIT binary patch literal 945 zcmV;i15W&jP)V?f56dEpAjk^K!d^W23Vs{G{RRsj1P@+4`F51(MMXSF$hs>CzD;H_ zneOTCdU-s|WTtCoVzNz>xbD=c`l+t}^XsRoo-V3b_0v1_m1?z?%Cz6UYjiXSf*xa< zro#2oG%fjFf0s&SS!va8FOQA+zTaaE!$`DhA3wYYV@9dHQ`3yGOINS`^LSy-e)|D% z*l#%&W4TE zsM$2e1f|lhu`+-*5Et&`o~d_l|58f1t_xrv@U!jdQKtSmG?jEfJODHk^>D5dqY) zw1KoSL;zT)8+YN3qL9KpOG;|1wdI_{-onLEsM{w+bhOv$+4s&r&}MN zm|T4Q3c%qb$1EU6IG*PUA-V(4APNdrkCZT0tLJ)PV5~idwse3tMLz`kuK|hm8WsY) z-eXxL%jx6Z2%co5Nag}+5E{CekFFEySt*?h2nJ9E4MUHV$_K=Xn_xXsJRgt)1jS9% zU{gMa%YFzn1lrDD2NVz%?_F0h%J@o11hl00~a%oA@Jug5B$VL7)`X%)^NiJ#c^!4+z0Lt?&G>%GYSo9M~J@ha%37RDH&s(gH_!5+D<`hMbt%S zo$IMMj!UKXrOAfZQ;o(d5$y