From 752200e8132d3bbff26822bc0357fee5135c6b07 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 15 Apr 2009 06:03:26 +0000 Subject: [PATCH 1/6] Initialize branch F-11 for alsa-tools --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From 9898734259ac780854d53d7ac31d93b761f8cb00 Mon Sep 17 00:00:00 2001 From: Tim Jackson Date: Sat, 30 May 2009 13:55:40 +0000 Subject: [PATCH 2/6] Update to 1.0.20 --- alsa-tools-1.0.20-glibc2.10.patch | 12 ++++++++++++ alsa-tools.spec | 9 +++++++-- sources | 2 +- 3 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 alsa-tools-1.0.20-glibc2.10.patch diff --git a/alsa-tools-1.0.20-glibc2.10.patch b/alsa-tools-1.0.20-glibc2.10.patch new file mode 100644 index 0000000..dba5a3c --- /dev/null +++ b/alsa-tools-1.0.20-glibc2.10.patch @@ -0,0 +1,12 @@ +From http://article.gmane.org/gmane.linux.alsa.devel/63326 + +--- envy24control/strstr_icase_blank.c ++++ envy24control/strstr_icase_blank.c +@@ -48,7 +48,6 @@ 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); + + strncpy(search_string, string2, MAX_SEARCH_FIELD_LENGTH); + search_string[MAX_SEARCH_FIELD_LENGTH - 1] = '\0'; diff --git a/alsa-tools.spec b/alsa-tools.spec index 27f39a1..ff737a1 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -22,8 +22,8 @@ Summary: Specialist tools for ALSA Name: alsa-tools -Version: 1.0.19 -Release: 3%{?dist} +Version: 1.0.20 +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,7 @@ 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} @@ -86,6 +87,7 @@ The following tools are available: %prep %setup -q -n %{name}-%{version} +%patch0 %build @@ -216,6 +218,9 @@ install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d %endif %changelog +* Sat May 30 2009 Tim Jackson - 1.0.20-1 +- Update to 1.0.20 + * Mon Feb 23 2009 Fedora Release Engineering - 1.0.19-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/sources b/sources index f3a1b06..35c3fe5 100644 --- a/sources +++ b/sources @@ -2,4 +2,4 @@ 38db1b88c44adb5591f87173061d7d98 echomixer.png 4c10f8d250a86bdb3ea138488aec8fc4 envy24control.desktop 3a1a195f2b9641f68651e3d312e5476f envy24control.png -b12c748adc1bc4d4b454d61ee2e4432f alsa-tools-1.0.19-pruned.tar.bz2 +7c0635f247cede4bc5c413f5e19fa991 alsa-tools-1.0.20-pruned.tar.bz2 From 73ad2687cb42e0906a736f10eaee4bf6fb5ab848 Mon Sep 17 00:00:00 2001 From: Tim Jackson Date: Wed, 26 Aug 2009 21:56:00 +0000 Subject: [PATCH 3/6] Add missing dep on xorg-x11-fonts-misc (#503284) --- alsa-tools.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index ff737a1..0e2e0fd 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -23,7 +23,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.0.20 -Release: 1%{?dist} +Release: 2%{?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 @@ -47,6 +47,7 @@ BuildRequires: gtk+-devel BuildRequires: gtk2-devel BuildRequires: fltk-devel Buildrequires: desktop-file-utils +Requires: xorg-x11-fonts-misc %endif %description @@ -218,6 +219,9 @@ install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d %endif %changelog +* Wed Aug 26 2009 Tim Jackson - 1.0.20-2 +- Add missing dep on xorg-x11-fonts-misc (#503284) + * Sat May 30 2009 Tim Jackson - 1.0.20-1 - Update to 1.0.20 From b438210c96940a5ed1288a383aa40469a83c5974 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:26:54 +0000 Subject: [PATCH 4/6] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 1925163..5e7bcf6 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: alsa-tools -# $Id: Makefile,v 1.2 2004/11/24 03:09:37 gafton Exp $ +# $Id: Makefile,v 1.4 2006/11/29 21:48:41 timj Exp $ NAME := alsa-tools SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 5fd90fb91040f71d3f740b837ae180c356d35922 Mon Sep 17 00:00:00 2001 From: Tim Jackson Date: Sun, 10 Jan 2010 18:45:48 +0000 Subject: [PATCH 5/6] Update to alsa-tools 1.0.22 --- alsa-tools-1.0.20-glibc2.10.patch | 12 ------------ alsa-tools.spec | 16 +++++++++------- echomixer.desktop | 11 +++++++++++ echomixer.png | Bin 0 -> 841 bytes envy24control.desktop | 11 +++++++++++ envy24control.png | Bin 0 -> 945 bytes sources | 6 +----- 7 files changed, 32 insertions(+), 24 deletions(-) delete mode 100644 alsa-tools-1.0.20-glibc2.10.patch create mode 100644 echomixer.desktop create mode 100644 echomixer.png create mode 100644 envy24control.desktop create mode 100644 envy24control.png diff --git a/alsa-tools-1.0.20-glibc2.10.patch b/alsa-tools-1.0.20-glibc2.10.patch deleted file mode 100644 index dba5a3c..0000000 --- a/alsa-tools-1.0.20-glibc2.10.patch +++ /dev/null @@ -1,12 +0,0 @@ -From http://article.gmane.org/gmane.linux.alsa.devel/63326 - ---- envy24control/strstr_icase_blank.c -+++ envy24control/strstr_icase_blank.c -@@ -48,7 +48,6 @@ 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); - - strncpy(search_string, string2, MAX_SEARCH_FIELD_LENGTH); - search_string[MAX_SEARCH_FIELD_LENGTH - 1] = '\0'; diff --git a/alsa-tools.spec b/alsa-tools.spec index 0e2e0fd..99cb555 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: 2%{?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,10 @@ 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 + * Wed Aug 26 2009 Tim Jackson - 1.0.20-2 - 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 Date: Wed, 28 Jul 2010 09:45:43 +0000 Subject: [PATCH 6/6] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 5e7bcf6..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: alsa-tools -# $Id: Makefile,v 1.4 2006/11/29 21:48:41 timj Exp $ -NAME := alsa-tools -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11