From 752200e8132d3bbff26822bc0357fee5135c6b07 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 15 Apr 2009 06:03:26 +0000 Subject: [PATCH 01/98] 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 71c99e0d524a62e3e3a0211a82b956bf8a00151b Mon Sep 17 00:00:00 2001 From: Tim Jackson Date: Sun, 10 May 2009 17:26:11 +0000 Subject: [PATCH 02/98] Update to 1.0.20 --- .cvsignore | 8 +------- alsa-tools.spec | 7 +++++-- sources | 6 +----- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/.cvsignore b/.cvsignore index 7a1385a..1137b6a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,7 +1 @@ -alsa-tools-1.0.16-pruned.tar.bz2 -echomixer.desktop -echomixer.png -envy24control.desktop -envy24control.png -alsa-tools-1.0.17-pruned.tar.bz2 -alsa-tools-1.0.19-pruned.tar.bz2 +alsa-tools-1.0.20-pruned.tar.bz2 diff --git a/alsa-tools.spec b/alsa-tools.spec index 27f39a1..24d93ee 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 @@ -216,6 +216,9 @@ install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d %endif %changelog +* Sun May 10 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..faafbfa 100644 --- a/sources +++ b/sources @@ -1,5 +1 @@ -57af85a810ed770885aec2a5b35648e6 echomixer.desktop -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 a791f51bb3388adc99f4ab511d6a9dda59674a10 Mon Sep 17 00:00:00 2001 From: Tim Jackson Date: Sun, 10 May 2009 17:39:11 +0000 Subject: [PATCH 03/98] Fix broken sources --- alsa-tools.spec | 4 ++-- sources | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index 24d93ee..83caf1a 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: 1%{?dist}.1 # 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 @@ -216,7 +216,7 @@ install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d %endif %changelog -* Sun May 10 2009 Tim Jackson - 1.0.20-1 +* Sun May 10 2009 Tim Jackson - 1.0.20-1.fc12.1 - Update to 1.0.20 * Mon Feb 23 2009 Fedora Release Engineering - 1.0.19-3 diff --git a/sources b/sources index faafbfa..35c3fe5 100644 --- a/sources +++ b/sources @@ -1 +1,5 @@ +57af85a810ed770885aec2a5b35648e6 echomixer.desktop +38db1b88c44adb5591f87173061d7d98 echomixer.png +4c10f8d250a86bdb3ea138488aec8fc4 envy24control.desktop +3a1a195f2b9641f68651e3d312e5476f envy24control.png 7c0635f247cede4bc5c413f5e19fa991 alsa-tools-1.0.20-pruned.tar.bz2 From 5c3e8058afae93886b229a9b3df7a66db48aada1 Mon Sep 17 00:00:00 2001 From: Tim Jackson Date: Sat, 30 May 2009 10:51:18 +0000 Subject: [PATCH 04/98] Fix build against glibc2.10 --- alsa-tools-1.0.20-glibc2.10.patch | 12 ++++++++++++ alsa-tools.spec | 6 ++++-- 2 files changed, 16 insertions(+), 2 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 83caf1a..6cdc397 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}.1 +Release: 1%{?dist}.2 # 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,7 +218,7 @@ install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d %endif %changelog -* Sun May 10 2009 Tim Jackson - 1.0.20-1.fc12.1 +* Sun May 10 2009 Tim Jackson - 1.0.20-1.fc12.2 - Update to 1.0.20 * Mon Feb 23 2009 Fedora Release Engineering - 1.0.19-3 From 9898734259ac780854d53d7ac31d93b761f8cb00 Mon Sep 17 00:00:00 2001 From: Tim Jackson Date: Sat, 30 May 2009 13:55:40 +0000 Subject: [PATCH 05/98] 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 5e8b2d276f1bcbf6aff2f617bf511d6b781463db Mon Sep 17 00:00:00 2001 From: Tim Jackson Date: Thu, 16 Jul 2009 19:31:18 +0000 Subject: [PATCH 06/98] Fix NVR for rawhide --- alsa-tools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index 6cdc397..23e97e5 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}.2 +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 From 97f397c55b7045d80912596f0843b2f363248dff Mon Sep 17 00:00:00 2001 From: Tim Jackson Date: Thu, 16 Jul 2009 19:41:47 +0000 Subject: [PATCH 07/98] Fix changelog --- alsa-tools.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/alsa-tools.spec b/alsa-tools.spec index 23e97e5..45e4403 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -218,6 +218,8 @@ install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d %endif %changelog +* Thu Jul 16 2009 Tim Jackson - 1.0.20-2 + * Sun May 10 2009 Tim Jackson - 1.0.20-1.fc12.2 - Update to 1.0.20 From 871e5ea21c90ec12267ff99e0a036718d4ed84be Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 24 Jul 2009 16:48:09 +0000 Subject: [PATCH 08/98] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- alsa-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index 45e4403..9da0a3a 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: 2%{?dist} +Release: 3%{?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 @@ -218,6 +218,9 @@ install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d %endif %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 1.0.20-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Thu Jul 16 2009 Tim Jackson - 1.0.20-2 * Sun May 10 2009 Tim Jackson - 1.0.20-1.fc12.2 From c977c3101f9079060100e9d4850959318d0719c7 Mon Sep 17 00:00:00 2001 From: Tim Jackson Date: Wed, 26 Aug 2009 21:45:45 +0000 Subject: [PATCH 09/98] 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 9da0a3a..2e67931 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: 3%{?dist} +Release: 4%{?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-4 +- Add missing dep on xorg-x11-fonts-misc (#503284) + * Fri Jul 24 2009 Fedora Release Engineering - 1.0.20-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 73ad2687cb42e0906a736f10eaee4bf6fb5ab848 Mon Sep 17 00:00:00 2001 From: Tim Jackson Date: Wed, 26 Aug 2009 21:56:00 +0000 Subject: [PATCH 10/98] 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 b4ccea3ec7d100578da2fac47f881d1e3ebac0eb Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:39:24 +0000 Subject: [PATCH 11/98] 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 b438210c96940a5ed1288a383aa40469a83c5974 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:26:54 +0000 Subject: [PATCH 12/98] 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 7049c1d65335a50c2444ae44f93e02ae474db1ef Mon Sep 17 00:00:00 2001 From: Tim Jackson Date: Sun, 10 Jan 2010 13:43:48 +0000 Subject: [PATCH 13/98] 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 Date: Sun, 10 Jan 2010 18:45:48 +0000 Subject: [PATCH 14/98] 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: Sat, 6 Mar 2010 12:41:18 +0000 Subject: [PATCH 15/98] Don't own /usr/share/sounds (#569415) --- alsa-tools.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index 4f8f186..5ee36f5 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -23,7 +23,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.0.22 -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 @@ -188,7 +188,6 @@ install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d %{_datadir}/pixmaps/envy24control.png %{_datadir}/pixmaps/hdspconf.png %{_datadir}/pixmaps/hdspmixer.png -%{_datadir}/sounds/ # sb16_csp stuff which is excluded for PPCx %ifnarch ppc ppc64 @@ -217,6 +216,9 @@ install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d %endif %changelog +* Sat Mar 06 2010 Tim Jackson - 1.0.22-2 +- Don't own /usr/share/sounds (#569415) + * Sun Jan 10 2010 Tim Jackson - 1.0.22-1 - Update to 1.0.22 - use %%global instead of %%define From 716153b5234d801301fcd136c5d567df4b5c1029 Mon Sep 17 00:00:00 2001 From: Tim Jackson Date: Sat, 6 Mar 2010 12:51:09 +0000 Subject: [PATCH 16/98] Fix broken previous checkin --- alsa-tools.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/alsa-tools.spec b/alsa-tools.spec index 5ee36f5..8f1f89a 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -188,6 +188,7 @@ install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d %{_datadir}/pixmaps/envy24control.png %{_datadir}/pixmaps/hdspconf.png %{_datadir}/pixmaps/hdspmixer.png +%{_datadir}/sounds/* # sb16_csp stuff which is excluded for PPCx %ifnarch ppc ppc64 From 953d2fb8cfe5e8684f1e3ec44393b1cfcb5a5f11 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 3 May 2010 19:07:52 +0000 Subject: [PATCH 17/98] fix udev rules, update to 1.0.23 --- .cvsignore | 2 +- 90-alsa-tools-firmware.rules | 12 ++++++------ alsa-tools.spec | 26 ++++++++++++++++++++++---- echomixer.desktop | 2 +- envy24control.desktop | 2 +- hwmixvolume.desktop | 11 +++++++++++ hwmixvolume.png | Bin 0 -> 1599 bytes sources | 2 +- 8 files changed, 43 insertions(+), 14 deletions(-) create mode 100644 hwmixvolume.desktop create mode 100644 hwmixvolume.png 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 0000000000000000000000000000000000000000..28226eec7b8cd3fdf4f9c1b1e8b91622326c0334 GIT binary patch literal 1599 zcmV-F2Eh4=P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L00Nr;00Nr1J5Y>XRL#01?Si7_G3M0dFIu@MYuAfP;?6fLPRKxyeP)47kiuXB%!Dbsm& z2Bw|1iGMPid;fFp|DFGF{_~w-P(hA=bNpq)v_5k^zdr~98H*$=%i5yAUsRRwr~5zL z|8pfBru4yg$G?4X{9f`WLWqPVA{@s#@yA;Cyu1Is-%8){r4P~>{a~T-E20`AN*FxL zASlN>@4|p0pnz^=kxXYmDFq=!N@w(g0BQs9N$?B+2t0?LjyT2>H*k663LM*R+KLN; zfVNeuu)cRK#_mkQaoxOKbpY^N0idU275+Rkglsn3^pNp954RHuOpK3X+l~QTyKy^j zS4{u_&=S!war;)0@v5eQ0sy7C-$ErW$HCBbP)gzZKK{8njCgks?xm+uH-Lx|!tk{# zxtL@aw6wG!olb);py7q0MIx{a10)DAIWd7X>o!yeTrmbY7WPccYnp~sD%CXO0YJ}W z5DJH99|WYTZbc6;3{#L3#e?N=7(B~@5K=Wi1VMl(ieMN9re%Q!K}9`DmLc#wD5Wq> zv*;b2v4c`tWKUflD4uC{!;+IpWVAa^*E)Eal(#S~7`F=lp7GsITBLmeB}tJ+H|iED`sdudmpTH?T2-T(y3 zFK+-cnsQnsW!;h>v+NT&sKuI3S7Et2UrDDpWFVlEzl=#Yvp zdOt^0iDLcrUhq7RxYCX%&U6>)-JgCAZ@vExHf{uZ*S(GF|K_^QeS6xmuIGov1Her% zNF5%Bt7PDQ??8=(F|d1US*z^%QS8{s!m%lAXSP)~v+B~wfx6ogtMSum-5zKU0`yHy zVOrOrc6DL9uEUGPaG`;ZXYD2?@dt{66^9Rl9yx+HPMiP|2~b(a-2(@3w?bc3kBCAO z0fg7A0i&uw!4Z?OZ7761dg~EhjD28U2rdG{pa_K+hypDruXN!&Fxw|I-X^S!oyXBH zpGI4|ipRS~ps7*BS|qH0a;OOagvJAx!F~AFQH=g&;^wWdv3qb3Tl)LU%I(60ki2MY zdt(5C2S>;f0EAs!UZCy}`t|Bn3>-TKeQXSWcXgpN9*5rDjhjtm>>2_v6bj+e=qT=3 z7QRX(@X_EPR>$KA3}gAxD$AZ1`X9hz9%wX0L1#P;O;P65>xjp(G8U^jUw20bR=2e+ z9Dq`4oMlR0ORX^ax~T9Rdm zf&fAYteM4;Wf>%(4+kKb&S1l)O*nn>WUhmD9KdnFa$J!I=38vrF1wHJ+q@a$$yEIS zc#conj?+4s*75AN?YMCMTs{_qIz2ES!Y~Y;>hFi;Q`n9RS(1`<0$~3D@KP#cz;-2U zef|abo(Ioy=1R$V6AA{RC_oS;Or$c%Os5L%stuqeq8-XQ?oL98l(ij Date: Wed, 28 Jul 2010 09:45:40 +0000 Subject: [PATCH 18/98] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile 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) From 64ba4e68e9997c1de2498cf8a01c80c7275c1ba3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:45:43 +0000 Subject: [PATCH 19/98] 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 From 2bef60dbdfcf9113cf7771a3721f41fd7256244b Mon Sep 17 00:00:00 2001 From: Tim Jackson Date: Thu, 3 Feb 2011 17:52:49 +0000 Subject: [PATCH 20/98] Update to 1.0.24.1 (incidentally fixes RHBZ #656514) --- alsa-tools-1.0.20-glibc2.10.patch | 12 ------------ alsa-tools.spec | 8 +++++--- sources | 2 +- 3 files changed, 6 insertions(+), 16 deletions(-) delete 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 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 de04796..b2c05e5 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -22,7 +22,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools -Version: 1.0.23 +Version: 1.0.24.1 Release: 1%{?dist} # Checked at least one source file from all the sub-projects contained in @@ -44,7 +44,7 @@ Source5: 90-alsa-tools-firmware.rules Source6: hwmixvolume.png Source7: hwmixvolume.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: alsa-lib-devel >= %{version} +BuildRequires: alsa-lib-devel >= 1.0.24 %if 0%{!?_without_tools:1} BuildRequires: gtk+-devel BuildRequires: gtk2-devel @@ -96,7 +96,6 @@ The following tools are available: %prep %setup -q -n %{name}-%{version} - %build mv seq/sbiload . ; rm -rf seq for i in %{?builddirstools:%builddirstools} %{?builddirsfirmw:%builddirsfirmw} @@ -232,6 +231,9 @@ install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d %endif %changelog +* Thu Feb 03 2011 Tim Jackson - 1.0.24.1-1 +- Update to 1.0.24.1 + * Mon May 03 2010 Tom "spot" Callaway - 1.0.23-1 - update to 1.0.23 diff --git a/sources b/sources index 1564120..73c2bd4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -97c71d428558755b45b4d1dca1aede59 alsa-tools-1.0.23-pruned.tar.bz2 +b0f9a06dc078d9b3bcf424e3688c0430 alsa-tools-1.0.24.1-pruned.tar.bz2 From dd52fb1e915fe80b6f707737691f541d8b1e7492 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 18:59:34 -0600 Subject: [PATCH 21/98] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- alsa-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index b2c05e5..714e123 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -23,7 +23,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.0.24.1 -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 @@ -231,6 +231,9 @@ install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d %endif %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 1.0.24.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Thu Feb 03 2011 Tim Jackson - 1.0.24.1-1 - Update to 1.0.24.1 From b31962666252d2cf189a146a6961aa6799be1e05 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Fri, 10 Jun 2011 09:56:32 -0400 Subject: [PATCH 22/98] libfltk rebuild --- alsa-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index 714e123..4532b3a 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -23,7 +23,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.0.24.1 -Release: 2%{?dist} +Release: 3%{?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 @@ -231,6 +231,9 @@ install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d %endif %changelog +* Fri Jun 10 2011 Adam Jackson 1.0.24.1-3 +- Rebuild for new libfltk + * Mon Feb 07 2011 Fedora Release Engineering - 1.0.24.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 59315904f4ebf696b95ad50dbcd655710dad9548 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Mon, 5 Dec 2011 22:37:30 -0500 Subject: [PATCH 23/98] Rebuild for new libpng --- alsa-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index 4532b3a..471e2b7 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -23,7 +23,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.0.24.1 -Release: 3%{?dist} +Release: 4%{?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 @@ -231,6 +231,9 @@ install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d %endif %changelog +* Tue Dec 06 2011 Adam Jackson - 1.0.24.1-4 +- Rebuild for new libpng + * Fri Jun 10 2011 Adam Jackson 1.0.24.1-3 - Rebuild for new libfltk From 175253ff8f9ce7e15b975d74d30c333854d9491c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 15:11:51 -0600 Subject: [PATCH 24/98] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- alsa-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index 471e2b7..5a38cde 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -23,7 +23,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.0.24.1 -Release: 4%{?dist} +Release: 5%{?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 @@ -231,6 +231,9 @@ install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d %endif %changelog +* Thu Jan 12 2012 Fedora Release Engineering - 1.0.24.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Tue Dec 06 2011 Adam Jackson - 1.0.24.1-4 - Rebuild for new libpng From 0a39210d136e57dc1dab30e5cd0cdc3fc0650b3f Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Wed, 1 Feb 2012 08:31:08 +0100 Subject: [PATCH 25/98] updated to 1.0.25 --- .gitignore | 1 + alsa-tools.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index cb2e1aa..050dcca 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ alsa-tools-1.0.23-pruned.tar.bz2 +/alsa-tools-1.0.25-pruned.tar.bz2 diff --git a/alsa-tools.spec b/alsa-tools.spec index 5a38cde..a324871 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -22,8 +22,8 @@ Summary: Specialist tools for ALSA Name: alsa-tools -Version: 1.0.24.1 -Release: 5%{?dist} +Version: 1.0.25 +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 @@ -231,6 +231,9 @@ install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d %endif %changelog +* Tue Jan 31 2012 Jaroslav Kysela - 1.0.25-1 +- Update to 1.0.25 + * Thu Jan 12 2012 Fedora Release Engineering - 1.0.24.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index 73c2bd4..d05a9ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b0f9a06dc078d9b3bcf424e3688c0430 alsa-tools-1.0.24.1-pruned.tar.bz2 +04d96d866f35fa3d0e7ff1147fa49bfb alsa-tools-1.0.25-pruned.tar.bz2 From 9972bf985335aa3fcef6c7a0bfbf62c323a4a659 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 7 Mar 2012 13:03:08 +0000 Subject: [PATCH 26/98] Bump build for ARM --- alsa-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index a324871..8013164 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -23,7 +23,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.0.25 -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 @@ -231,6 +231,9 @@ install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d %endif %changelog +* Wed Mar 7 2012 Peter Robinson - 1.0.25-2 +- Bump build for ARM + * Tue Jan 31 2012 Jaroslav Kysela - 1.0.25-1 - Update to 1.0.25 From 2639b90ad6d5c7e1a71bf55429af5c9c48580173 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 18 Jul 2012 10:52:42 -0500 Subject: [PATCH 27/98] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- alsa-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index 8013164..64bd8f5 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -23,7 +23,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.0.25 -Release: 2%{?dist} +Release: 3%{?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 @@ -231,6 +231,9 @@ install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d %endif %changelog +* Wed Jul 18 2012 Fedora Release Engineering - 1.0.25-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Wed Mar 7 2012 Peter Robinson - 1.0.25-2 - Bump build for ARM From a12fb4dd6b1dcda79dd2a2f94a7ce85d9cf3782c Mon Sep 17 00:00:00 2001 From: Tim Jackson Date: Wed, 29 Aug 2012 21:14:36 +0200 Subject: [PATCH 28/98] Move udev rules to /lib/udev/rules.d (fixes rhbz #748206) --- alsa-tools.spec | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index 64bd8f5..039482b 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -23,7 +23,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.0.25 -Release: 3%{?dist} +Release: 4%{?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 @@ -41,9 +41,9 @@ 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) +Source6: hwmixvolume.png +Source7: hwmixvolume.desktop + BuildRequires: alsa-lib-devel >= 1.0.24 %if 0%{!?_without_tools:1} BuildRequires: gtk+-devel @@ -52,7 +52,7 @@ BuildRequires: fltk-devel Buildrequires: desktop-file-utils Requires: xorg-x11-fonts-misc # Needed for hwmixvolume -Requires: python-alsa +Requires: python-alsa %endif %description @@ -163,11 +163,8 @@ done rm -f ${RPM_BUILD_ROOT}%{_sysconfdir}/hotplug/usb/tascam_fw.usermap mkdir -p ${RPM_BUILD_ROOT}/lib/udev mv ${RPM_BUILD_ROOT}%{_sysconfdir}/hotplug/usb/* ${RPM_BUILD_ROOT}/lib/udev -mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d -install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d - -%clean -%{__rm} -rf $RPM_BUILD_ROOT +mkdir -p ${RPM_BUILD_ROOT}/lib/udev/rules.d +install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}/lib/udev/rules.d %if 0%{!?_without_tools:1} %files @@ -221,7 +218,7 @@ install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d %doc %{_docdir}/%{name}-%{version}/mixartloader %doc %{_docdir}/%{name}-%{version}/usx2yloader %doc %{_docdir}/%{name}-%{version}/vxloader -%config(noreplace) %{_sysconfdir}/udev/rules.d/*.rules +/lib/udev/rules.d/*.rules /lib/udev/tascam_fpga /lib/udev/tascam_fw %{_bindir}/hdsploader @@ -231,6 +228,10 @@ install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d %endif %changelog +* Wed Aug 29 2012 Tim Jackson - 1.0.25-4 +- Move udev rules to /lib/udev/rules.d (rhbz #748206) +- remove %%BuildRoot and %%clean sections; no longer required + * Wed Jul 18 2012 Fedora Release Engineering - 1.0.25-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 20345efce35446f9f6b2f0f8087679c4917f460d Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Thu, 6 Sep 2012 16:33:34 +0200 Subject: [PATCH 29/98] Updated to 1.0.26 --- .gitignore | 1 + alsa-tools.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 050dcca..1fcf62e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ alsa-tools-1.0.23-pruned.tar.bz2 /alsa-tools-1.0.25-pruned.tar.bz2 +/alsa-tools-1.0.26-pruned.tar.bz2 diff --git a/alsa-tools.spec b/alsa-tools.spec index 039482b..f3490d8 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -22,8 +22,8 @@ Summary: Specialist tools for ALSA Name: alsa-tools -Version: 1.0.25 -Release: 4%{?dist} +Version: 1.0.26 +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 @@ -228,6 +228,9 @@ install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}/lib/udev/rules.d %endif %changelog +* Thu Sep 6 2012 Jaroslav Kysela - 1.0.26-1 +- Updated to 1.0.26 + * Wed Aug 29 2012 Tim Jackson - 1.0.25-4 - Move udev rules to /lib/udev/rules.d (rhbz #748206) - remove %%BuildRoot and %%clean sections; no longer required diff --git a/sources b/sources index d05a9ab..baa9d1a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -04d96d866f35fa3d0e7ff1147fa49bfb alsa-tools-1.0.25-pruned.tar.bz2 +ec80c08ecc4dc0097e0c3ecc428b8286 alsa-tools-1.0.26-pruned.tar.bz2 From dc64500e07d83cbd37203ca3fb81e9b653078c3e Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Thu, 6 Sep 2012 17:34:36 +0200 Subject: [PATCH 30/98] Updated to 1.0.26.1 --- .gitignore | 2 ++ alsa-tools.spec | 19 ++++++++++++++++--- hdajackretask.desktop | 10 ++++++++++ sources | 2 +- 4 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 hdajackretask.desktop diff --git a/.gitignore b/.gitignore index 1fcf62e..a2ca962 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ alsa-tools-1.0.23-pruned.tar.bz2 /alsa-tools-1.0.25-pruned.tar.bz2 /alsa-tools-1.0.26-pruned.tar.bz2 +/alsa-tools-1.0.26.1.tar.bz2 +/alsa-tools-1.0.26.1-pruned.tar.bz2 diff --git a/alsa-tools.spec b/alsa-tools.spec index f3490d8..99cd258 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 hwmixvolume rmedigicontrol sbiload sscape_ctl us428control } +%{?!_without_tools: %global builddirstools as10k1 echomixer envy24control hdspconf hdspmixer hwmixvolume rmedigicontrol sbiload sscape_ctl us428control hda-verb hdajackretask } %else -%{?!_without_tools: %global builddirstools as10k1 echomixer envy24control hdspconf hdspmixer hwmixvolume rmedigicontrol sbiload sb16_csp sscape_ctl us428control } +%{?!_without_tools: %global builddirstools as10k1 echomixer envy24control hdspconf hdspmixer hwmixvolume rmedigicontrol sbiload sb16_csp sscape_ctl us428control hda-verb hdajackretask } %endif %{?!_without_firmware: %global builddirsfirmw hdsploader mixartloader usx2yloader vxloader } @@ -22,7 +22,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools -Version: 1.0.26 +Version: 1.0.26.1 Release: 1%{?dist} # Checked at least one source file from all the sub-projects contained in @@ -43,6 +43,7 @@ Source5: 90-alsa-tools-firmware.rules # http://www.openclipart.org/detail/17428 Source6: hwmixvolume.png Source7: hwmixvolume.desktop +Source9: hdajackretask.desktop BuildRequires: alsa-lib-devel >= 1.0.24 %if 0%{!?_without_tools:1} @@ -132,6 +133,9 @@ do usx2yloader) (cd $i ; %makeinstall hotplugdir=${RPM_BUILD_ROOT}%{_sysconfdir}/hotplug/usb) || exit 1 ;; + hdajackretask) + (cd $i ; %makeinstall ; install -m 644 %{SOURCE9} ${RPM_BUILD_ROOT}%{_datadir}/applications/ ) || exit 1 + ;; *) (cd $i ; %makeinstall) || exit 1 esac if [[ -s "${i}"/README ]] @@ -178,6 +182,8 @@ install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}/lib/udev/rules.d %doc %{_docdir}/%{name}-%{version}/hwmixvolume %doc %{_docdir}/%{name}-%{version}/rmedigicontrol %doc %{_docdir}/%{name}-%{version}/sbiload +%doc %{_docdir}/%{name}-%{version}/hda-verb +%doc %{_docdir}/%{name}-%{version}/hdajackretask %{_bindir}/as10k1 %{_bindir}/echomixer %{_bindir}/envy24control @@ -188,11 +194,14 @@ install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}/lib/udev/rules.d %{_bindir}/sbiload %{_bindir}/sscape_ctl %{_bindir}/us428control +%{_bindir}/hda-verb +%{_bindir}/hdajackretask %{_datadir}/applications/fedora-echomixer.desktop %{_datadir}/applications/fedora-envy24control.desktop %{_datadir}/applications/fedora-hdspconf.desktop %{_datadir}/applications/fedora-hdspmixer.desktop %{_datadir}/applications/fedora-hwmixvolume.desktop +%{_datadir}/applications/fedora-hdajackretask.desktop %{_datadir}/man/man1/envy24control.1.gz %{_datadir}/pixmaps/echomixer.png %{_datadir}/pixmaps/envy24control.png @@ -228,6 +237,10 @@ install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}/lib/udev/rules.d %endif %changelog +* Thu Sep 6 2012 Jaroslav Kysela - 1.0.26.1-1 +- Updated to 1.0.26.1 +- Added hda-verb and hdajackretask tools + * Thu Sep 6 2012 Jaroslav Kysela - 1.0.26-1 - Updated to 1.0.26 diff --git a/hdajackretask.desktop b/hdajackretask.desktop new file mode 100644 index 0000000..67b9e88 --- /dev/null +++ b/hdajackretask.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=HDAJackRetask +GenericName=Retask the audio jacks for the HDA sound driver +Comment=Retask the audio jacks for the HDA sound driver +Exec=hdajackretask +Terminal=false +Type=Application +Categories=Application;AudioVideo; +Version=0.9.4 diff --git a/sources b/sources index baa9d1a..a0978d7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ec80c08ecc4dc0097e0c3ecc428b8286 alsa-tools-1.0.26-pruned.tar.bz2 +2bf2db319a747edd4e954866d8ba8de7 alsa-tools-1.0.26.1-pruned.tar.bz2 From ee3c8d2d199501b383a3483adb70234ee509be58 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Fri, 7 Sep 2012 13:19:58 +0200 Subject: [PATCH 31/98] Dependency fix --- alsa-tools.spec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/alsa-tools.spec b/alsa-tools.spec index 99cd258..33a17b5 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -49,6 +49,7 @@ BuildRequires: alsa-lib-devel >= 1.0.24 %if 0%{!?_without_tools:1} BuildRequires: gtk+-devel BuildRequires: gtk2-devel +BuildRequires: gtk3-devel BuildRequires: fltk-devel Buildrequires: desktop-file-utils Requires: xorg-x11-fonts-misc @@ -74,6 +75,8 @@ certain sound cards. * sbiload - An OPL2/3 FM instrument loader for ALSA sequencer * sscape_ctl - ALSA SoundScape control utility * us428control - Control tool for Tascam 428 +* hda-verb - Direct HDA codec access +* hdajackretask - Reassign the I/O jacks on the HDA hardware %package firmware @@ -237,6 +240,10 @@ install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}/lib/udev/rules.d %endif %changelog +* Fri Sep 7 2012 Jaroslav Kysela - 1.0.26.1-2 +- Fixed gtk3-devel dependency (hdajackretask) +- Added description for hda-verb and hdajackretask + * Thu Sep 6 2012 Jaroslav Kysela - 1.0.26.1-1 - Updated to 1.0.26.1 - Added hda-verb and hdajackretask tools From d73c2ad3966cd41dfe3ec8800907564b3a226021 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Fri, 7 Sep 2012 13:22:56 +0200 Subject: [PATCH 32/98] Version fix --- alsa-tools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index 33a17b5..2da9552 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -23,7 +23,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.0.26.1 -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 From a334fd9b113a740d1ec293f78e38c674bedc295b Mon Sep 17 00:00:00 2001 From: Rahul Sundaram Date: Sat, 9 Feb 2013 17:06:48 -0500 Subject: [PATCH 33/98] remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247 - clean up spec to follow current guidelines - don't build -tools for RHEL. Bill Nottingham patch. Resolves rhbz#586030 --- alsa-tools.spec | 73 +++++++++++++++++++++++++------------------------ 1 file changed, 37 insertions(+), 36 deletions(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index 2da9552..2bfbc93 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -3,6 +3,9 @@ # (see alsa-firmware), it is some complementary tools. # Do *NOT* set it to zero or have a commented out define here, or it will not # work. (RPM spec file voodoo) +%if 0%{?rhel} +%global _without_tools 1 +%endif %ifarch ppc ppc64 # sb16_csp doesn't build on PPC; see bug #219010 @@ -23,7 +26,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.0.26.1 -Release: 2%{?dist} +Release: 4%{?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 @@ -111,71 +114,65 @@ done %install -%{__rm} -rf $RPM_BUILD_ROOT - -mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/{pixmaps,applications} +mkdir -p %{buildroot}%{_datadir}/{pixmaps,applications} for i in %{?builddirstools:%builddirstools} %{?builddirsfirmw:%builddirsfirmw} do case $i in echomixer) - (cd $i ; %makeinstall ; install -m 644 %{SOURCE4} %{buildroot}%{_datadir}/pixmaps/ ; install -m 644 %{SOURCE3} ${RPM_BUILD_ROOT}%{_datadir}/applications/ ) || exit 1 + (cd $i ; %makeinstall ; install -m 644 %{SOURCE4} %{buildroot}%{_datadir}/pixmaps/ ; install -m 644 %{SOURCE3} %{buildroot}%{_datadir}/applications/ ) || exit 1 ;; envy24control) - (cd $i ; %makeinstall ; install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/ ; install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/applications/ ) || exit 1 + (cd $i ; %makeinstall ; install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/ ; install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/applications/ ) || exit 1 ;; hdspconf) - (cd $i ; %makeinstall pixmapdir=${RPM_BUILD_ROOT}%{_datadir}/pixmaps desktopdir=${RPM_BUILD_ROOT}%{_datadir}/applications ) || exit 1 + (cd $i ; %makeinstall pixmapdir=%{buildroot}%{_datadir}/pixmaps desktopdir=%{buildroot}%{_datadir}/applications ) || exit 1 ;; hdspmixer) - (cd $i ; %makeinstall pixmapdir=${RPM_BUILD_ROOT}%{_datadir}/pixmaps desktopdir=${RPM_BUILD_ROOT}%{_datadir}/applications ) || exit 1 + (cd $i ; %makeinstall pixmapdir=%{buildroot}%{_datadir}/pixmaps desktopdir=%{buildroot}%{_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 + (cd $i ; %makeinstall ; install -m 644 %{SOURCE6} %{buildroot}%{_datadir}/pixmaps/ ; install -m 644 %{SOURCE7} %{buildroot}%{_datadir}/applications/ ) || exit 1 ;; usx2yloader) - (cd $i ; %makeinstall hotplugdir=${RPM_BUILD_ROOT}%{_sysconfdir}/hotplug/usb) || exit 1 + (cd $i ; %makeinstall hotplugdir=%{buildroot}%{_sysconfdir}/hotplug/usb) || exit 1 ;; hdajackretask) - (cd $i ; %makeinstall ; install -m 644 %{SOURCE9} ${RPM_BUILD_ROOT}%{_datadir}/applications/ ) || exit 1 + (cd $i ; %makeinstall ; install -m 644 %{SOURCE9} %{buildroot}%{_datadir}/applications/ ) || exit 1 ;; *) (cd $i ; %makeinstall) || exit 1 esac if [[ -s "${i}"/README ]] then - if [[ ! -d "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}" ]] + if [[ ! -d "%{buildroot}%{_docdir}/%{name}-%{version}/${i}" ]] then - mkdir -p "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}" + mkdir -p "%{buildroot}%{_docdir}/%{name}-%{version}/${i}" fi - cp "${i}"/README "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}" + cp "${i}"/README "%{buildroot}%{_docdir}/%{name}-%{version}/${i}" fi if [[ -s "${i}"/COPYING ]] then - if [[ ! -d "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}" ]] + if [[ ! -d "%{buildroot}%{_docdir}/%{name}-%{version}/${i}" ]] then - mkdir -p "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}" + mkdir -p "%{buildroot}%{_docdir}/%{name}-%{version}/${i}" fi - cp "${i}"/COPYING "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}" + cp "${i}"/COPYING "%{buildroot}%{_docdir}/%{name}-%{version}/${i}" fi - if [[ -s ${RPM_BUILD_ROOT}%{_datadir}/applications/${i}.desktop ]] ; then - desktop-file-install --vendor fedora \ - --add-category "X-Fedora" \ - --delete-original \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - ${RPM_BUILD_ROOT}%{_datadir}/applications/${i}.desktop + if [[ -s %{buildroot}%{_datadir}/applications/${i}.desktop ]] ; then + desktop-file-install --dir %{buildroot}%{_datadir}/applications \ + %{buildroot}%{_datadir}/applications/${i}.desktop fi done # convert hotplug stuff to udev -rm -f ${RPM_BUILD_ROOT}%{_sysconfdir}/hotplug/usb/tascam_fw.usermap -mkdir -p ${RPM_BUILD_ROOT}/lib/udev -mv ${RPM_BUILD_ROOT}%{_sysconfdir}/hotplug/usb/* ${RPM_BUILD_ROOT}/lib/udev -mkdir -p ${RPM_BUILD_ROOT}/lib/udev/rules.d -install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}/lib/udev/rules.d +rm -f %{buildroot}%{_sysconfdir}/hotplug/usb/tascam_fw.usermap +mkdir -p %{buildroot}/lib/udev +mv %{buildroot}%{_sysconfdir}/hotplug/usb/* %{buildroot}/lib/udev +mkdir -p %{buildroot}/lib/udev/rules.d +install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d %if 0%{!?_without_tools:1} %files -%defattr(-,root,root,-) %dir %{_docdir}/%{name}-%{version} %doc %{_docdir}/%{name}-%{version}/as10k1 %doc %{_docdir}/%{name}-%{version}/echomixer @@ -199,12 +196,12 @@ install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}/lib/udev/rules.d %{_bindir}/us428control %{_bindir}/hda-verb %{_bindir}/hdajackretask -%{_datadir}/applications/fedora-echomixer.desktop -%{_datadir}/applications/fedora-envy24control.desktop -%{_datadir}/applications/fedora-hdspconf.desktop -%{_datadir}/applications/fedora-hdspmixer.desktop -%{_datadir}/applications/fedora-hwmixvolume.desktop -%{_datadir}/applications/fedora-hdajackretask.desktop +%{_datadir}/applications/echomixer.desktop +%{_datadir}/applications/envy24control.desktop +%{_datadir}/applications/hdspconf.desktop +%{_datadir}/applications/hdspmixer.desktop +%{_datadir}/applications/hwmixvolume.desktop +%{_datadir}/applications/hdajackretask.desktop %{_datadir}/man/man1/envy24control.1.gz %{_datadir}/pixmaps/echomixer.png %{_datadir}/pixmaps/envy24control.png @@ -224,7 +221,6 @@ install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}/lib/udev/rules.d %if 0%{!?_without_firmware:1} %files firmware -%defattr(-,root,root,-) %dir %{_docdir}/%{name}-%{version} %doc %{_docdir}/%{name}-%{version}/hdsploader %doc %{_docdir}/%{name}-%{version}/mixartloader @@ -240,6 +236,11 @@ install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}/lib/udev/rules.d %endif %changelog +* Sat Feb 09 2013 Rahul Sundaram - 1.0.26.1-3 +- remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247 +- clean up spec to follow current guidelines +- don't build -tools for RHEL. Bill Nottingham patch. Resolves rhbz#586030 + * Fri Sep 7 2012 Jaroslav Kysela - 1.0.26.1-2 - Fixed gtk3-devel dependency (hdajackretask) - Added description for hda-verb and hdajackretask From c786618810a02a4c994268c9639ca119e1f70744 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Fri, 12 Apr 2013 12:30:24 +0200 Subject: [PATCH 34/98] updated to 1.0.27 --- .gitignore | 1 + alsa-tools.spec | 12 ++++++------ sources | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index a2ca962..fb51a06 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ alsa-tools-1.0.23-pruned.tar.bz2 /alsa-tools-1.0.26-pruned.tar.bz2 /alsa-tools-1.0.26.1.tar.bz2 /alsa-tools-1.0.26.1-pruned.tar.bz2 +/alsa-tools-1.0.27.tar.bz2 diff --git a/alsa-tools.spec b/alsa-tools.spec index 2bfbc93..dd8a027 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -16,24 +16,21 @@ %{?!_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 - # Note that the Version is intended to coincide with the version of ALSA # included with the Fedora kernel, rather than necessarily the very latest # upstream version of alsa-tools Summary: Specialist tools for ALSA Name: alsa-tools -Version: 1.0.26.1 -Release: 4%{?dist} +Version: 1.0.27 +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 License: GPLv2+ Group: Applications/Multimedia URL: http://www.alsa-project.org/ -Source0: %{name}-%{version}-pruned.tar.bz2 +Source: ftp://ftp.alsa-project.org/pub/tools/%{name}-%{version}.tar.bz2 # The icons below were created by Tim Jackson from screenshots of the # apps in question. They suck, a lot. Better alternatives welcome! @@ -236,6 +233,9 @@ install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d %endif %changelog +* Fri Apr 12 2013 Jaroslav Kysela - 1.0.27-1 +- Updated to 1.0.27 + * Sat Feb 09 2013 Rahul Sundaram - 1.0.26.1-3 - remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247 - clean up spec to follow current guidelines diff --git a/sources b/sources index a0978d7..6f60f43 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2bf2db319a747edd4e954866d8ba8de7 alsa-tools-1.0.26.1-pruned.tar.bz2 +1ea381d00a6069a98613aa7effa4cb51 alsa-tools-1.0.27.tar.bz2 From c92d6a28c2ea6e3bfc63b2c91f8f2df2e9c3574e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Tue, 21 May 2013 13:05:16 +0200 Subject: [PATCH 35/98] fix build on non-x86 arches --- alsa-tools-1.0.27-non-x86.patch | 12 ++++++++++++ alsa-tools.spec | 9 ++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 alsa-tools-1.0.27-non-x86.patch diff --git a/alsa-tools-1.0.27-non-x86.patch b/alsa-tools-1.0.27-non-x86.patch new file mode 100644 index 0000000..5fe93b6 --- /dev/null +++ b/alsa-tools-1.0.27-non-x86.patch @@ -0,0 +1,12 @@ +diff -up alsa-tools-1.0.27/hda-verb/hda-verb.c.s390 alsa-tools-1.0.27/hda-verb/hda-verb.c +--- alsa-tools-1.0.27/hda-verb/hda-verb.c.s390 2013-05-21 12:31:13.000000000 +0200 ++++ alsa-tools-1.0.27/hda-verb/hda-verb.c 2013-05-21 12:31:42.000000000 +0200 +@@ -13,7 +13,7 @@ + #include + #include + #include +-#ifndef __PPC__ ++#if defined(__i386__) || defined(__x86_64__) + #include + #endif + #include diff --git a/alsa-tools.spec b/alsa-tools.spec index dd8a027..7567b90 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -23,7 +23,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.0.27 -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 @@ -45,6 +45,9 @@ Source6: hwmixvolume.png Source7: hwmixvolume.desktop Source9: hdajackretask.desktop +# build fix for non-x86 arches +Patch0: %{name}-1.0.27-non-x86.patch + BuildRequires: alsa-lib-devel >= 1.0.24 %if 0%{!?_without_tools:1} BuildRequires: gtk+-devel @@ -99,6 +102,7 @@ The following tools are available: %prep %setup -q -n %{name}-%{version} +%patch0 -p1 -b .non-x86 %build mv seq/sbiload . ; rm -rf seq @@ -233,6 +237,9 @@ install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d %endif %changelog +* Tue May 21 2013 Dan Horák - 1.0.27-2 +- fix build on non-x86 arches + * Fri Apr 12 2013 Jaroslav Kysela - 1.0.27-1 - Updated to 1.0.27 From 4f986d9a40574c4e1746698104c7046d24c2df78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Fri, 2 Aug 2013 00:42:14 +0300 Subject: [PATCH 36/98] Install docs to %{_pkgdocdir} where available. --- alsa-tools.spec | 53 +++++++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 24 deletions(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index 7567b90..e122290 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -16,6 +16,8 @@ %{?!_without_firmware: %global builddirsfirmw hdsploader mixartloader usx2yloader vxloader } +%{?!_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} + # Note that the Version is intended to coincide with the version of ALSA # included with the Fedora kernel, rather than necessarily the very latest # upstream version of alsa-tools @@ -23,7 +25,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.0.27 -Release: 2%{?dist} +Release: 3%{?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 @@ -145,19 +147,19 @@ do esac if [[ -s "${i}"/README ]] then - if [[ ! -d "%{buildroot}%{_docdir}/%{name}-%{version}/${i}" ]] + if [[ ! -d "%{buildroot}%{_pkgdocdir}/${i}" ]] then - mkdir -p "%{buildroot}%{_docdir}/%{name}-%{version}/${i}" + mkdir -p "%{buildroot}%{_pkgdocdir}/${i}" fi - cp "${i}"/README "%{buildroot}%{_docdir}/%{name}-%{version}/${i}" + cp "${i}"/README "%{buildroot}%{_pkgdocdir}/${i}" fi if [[ -s "${i}"/COPYING ]] then - if [[ ! -d "%{buildroot}%{_docdir}/%{name}-%{version}/${i}" ]] + if [[ ! -d "%{buildroot}%{_pkgdocdir}/${i}" ]] then - mkdir -p "%{buildroot}%{_docdir}/%{name}-%{version}/${i}" + mkdir -p "%{buildroot}%{_pkgdocdir}/${i}" fi - cp "${i}"/COPYING "%{buildroot}%{_docdir}/%{name}-%{version}/${i}" + cp "${i}"/COPYING "%{buildroot}%{_pkgdocdir}/${i}" fi if [[ -s %{buildroot}%{_datadir}/applications/${i}.desktop ]] ; then desktop-file-install --dir %{buildroot}%{_datadir}/applications \ @@ -174,17 +176,17 @@ install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d %if 0%{!?_without_tools:1} %files -%dir %{_docdir}/%{name}-%{version} -%doc %{_docdir}/%{name}-%{version}/as10k1 -%doc %{_docdir}/%{name}-%{version}/echomixer -%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 -%doc %{_docdir}/%{name}-%{version}/hda-verb -%doc %{_docdir}/%{name}-%{version}/hdajackretask +%dir %{_pkgdocdir} +%doc %{_pkgdocdir}/as10k1 +%doc %{_pkgdocdir}/echomixer +%doc %{_pkgdocdir}/envy24control +%doc %{_pkgdocdir}/hdspconf +%doc %{_pkgdocdir}/hdspmixer +%doc %{_pkgdocdir}/hwmixvolume +%doc %{_pkgdocdir}/rmedigicontrol +%doc %{_pkgdocdir}/sbiload +%doc %{_pkgdocdir}/hda-verb +%doc %{_pkgdocdir}/hdajackretask %{_bindir}/as10k1 %{_bindir}/echomixer %{_bindir}/envy24control @@ -213,7 +215,7 @@ install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d # sb16_csp stuff which is excluded for PPCx %ifnarch ppc ppc64 -%doc %{_docdir}/%{name}-%{version}/sb16_csp +%doc %{_pkgdocdir}/sb16_csp %{_bindir}/cspctl %{_datadir}/man/man1/cspctl.1.gz %endif @@ -222,11 +224,11 @@ install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d %if 0%{!?_without_firmware:1} %files firmware -%dir %{_docdir}/%{name}-%{version} -%doc %{_docdir}/%{name}-%{version}/hdsploader -%doc %{_docdir}/%{name}-%{version}/mixartloader -%doc %{_docdir}/%{name}-%{version}/usx2yloader -%doc %{_docdir}/%{name}-%{version}/vxloader +%dir %{_pkgdocdir} +%doc %{_pkgdocdir}/hdsploader +%doc %{_pkgdocdir}/mixartloader +%doc %{_pkgdocdir}/usx2yloader +%doc %{_pkgdocdir}/vxloader /lib/udev/rules.d/*.rules /lib/udev/tascam_fpga /lib/udev/tascam_fw @@ -237,6 +239,9 @@ install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d %endif %changelog +* Thu Aug 1 2013 Ville Skyttä - 1.0.27-3 +- Install docs to %%{_pkgdocdir} where available. + * Tue May 21 2013 Dan Horák - 1.0.27-2 - fix build on non-x86 arches From c9f8bf135230f35c916e03ed3ee0e9ae89cbdd0c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 19:31:45 -0500 Subject: [PATCH 37/98] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- alsa-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index e122290..2e9b4cd 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -25,7 +25,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.0.27 -Release: 3%{?dist} +Release: 4%{?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 @@ -239,6 +239,9 @@ install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d %endif %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 1.0.27-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Thu Aug 1 2013 Ville Skyttä - 1.0.27-3 - Install docs to %%{_pkgdocdir} where available. From 130ea7bb738edd8bf5eb7e6e56c7543c454ef36f Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 25 Jul 2014 00:09:25 +0100 Subject: [PATCH 38/98] 1.0.28 --- .gitignore | 7 +---- alsa-tools-1.0.27-non-x86.patch | 12 -------- alsa-tools.spec | 53 +++++---------------------------- sources | 2 +- 4 files changed, 9 insertions(+), 65 deletions(-) delete mode 100644 alsa-tools-1.0.27-non-x86.patch diff --git a/.gitignore b/.gitignore index fb51a06..1f79e8d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1 @@ -alsa-tools-1.0.23-pruned.tar.bz2 -/alsa-tools-1.0.25-pruned.tar.bz2 -/alsa-tools-1.0.26-pruned.tar.bz2 -/alsa-tools-1.0.26.1.tar.bz2 -/alsa-tools-1.0.26.1-pruned.tar.bz2 -/alsa-tools-1.0.27.tar.bz2 +/alsa-tools-1.*.tar.bz2 diff --git a/alsa-tools-1.0.27-non-x86.patch b/alsa-tools-1.0.27-non-x86.patch deleted file mode 100644 index 5fe93b6..0000000 --- a/alsa-tools-1.0.27-non-x86.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up alsa-tools-1.0.27/hda-verb/hda-verb.c.s390 alsa-tools-1.0.27/hda-verb/hda-verb.c ---- alsa-tools-1.0.27/hda-verb/hda-verb.c.s390 2013-05-21 12:31:13.000000000 +0200 -+++ alsa-tools-1.0.27/hda-verb/hda-verb.c 2013-05-21 12:31:42.000000000 +0200 -@@ -13,7 +13,7 @@ - #include - #include - #include --#ifndef __PPC__ -+#if defined(__i386__) || defined(__x86_64__) - #include - #endif - #include diff --git a/alsa-tools.spec b/alsa-tools.spec index 2e9b4cd..558494e 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -24,8 +24,8 @@ Summary: Specialist tools for ALSA Name: alsa-tools -Version: 1.0.27 -Release: 4%{?dist} +Version: 1.0.28 +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 @@ -47,10 +47,7 @@ Source6: hwmixvolume.png Source7: hwmixvolume.desktop Source9: hdajackretask.desktop -# build fix for non-x86 arches -Patch0: %{name}-1.0.27-non-x86.patch - -BuildRequires: alsa-lib-devel >= 1.0.24 +BuildRequires: alsa-lib-devel >= %{version} %if 0%{!?_without_tools:1} BuildRequires: gtk+-devel BuildRequires: gtk2-devel @@ -104,14 +101,13 @@ The following tools are available: %prep %setup -q -n %{name}-%{version} -%patch0 -p1 -b .non-x86 %build mv seq/sbiload . ; rm -rf seq for i in %{?builddirstools:%builddirstools} %{?builddirsfirmw:%builddirsfirmw} do cd $i ; %configure - %{__make} %{?_smp_mflags} || exit 1 + make %{?_smp_mflags} || exit 1 cd .. done @@ -239,6 +235,9 @@ install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d %endif %changelog +* Thu Jul 24 2014 Peter Robinson 1.0.28-1 +- Update to 1.0.28 + * Sat Jun 07 2014 Fedora Release Engineering - 1.0.27-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild @@ -393,41 +392,3 @@ install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d * Wed Apr 06 2005 Thorsten Leemhuis - 1.0.8-1 - Update to 1.0.8 - -* Sun Mar 29 2005 Thorsten Leemhuis - 0:1.0.6-2 -- Add "--without tools" and "--with firmware" options -- Drop unneeded BR: automake - -* Sun Jan 02 2005 Thorsten Leemhuis - 0:1.0.6-0.fdr.1 -- Update to 1.0.6 for FC3 -- add new files in {_datadir}/sounds/ -- add patch0 for as10k1 - -* Sat Apr 03 2004 Thorsten Leemhuis - 0:1.0.4-0.fdr.1 -- Update to 1.0.4 - -* Fri Jan 16 2004 Thorsten Leemhuis - 0:1.0.1-0.fdr.2 -- Integrate Michaels patch that fixes: -- fix desktop files for fedora.us, adds buildreq desktop-file-utils -- fix %%install section for short-circuit installs - -* Fri Jan 09 2004 Thorsten Leemhuis - 0:1.0.1-0.fdr.1 -- Update to 1.0.1 - -* Sun Dec 14 2003 Thorsten Leemhuis 1.0.0-0.fdr.0.3.rc2 -- exit if error during build or install -- fix install errors hdspconf, hdspmixer, usx2yloader -- Split package in alsa-tools and alsa-tools-firmware -- Integrate more docs - -* Fri Dec 06 2003 Thorsten Leemhuis 1.0.0-0.fdr.0.2.rc2 -- Update to 1.0.0rc2 -- some minor corrections in style - -* Thu Dec 04 2003 Thorsten Leemhuis 1.0.0-0.fdr.0.1.rc1 -- Update to 1.0.0rc1 -- Remove firmware files -- extra package now. -- Add description - -* Wed Aug 13 2003 Dams 0:tools-0.fdr.1 -- Initial build. diff --git a/sources b/sources index 6f60f43..aa86039 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1ea381d00a6069a98613aa7effa4cb51 alsa-tools-1.0.27.tar.bz2 +e6c929175d8ee729c06d49b51439bad6 alsa-tools-1.0.28.tar.bz2 From ead399629378b902157a2658ef8497f3b769dfa1 Mon Sep 17 00:00:00 2001 From: Tim Jackson Date: Fri, 25 Jul 2014 14:12:02 +0200 Subject: [PATCH 39/98] Fix Bug 909622 - don't use %makeinstall --- alsa-tools.spec | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index 558494e..758d177 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -25,7 +25,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.0.28 -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 @@ -119,27 +119,27 @@ for i in %{?builddirstools:%builddirstools} %{?builddirsfirmw:%builddirsfirmw} do case $i in echomixer) - (cd $i ; %makeinstall ; install -m 644 %{SOURCE4} %{buildroot}%{_datadir}/pixmaps/ ; install -m 644 %{SOURCE3} %{buildroot}%{_datadir}/applications/ ) || exit 1 + (cd $i ; %make_install ; install -m 644 %{SOURCE4} %{buildroot}%{_datadir}/pixmaps/ ; install -m 644 %{SOURCE3} %{buildroot}%{_datadir}/applications/ ) || exit 1 ;; envy24control) - (cd $i ; %makeinstall ; install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/ ; install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/applications/ ) || exit 1 + (cd $i ; %make_install ; install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/ ; install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/applications/ ) || exit 1 ;; hdspconf) - (cd $i ; %makeinstall pixmapdir=%{buildroot}%{_datadir}/pixmaps desktopdir=%{buildroot}%{_datadir}/applications ) || exit 1 + (cd $i ; %make_install ) || exit 1 ;; hdspmixer) - (cd $i ; %makeinstall pixmapdir=%{buildroot}%{_datadir}/pixmaps desktopdir=%{buildroot}%{_datadir}/applications ) || exit 1 + (cd $i ; %make_install ) || exit 1 ;; hwmixvolume) - (cd $i ; %makeinstall ; install -m 644 %{SOURCE6} %{buildroot}%{_datadir}/pixmaps/ ; install -m 644 %{SOURCE7} %{buildroot}%{_datadir}/applications/ ) || exit 1 + (cd $i ; %make_install ; install -m 644 %{SOURCE6} %{buildroot}%{_datadir}/pixmaps/ ; install -m 644 %{SOURCE7} %{buildroot}%{_datadir}/applications/ ) || exit 1 ;; usx2yloader) - (cd $i ; %makeinstall hotplugdir=%{buildroot}%{_sysconfdir}/hotplug/usb) || exit 1 + (cd $i ; %make_install hotplugdir=/lib/udev) || exit 1 ;; hdajackretask) - (cd $i ; %makeinstall ; install -m 644 %{SOURCE9} %{buildroot}%{_datadir}/applications/ ) || exit 1 + (cd $i ; %make_install ; install -m 644 %{SOURCE9} %{buildroot}%{_datadir}/applications/ ) || exit 1 ;; - *) (cd $i ; %makeinstall) || exit 1 + *) (cd $i ; %make_install) || exit 1 esac if [[ -s "${i}"/README ]] then @@ -164,9 +164,7 @@ do done # convert hotplug stuff to udev -rm -f %{buildroot}%{_sysconfdir}/hotplug/usb/tascam_fw.usermap -mkdir -p %{buildroot}/lib/udev -mv %{buildroot}%{_sysconfdir}/hotplug/usb/* %{buildroot}/lib/udev +rm -f %{buildroot}/lib/udev/tascam_fw.usermap mkdir -p %{buildroot}/lib/udev/rules.d install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d @@ -235,6 +233,9 @@ install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d %endif %changelog +* Fri Jul 25 2014 Tim Jackson 1.0.28-1 +- don't use %%makeinstall (RHBZ #909622) + * Thu Jul 24 2014 Peter Robinson 1.0.28-1 - Update to 1.0.28 From e90dcc7b31ab694222b68df0a35c2e5ae29bb187 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 15 Aug 2014 20:23:01 +0000 Subject: [PATCH 40/98] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- alsa-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index 758d177..767fe0a 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -25,7 +25,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.0.28 -Release: 2%{?dist} +Release: 3%{?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 @@ -233,6 +233,9 @@ install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d %endif %changelog +* Fri Aug 15 2014 Fedora Release Engineering - 1.0.28-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Fri Jul 25 2014 Tim Jackson 1.0.28-1 - don't use %%makeinstall (RHBZ #909622) From 8870a170e1775d834d8cf9e87532e0d4f4f2f9c5 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 19 Feb 2015 10:06:50 -0600 Subject: [PATCH 41/98] rebuild (fltk) --- alsa-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index 767fe0a..08cc435 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -25,7 +25,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.0.28 -Release: 3%{?dist} +Release: 4%{?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 @@ -233,6 +233,9 @@ install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d %endif %changelog +* Thu Feb 19 2015 Rex Dieter 1.0.28-4 +- rebuild (fltk) + * Fri Aug 15 2014 Fedora Release Engineering - 1.0.28-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 0252a817cccb0fa0ba211803cb779b496d7bef03 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Thu, 26 Feb 2015 16:50:42 +0100 Subject: [PATCH 42/98] updated to 1.0.29 --- alsa-tools.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index 08cc435..cf048c9 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -24,8 +24,8 @@ Summary: Specialist tools for ALSA Name: alsa-tools -Version: 1.0.28 -Release: 4%{?dist} +Version: 1.0.29 +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 @@ -233,6 +233,9 @@ install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d %endif %changelog +* Thu Feb 26 2015 Jaroslav Kysela - 1.0.29-1 +- updated to 1.0.29 + * Thu Feb 19 2015 Rex Dieter 1.0.28-4 - rebuild (fltk) diff --git a/sources b/sources index aa86039..0428ad2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e6c929175d8ee729c06d49b51439bad6 alsa-tools-1.0.28.tar.bz2 +f339a3cd24f748c9d007bdff0e98775b alsa-tools-1.0.29.tar.bz2 From 67d746d45e0f28a06a3fb2a85079a3921cb3b2ff Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Thu, 26 Mar 2015 16:08:15 +0000 Subject: [PATCH 43/98] Add an AppData file for the software center --- alsa-tools.spec | 53 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index cf048c9..ff30cb6 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -25,7 +25,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.0.29 -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 @@ -163,6 +163,53 @@ do fi done +# Merge applications into one software center item +mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata +cat > $RPM_BUILD_ROOT%{_datadir}/appdata/echomixer.appdata.xml < + + + CC0-1.0 + echomixer.desktop + + hwmixvolume.desktop + + +EOF +cat > $RPM_BUILD_ROOT%{_datadir}/appdata/envy24control.appdata.xml < + + + CC0-1.0 + envy24control.desktop + + hwmixvolume.desktop + + +EOF +cat > $RPM_BUILD_ROOT%{_datadir}/appdata/hdspconf.appdata.xml < + + + CC0-1.0 + hdspconf.desktop + + hwmixvolume.desktop + + +EOF +cat > $RPM_BUILD_ROOT%{_datadir}/appdata/hdspmixer.appdata.xml < + + + CC0-1.0 + hdspmixer.desktop + + hwmixvolume.desktop + + +EOF + # convert hotplug stuff to udev rm -f %{buildroot}/lib/udev/tascam_fw.usermap mkdir -p %{buildroot}/lib/udev/rules.d @@ -193,6 +240,7 @@ install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d %{_bindir}/us428control %{_bindir}/hda-verb %{_bindir}/hdajackretask +%{_datadir}/appdata/*.appdata.xml %{_datadir}/applications/echomixer.desktop %{_datadir}/applications/envy24control.desktop %{_datadir}/applications/hdspconf.desktop @@ -233,6 +281,9 @@ install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d %endif %changelog +* Thu Mar 26 2015 Richard Hughes - 1.0.29-2 +- Add an AppData file for the software center + * Thu Feb 26 2015 Jaroslav Kysela - 1.0.29-1 - updated to 1.0.29 From 59be36ba0a637c1de7994788abd06891624be6a5 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 2 May 2015 12:29:52 +0200 Subject: [PATCH 44/98] Rebuilt for GCC 5 C++11 ABI change --- alsa-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index ff30cb6..22cecd3 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -25,7 +25,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.0.29 -Release: 2%{?dist} +Release: 3%{?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 @@ -281,6 +281,9 @@ install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d %endif %changelog +* Sat May 02 2015 Kalev Lember - 1.0.29-3 +- Rebuilt for GCC 5 C++11 ABI change + * Thu Mar 26 2015 Richard Hughes - 1.0.29-2 - Add an AppData file for the software center From a7c1a2eed7dd5f9c2973fe1299f5adac2111d599 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 16 Jun 2015 23:49:12 +0000 Subject: [PATCH 45/98] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- alsa-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index 22cecd3..d858a7d 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -25,7 +25,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.0.29 -Release: 3%{?dist} +Release: 4%{?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 @@ -281,6 +281,9 @@ install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d %endif %changelog +* Tue Jun 16 2015 Fedora Release Engineering - 1.0.29-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat May 02 2015 Kalev Lember - 1.0.29-3 - Rebuilt for GCC 5 C++11 ABI change From 2bb202ee6df3ce585761c972fb97248e02ad3b50 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Fri, 18 Sep 2015 11:58:46 +0100 Subject: [PATCH 46/98] Remove no longer required AppData files --- alsa-tools.spec | 53 ++++--------------------------------------------- 1 file changed, 4 insertions(+), 49 deletions(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index d858a7d..cba8992 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -25,7 +25,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.0.29 -Release: 4%{?dist} +Release: 5%{?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 @@ -163,53 +163,6 @@ do fi done -# Merge applications into one software center item -mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata -cat > $RPM_BUILD_ROOT%{_datadir}/appdata/echomixer.appdata.xml < - - - CC0-1.0 - echomixer.desktop - - hwmixvolume.desktop - - -EOF -cat > $RPM_BUILD_ROOT%{_datadir}/appdata/envy24control.appdata.xml < - - - CC0-1.0 - envy24control.desktop - - hwmixvolume.desktop - - -EOF -cat > $RPM_BUILD_ROOT%{_datadir}/appdata/hdspconf.appdata.xml < - - - CC0-1.0 - hdspconf.desktop - - hwmixvolume.desktop - - -EOF -cat > $RPM_BUILD_ROOT%{_datadir}/appdata/hdspmixer.appdata.xml < - - - CC0-1.0 - hdspmixer.desktop - - hwmixvolume.desktop - - -EOF - # convert hotplug stuff to udev rm -f %{buildroot}/lib/udev/tascam_fw.usermap mkdir -p %{buildroot}/lib/udev/rules.d @@ -240,7 +193,6 @@ install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d %{_bindir}/us428control %{_bindir}/hda-verb %{_bindir}/hdajackretask -%{_datadir}/appdata/*.appdata.xml %{_datadir}/applications/echomixer.desktop %{_datadir}/applications/envy24control.desktop %{_datadir}/applications/hdspconf.desktop @@ -281,6 +233,9 @@ install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d %endif %changelog +* Fri Sep 18 2015 Richard Hughes - 1.0.29-5 +- Remove no longer required AppData files + * Tue Jun 16 2015 Fedora Release Engineering - 1.0.29-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 184fdf9185d118a750ec0deed62b0009e3655ffe Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 27 Oct 2015 18:41:17 +0100 Subject: [PATCH 47/98] updated to v1.1.0 --- alsa-tools.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index cba8992..a885557 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -9,9 +9,9 @@ %ifarch ppc ppc64 # sb16_csp doesn't build on PPC; see bug #219010 -%{?!_without_tools: %global builddirstools as10k1 echomixer envy24control hdspconf hdspmixer hwmixvolume rmedigicontrol sbiload sscape_ctl us428control hda-verb hdajackretask } +%{?!_without_tools: %global builddirstools as10k1 echomixer envy24control hdspconf hdspmixer hwmixvolume rmedigicontrol sbiload sscape_ctl us428control hda-verb hdajackretask hdajacksensetest } %else -%{?!_without_tools: %global builddirstools as10k1 echomixer envy24control hdspconf hdspmixer hwmixvolume rmedigicontrol sbiload sb16_csp sscape_ctl us428control hda-verb hdajackretask } +%{?!_without_tools: %global builddirstools as10k1 echomixer envy24control hdspconf hdspmixer hwmixvolume rmedigicontrol sbiload sb16_csp sscape_ctl us428control hda-verb hdajackretask hdajacksensetest } %endif %{?!_without_firmware: %global builddirsfirmw hdsploader mixartloader usx2yloader vxloader } @@ -24,8 +24,8 @@ Summary: Specialist tools for ALSA Name: alsa-tools -Version: 1.0.29 -Release: 5%{?dist} +Version: 1.1.0 +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 @@ -79,6 +79,7 @@ certain sound cards. * us428control - Control tool for Tascam 428 * hda-verb - Direct HDA codec access * hdajackretask - Reassign the I/O jacks on the HDA hardware +* hdajacksensetest - The sense test for the I/O jacks on the HDA hardware %package firmware @@ -193,6 +194,7 @@ install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d %{_bindir}/us428control %{_bindir}/hda-verb %{_bindir}/hdajackretask +%{_bindir}/hdajacksensetest %{_datadir}/applications/echomixer.desktop %{_datadir}/applications/envy24control.desktop %{_datadir}/applications/hdspconf.desktop @@ -233,6 +235,9 @@ install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d %endif %changelog +* Tue Oct 27 2015 Jaroslav Kysela - 1.1.0-1 +- Updated to 1.1.0 + * Fri Sep 18 2015 Richard Hughes - 1.0.29-5 - Remove no longer required AppData files From e210104ef67328767ede77d5e81a2a418f4aa7e5 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 27 Oct 2015 18:44:11 +0100 Subject: [PATCH 48/98] updated sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 0428ad2..fe9653a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f339a3cd24f748c9d007bdff0e98775b alsa-tools-1.0.29.tar.bz2 +b476a5afaa3ea3230855553ad59d259d alsa-tools-1.1.0.tar.bz2 From abdf18546ee6946e2ea83e56d81eabea9b2270f2 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 16:07:30 +0000 Subject: [PATCH 49/98] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- alsa-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index a885557..b41fe5d 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -25,7 +25,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.1.0 -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 @@ -235,6 +235,9 @@ install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d %endif %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 1.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Tue Oct 27 2015 Jaroslav Kysela - 1.1.0-1 - Updated to 1.1.0 From 4118a71839f4f3544bba706a2cdcf39a3c22b981 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 15 Mar 2016 23:33:01 -0500 Subject: [PATCH 50/98] Fix FTBFS with GCC 6 (#1307312) --- alsa-tools.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index b41fe5d..d00b739 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -25,7 +25,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.1.0 -Release: 2%{?dist} +Release: 3%{?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 @@ -104,6 +104,9 @@ The following tools are available: %setup -q -n %{name}-%{version} %build +# Fix narrowing conversions on ARM (#1307312) +CFLAGS="%{optflags} -fsigned-char" +CXXFLAGS="%{optflags} -fsigned-char" mv seq/sbiload . ; rm -rf seq for i in %{?builddirstools:%builddirstools} %{?builddirsfirmw:%builddirsfirmw} do @@ -235,6 +238,9 @@ install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d %endif %changelog +* Wed Mar 16 2016 Yaakov Selkowitz - 1.1.0-3 +- Fix FTBFS with GCC 6 (#1307312) + * Wed Feb 03 2016 Fedora Release Engineering - 1.1.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 6674912cd8308c4e67836aad68c0bd4d94eeb881 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Wed, 21 Dec 2016 09:06:09 +0100 Subject: [PATCH 51/98] updated to v1.1.3 --- alsa-tools.spec | 10 +++++----- sources | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index d00b739..6ac63cb 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -24,8 +24,8 @@ Summary: Specialist tools for ALSA Name: alsa-tools -Version: 1.1.0 -Release: 3%{?dist} +Version: 1.1.3 +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 @@ -104,9 +104,6 @@ The following tools are available: %setup -q -n %{name}-%{version} %build -# Fix narrowing conversions on ARM (#1307312) -CFLAGS="%{optflags} -fsigned-char" -CXXFLAGS="%{optflags} -fsigned-char" mv seq/sbiload . ; rm -rf seq for i in %{?builddirstools:%builddirstools} %{?builddirsfirmw:%builddirsfirmw} do @@ -238,6 +235,9 @@ install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d %endif %changelog +* Wed Sep 21 2016 Jaroslav Kysela - 1.1.3-1 +- Updated to 1.1.3 + * Wed Mar 16 2016 Yaakov Selkowitz - 1.1.0-3 - Fix FTBFS with GCC 6 (#1307312) diff --git a/sources b/sources index fe9653a..38617c1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b476a5afaa3ea3230855553ad59d259d alsa-tools-1.1.0.tar.bz2 +MD5 (alsa-tools-1.1.3.tar.bz2) = b23eaae687d55410b92587c2053b301f From 84603d5264abda71cd654ab097c54145e2701f66 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 05:54:09 +0000 Subject: [PATCH 52/98] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- alsa-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index 6ac63cb..bd9322c 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -25,7 +25,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.1.3 -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 @@ -235,6 +235,9 @@ install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d %endif %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 1.1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Wed Sep 21 2016 Jaroslav Kysela - 1.1.3-1 - Updated to 1.1.3 From 6633a9533894ab5194559acff273ad439e003be3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 02:47:14 +0000 Subject: [PATCH 53/98] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- alsa-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index bd9322c..054ed32 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -25,7 +25,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.1.3 -Release: 2%{?dist} +Release: 3%{?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 @@ -235,6 +235,9 @@ install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d %endif %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 1.1.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 1.1.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 0fde9527343994cb464000359e3c24ae0f43f331 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 17:31:33 +0000 Subject: [PATCH 54/98] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- alsa-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index 054ed32..cfd0249 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -25,7 +25,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.1.3 -Release: 3%{?dist} +Release: 4%{?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 @@ -235,6 +235,9 @@ install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d %endif %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 1.1.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 1.1.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 481091cdee10b44a99865f324fa7283c0d3ab4d4 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 14 Nov 2017 10:07:07 +0100 Subject: [PATCH 55/98] updated to 1.1.5 --- alsa-tools.spec | 13 ++++++++----- sources | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index cfd0249..0e2a197 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -3,8 +3,8 @@ # (see alsa-firmware), it is some complementary tools. # Do *NOT* set it to zero or have a commented out define here, or it will not # work. (RPM spec file voodoo) -%if 0%{?rhel} -%global _without_tools 1 +%if 0%{?rhel} +%global _without_tools 1 %endif %ifarch ppc ppc64 @@ -24,15 +24,15 @@ Summary: Specialist tools for ALSA Name: alsa-tools -Version: 1.1.3 -Release: 4%{?dist} +Version: 1.1.5 +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 License: GPLv2+ Group: Applications/Multimedia URL: http://www.alsa-project.org/ -Source: ftp://ftp.alsa-project.org/pub/tools/%{name}-%{version}.tar.bz2 +Source: ftp://ftp.alsa-project.org/pub/tools/%{name}-%{version}.tar.bz2 # The icons below were created by Tim Jackson from screenshots of the # apps in question. They suck, a lot. Better alternatives welcome! @@ -235,6 +235,9 @@ install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d %endif %changelog +* Tue Nov 14 2017 Jaroslav Kysela - 1.1.5-1 +- Updated to 1.1.5 + * Wed Aug 02 2017 Fedora Release Engineering - 1.1.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index 38617c1..d14dc6b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -MD5 (alsa-tools-1.1.3.tar.bz2) = b23eaae687d55410b92587c2053b301f +SHA512 (alsa-tools-1.1.5.tar.bz2) = 42463540def2260bda0fdb0b08a665ef336deb817920605ce8f77b4904595eadc7d4774d799385bb2271026e26976cc733a776b228814d2c7d7651c46a45098d From e25a843eddf42dd6f1a85e998993ca53d12e839a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 02:09:33 +0000 Subject: [PATCH 56/98] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alsa-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index 0e2a197..f9c2420 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -25,7 +25,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.1.5 -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 @@ -235,6 +235,9 @@ install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d %endif %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 1.1.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Tue Nov 14 2017 Jaroslav Kysela - 1.1.5-1 - Updated to 1.1.5 From 9b88e7c03acbbd42c3f2e948935866d2ee2eaca0 Mon Sep 17 00:00:00 2001 From: Tim Jackson Date: Thu, 22 Feb 2018 22:47:27 +0100 Subject: [PATCH 57/98] Fix missing BuildRequire on gcc/gcc-c++ --- alsa-tools.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index f9c2420..523f181 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -25,7 +25,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.1.5 -Release: 2%{?dist} +Release: 3%{?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 @@ Source6: hwmixvolume.png Source7: hwmixvolume.desktop Source9: hdajackretask.desktop +BuildRequires: gcc gcc-c++ BuildRequires: alsa-lib-devel >= %{version} %if 0%{!?_without_tools:1} BuildRequires: gtk+-devel @@ -235,6 +236,9 @@ install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d %endif %changelog +* Thu Feb 22 2018 Tim Jackson - 1.1.5-3 +- Add missing BuildRequire on gcc + * Wed Feb 07 2018 Fedora Release Engineering - 1.1.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 713cb1fc5562b2947ac840ac9c401c5b93d98d18 Mon Sep 17 00:00:00 2001 From: Iryna Shcherbina Date: Wed, 28 Feb 2018 23:42:28 +0100 Subject: [PATCH 58/98] Update Python 2 dependency declarations to new packaging standards --- alsa-tools.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index 523f181..772c5d4 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -25,7 +25,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.1.5 -Release: 3%{?dist} +Release: 4%{?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 @@ -57,7 +57,7 @@ BuildRequires: fltk-devel Buildrequires: desktop-file-utils Requires: xorg-x11-fonts-misc # Needed for hwmixvolume -Requires: python-alsa +Requires: python2-alsa %endif %description @@ -236,6 +236,10 @@ install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d %endif %changelog +* Wed Feb 28 2018 Iryna Shcherbina - 1.1.5-4 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + * Thu Feb 22 2018 Tim Jackson - 1.1.5-3 - Add missing BuildRequire on gcc From f877b0cd26639640816db23136a0e7360d7323fc Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 3 Apr 2018 11:25:12 +0200 Subject: [PATCH 59/98] updated to 1.1.6 --- alsa-tools.spec | 71 +++++++++++++++--------------------------- echomixer.desktop | 11 ------- echomixer.png | Bin 841 -> 0 bytes envy24control.desktop | 11 ------- envy24control.png | Bin 945 -> 0 bytes hdajackretask.desktop | 10 ------ hwmixvolume.desktop | 11 ------- hwmixvolume.png | Bin 1599 -> 0 bytes sources | 2 +- 9 files changed, 26 insertions(+), 90 deletions(-) delete mode 100644 echomixer.desktop delete mode 100644 echomixer.png delete mode 100644 envy24control.desktop delete mode 100644 envy24control.png delete mode 100644 hdajackretask.desktop delete mode 100644 hwmixvolume.desktop delete mode 100644 hwmixvolume.png diff --git a/alsa-tools.spec b/alsa-tools.spec index 772c5d4..b327b78 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -24,8 +24,8 @@ Summary: Specialist tools for ALSA Name: alsa-tools -Version: 1.1.5 -Release: 4%{?dist} +Version: 1.1.6 +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 @@ -34,18 +34,7 @@ Group: Applications/Multimedia URL: http://www.alsa-project.org/ Source: ftp://ftp.alsa-project.org/pub/tools/%{name}-%{version}.tar.bz2 -# The icons below were created by Tim Jackson from screenshots of the -# apps in question. They suck, a lot. Better alternatives welcome! -Source1: envy24control.desktop -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 -Source9: hdajackretask.desktop +Source1: 90-alsa-tools-firmware.rules BuildRequires: gcc gcc-c++ BuildRequires: alsa-lib-devel >= %{version} @@ -113,35 +102,18 @@ do cd .. done - %install mkdir -p %{buildroot}%{_datadir}/{pixmaps,applications} for i in %{?builddirstools:%builddirstools} %{?builddirsfirmw:%builddirsfirmw} do case $i in - echomixer) - (cd $i ; %make_install ; install -m 644 %{SOURCE4} %{buildroot}%{_datadir}/pixmaps/ ; install -m 644 %{SOURCE3} %{buildroot}%{_datadir}/applications/ ) || exit 1 - ;; - envy24control) - (cd $i ; %make_install ; install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/ ; install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/applications/ ) || exit 1 - ;; - hdspconf) - (cd $i ; %make_install ) || exit 1 - ;; - hdspmixer) - (cd $i ; %make_install ) || exit 1 - ;; - hwmixvolume) - (cd $i ; %make_install ; install -m 644 %{SOURCE6} %{buildroot}%{_datadir}/pixmaps/ ; install -m 644 %{SOURCE7} %{buildroot}%{_datadir}/applications/ ) || exit 1 - ;; usx2yloader) (cd $i ; %make_install hotplugdir=/lib/udev) || exit 1 ;; - hdajackretask) - (cd $i ; %make_install ; install -m 644 %{SOURCE9} %{buildroot}%{_datadir}/applications/ ) || exit 1 + *) + (cd $i ; %make_install) || exit 1 ;; - *) (cd $i ; %make_install) || exit 1 esac if [[ -s "${i}"/README ]] then @@ -160,6 +132,7 @@ do cp "${i}"/COPYING "%{buildroot}%{_pkgdocdir}/${i}" fi if [[ -s %{buildroot}%{_datadir}/applications/${i}.desktop ]] ; then + desktop-file-validate %{buildroot}%{_datadir}/applications/${i}.desktop desktop-file-install --dir %{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/${i}.desktop fi @@ -168,7 +141,19 @@ done # convert hotplug stuff to udev rm -f %{buildroot}/lib/udev/tascam_fw.usermap mkdir -p %{buildroot}/lib/udev/rules.d -install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d +install -m 644 %{SOURCE1} %{buildroot}/lib/udev/rules.d + +%post +touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : + +%postun +if [ $1 -eq 0 ] ; then + touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : + gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +fi + +%posttrans +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %if 0%{!?_without_tools:1} %files @@ -196,19 +181,10 @@ install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d %{_bindir}/hda-verb %{_bindir}/hdajackretask %{_bindir}/hdajacksensetest -%{_datadir}/applications/echomixer.desktop -%{_datadir}/applications/envy24control.desktop -%{_datadir}/applications/hdspconf.desktop -%{_datadir}/applications/hdspmixer.desktop -%{_datadir}/applications/hwmixvolume.desktop -%{_datadir}/applications/hdajackretask.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/* +%{_datadir}/man/man1/envy24control.1.gz +%{_datadir}/applications/*.desktop +%{_datadir}/icons/hicolor/*/apps* # sb16_csp stuff which is excluded for PPCx %ifnarch ppc ppc64 @@ -236,6 +212,9 @@ install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d %endif %changelog +* Tue Apr 03 2018 Jaroslav Kysela - 1.1.6-1 +- Updated to 1.1.6 + * Wed Feb 28 2018 Iryna Shcherbina - 1.1.5-4 - Update Python 2 dependency declarations to new packaging standards (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) diff --git a/echomixer.desktop b/echomixer.desktop deleted file mode 100644 index ee77e00..0000000 --- a/echomixer.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[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 -Terminal=false -Type=Application -Categories=Application;AudioVideo; -Version=0.9.4 diff --git a/echomixer.png b/echomixer.png deleted file mode 100644 index 48c4b92a7ba27f9b9d5d43197a6ad4791adab1b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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$*^>{ diff --git a/envy24control.desktop b/envy24control.desktop deleted file mode 100644 index ef814c0..0000000 --- a/envy24control.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[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 -Terminal=false -Type=Application -Categories=Application;AudioVideo; -Version=0.9.4 diff --git a/envy24control.png b/envy24control.png deleted file mode 100644 index 73c47d67a25ee245181731883e709d0f7f5f4c15..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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$yPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L00Nr;00Nr1J5Y>XRL#01?Si7_G3M0dFIu@MYuAfP;?6fLPRKxyeP)47kiuXB%!Dbsm& z2Bw|1iGMPid;fFp|DFGF{_~w-P(hA=bNpq)v_5k^zdr~98H*$=%i5yAUsRRwr~5zL z|8pfBru4yg$G?4X{9f`WLWqPVA{@s#@yA;Cyu1Is-%8){r4P~>{a~T-E20`AN*FxL zASlN>@4|p0pnz^=kxXYmDFq=!N@w(g0BQs9N$?B+2t0?LjyT2>H*k663LM*R+KLN; zfVNeuu)cRK#_mkQaoxOKbpY^N0idU275+Rkglsn3^pNp954RHuOpK3X+l~QTyKy^j zS4{u_&=S!war;)0@v5eQ0sy7C-$ErW$HCBbP)gzZKK{8njCgks?xm+uH-Lx|!tk{# zxtL@aw6wG!olb);py7q0MIx{a10)DAIWd7X>o!yeTrmbY7WPccYnp~sD%CXO0YJ}W z5DJH99|WYTZbc6;3{#L3#e?N=7(B~@5K=Wi1VMl(ieMN9re%Q!K}9`DmLc#wD5Wq> zv*;b2v4c`tWKUflD4uC{!;+IpWVAa^*E)Eal(#S~7`F=lp7GsITBLmeB}tJ+H|iED`sdudmpTH?T2-T(y3 zFK+-cnsQnsW!;h>v+NT&sKuI3S7Et2UrDDpWFVlEzl=#Yvp zdOt^0iDLcrUhq7RxYCX%&U6>)-JgCAZ@vExHf{uZ*S(GF|K_^QeS6xmuIGov1Her% zNF5%Bt7PDQ??8=(F|d1US*z^%QS8{s!m%lAXSP)~v+B~wfx6ogtMSum-5zKU0`yHy zVOrOrc6DL9uEUGPaG`;ZXYD2?@dt{66^9Rl9yx+HPMiP|2~b(a-2(@3w?bc3kBCAO z0fg7A0i&uw!4Z?OZ7761dg~EhjD28U2rdG{pa_K+hypDruXN!&Fxw|I-X^S!oyXBH zpGI4|ipRS~ps7*BS|qH0a;OOagvJAx!F~AFQH=g&;^wWdv3qb3Tl)LU%I(60ki2MY zdt(5C2S>;f0EAs!UZCy}`t|Bn3>-TKeQXSWcXgpN9*5rDjhjtm>>2_v6bj+e=qT=3 z7QRX(@X_EPR>$KA3}gAxD$AZ1`X9hz9%wX0L1#P;O;P65>xjp(G8U^jUw20bR=2e+ z9Dq`4oMlR0ORX^ax~T9Rdm zf&fAYteM4;Wf>%(4+kKb&S1l)O*nn>WUhmD9KdnFa$J!I=38vrF1wHJ+q@a$$yEIS zc#conj?+4s*75AN?YMCMTs{_qIz2ES!Y~Y;>hFi;Q`n9RS(1`<0$~3D@KP#cz;-2U zef|abo(Ioy=1R$V6AA{RC_oS;Or$c%Os5L%stuqeq8-XQ?oL98l(ij Date: Thu, 12 Jul 2018 20:09:43 +0000 Subject: [PATCH 60/98] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alsa-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index b327b78..6a3826f 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -25,7 +25,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.1.6 -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 @@ -212,6 +212,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 1.1.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Tue Apr 03 2018 Jaroslav Kysela - 1.1.6-1 - Updated to 1.1.6 From 340eb3713edbb85ce212f5b3c97965bd889128d9 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 16 Oct 2018 12:31:42 +0200 Subject: [PATCH 61/98] updated to 1.1.7 --- alsa-tools.spec | 7 +++++-- sources | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index 6a3826f..04d1925 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -24,8 +24,8 @@ Summary: Specialist tools for ALSA Name: alsa-tools -Version: 1.1.6 -Release: 2%{?dist} +Version: 1.1.7 +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 @@ -212,6 +212,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Tue Oct 16 2018 Jaroslav Kysela - 1.1.7-1 +- Updated to 1.1.7 + * Thu Jul 12 2018 Fedora Release Engineering - 1.1.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 25a86ea..b574fe2 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (alsa-tools-1.1.6.tar.bz2) = 33617ec6726ca11f66849c893a8dd9bf9faa8832374788819d9280159ac358c83443331faac24881df593cfd0b24b22769a41cbcb0af3c1fd781baab0c802d17 +SHA512 (alsa-tools-1.1.7.tar.bz2) = d715fa5b909fb33ffce252b4ae9f027dc7c1a509253d52bda6ecbc5e0a38e7d30ab8486b14114b226424217812a0edf66e7ec11f7674e44c77a14e4dfb16889c From 9acb3d9616a45b16be3b9a1cdf92887d113d26c3 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 16 Oct 2018 12:42:13 +0200 Subject: [PATCH 62/98] fix the hwmixvolume python3 interpreter selection --- alsa-tools.spec | 3 +++ hwmixvolume-python.patch | 8 ++++++++ 2 files changed, 11 insertions(+) create mode 100644 hwmixvolume-python.patch diff --git a/alsa-tools.spec b/alsa-tools.spec index 04d1925..902b448 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -36,6 +36,8 @@ Source: ftp://ftp.alsa-project.org/pub/tools/%{name}-%{version}.tar.bz2 Source1: 90-alsa-tools-firmware.rules +Patch1: hwmixvolume-python.patch + BuildRequires: gcc gcc-c++ BuildRequires: alsa-lib-devel >= %{version} %if 0%{!?_without_tools:1} @@ -92,6 +94,7 @@ The following tools are available: %prep %setup -q -n %{name}-%{version} +%patch1 -p1 -b .hwmixvolume-python %build mv seq/sbiload . ; rm -rf seq diff --git a/hwmixvolume-python.patch b/hwmixvolume-python.patch new file mode 100644 index 0000000..6cbb12f --- /dev/null +++ b/hwmixvolume-python.patch @@ -0,0 +1,8 @@ +--- alsa-tools-1.1.7/hwmixvolume/hwmixvolume~ 2018-10-16 10:08:36.000000000 +0200 ++++ alsa-tools-1.1.7/hwmixvolume/hwmixvolume 2018-10-16 12:39:39.639476411 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + + # hwmixvolume - ALSA hardware mixer volume control applet + # Copyright (c) 2009-2010 Clemens Ladisch From 3f6ddb74084e65c29e648dc35792e6f71869b389 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sun, 9 Dec 2018 09:53:21 +0000 Subject: [PATCH 63/98] Switch python2-alsa dependency to python3-alsa as hwmixvolume runs on Python 3 --- alsa-tools.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index 902b448..b18190d 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -25,7 +25,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.1.7 -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 @@ -48,7 +48,7 @@ BuildRequires: fltk-devel Buildrequires: desktop-file-utils Requires: xorg-x11-fonts-misc # Needed for hwmixvolume -Requires: python2-alsa +Requires: python3-alsa %endif %description @@ -215,6 +215,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Sun Dec 09 2018 Miro Hrončok - 1.1.7-2 +- Switch python2-alsa dependency to python3-alsa as hwmixvolume runs on Python 3 + * Tue Oct 16 2018 Jaroslav Kysela - 1.1.7-1 - Updated to 1.1.7 From 6b5ac142348648b947c308dd70d2b2093a74c35a Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 27 Jan 2019 12:45:24 +0100 Subject: [PATCH 64/98] Remove obsolete scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- alsa-tools.spec | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index b18190d..d617ed6 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -146,18 +146,6 @@ rm -f %{buildroot}/lib/udev/tascam_fw.usermap mkdir -p %{buildroot}/lib/udev/rules.d install -m 644 %{SOURCE1} %{buildroot}/lib/udev/rules.d -%post -touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - -%postun -if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi - -%posttrans -gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - %if 0%{!?_without_tools:1} %files %dir %{_pkgdocdir} From 17c72b896221b70a70f76de1f4eb39ac0af73bad Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:38 +0100 Subject: [PATCH 65/98] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- alsa-tools.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index d617ed6..fdfc654 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -30,7 +30,6 @@ 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 License: GPLv2+ -Group: Applications/Multimedia URL: http://www.alsa-project.org/ Source: ftp://ftp.alsa-project.org/pub/tools/%{name}-%{version}.tar.bz2 @@ -76,7 +75,6 @@ certain sound cards. %package firmware Summary: ALSA tools for uploading firmware to some soundcards -Group: Applications/System Requires: udev Requires: alsa-firmware Requires: fxload From 9e3ee430aa8f5e8c2444771b962f7f3051823375 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 13:13:16 +0000 Subject: [PATCH 66/98] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alsa-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index fdfc654..a3c6d10 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -25,7 +25,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.1.7 -Release: 2%{?dist} +Release: 3%{?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 @@ -201,6 +201,9 @@ install -m 644 %{SOURCE1} %{buildroot}/lib/udev/rules.d %endif %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 1.1.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sun Dec 09 2018 Miro Hrončok - 1.1.7-2 - Switch python2-alsa dependency to python3-alsa as hwmixvolume runs on Python 3 From 84b316fdf7d3e6f394f219f461642be1bb367a39 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 17:47:58 +0000 Subject: [PATCH 67/98] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alsa-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index a3c6d10..f6a3569 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -25,7 +25,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.1.7 -Release: 3%{?dist} +Release: 4%{?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 @@ -201,6 +201,9 @@ install -m 644 %{SOURCE1} %{buildroot}/lib/udev/rules.d %endif %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 1.1.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 1.1.7-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 18379d9b448566a0ac8172c8d60fc9b41a0c64f4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 11:27:53 +0000 Subject: [PATCH 68/98] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alsa-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index f6a3569..3b951d4 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -25,7 +25,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.1.7 -Release: 4%{?dist} +Release: 5%{?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 @@ -201,6 +201,9 @@ install -m 644 %{SOURCE1} %{buildroot}/lib/udev/rules.d %endif %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 1.1.7-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Jul 24 2019 Fedora Release Engineering - 1.1.7-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 596c5f076f3188cf9466387cb63b0b1e100deb4c Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Wed, 19 Feb 2020 13:35:05 +0100 Subject: [PATCH 69/98] updated to 1.2.2 --- alsa-tools.spec | 7 +++++-- sources | 3 +-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index 3b951d4..ec448f6 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -24,8 +24,8 @@ Summary: Specialist tools for ALSA Name: alsa-tools -Version: 1.1.7 -Release: 5%{?dist} +Version: 1.2.2 +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 @@ -201,6 +201,9 @@ install -m 644 %{SOURCE1} %{buildroot}/lib/udev/rules.d %endif %changelog +* Wed Feb 19 2020 Jaroslav Kysela - 1.2.2-1 +- Updated to 1.2.2 + * Tue Jan 28 2020 Fedora Release Engineering - 1.1.7-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index b574fe2..06879a8 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (alsa-tools-1.1.6.tar.bz2) = 33617ec6726ca11f66849c893a8dd9bf9faa8832374788819d9280159ac358c83443331faac24881df593cfd0b24b22769a41cbcb0af3c1fd781baab0c802d17 -SHA512 (alsa-tools-1.1.7.tar.bz2) = d715fa5b909fb33ffce252b4ae9f027dc7c1a509253d52bda6ecbc5e0a38e7d30ab8486b14114b226424217812a0edf66e7ec11f7674e44c77a14e4dfb16889c +SHA512 (alsa-tools-1.2.2.tar.bz2) = 935d46ee3cc843566ccea183bcf7ea36439a4a6aa22964ebf6fd2722b78ec634d3be4e6a30b04c608abe6c5a132dd633f8343fff19f9d90a756d6699fc849a16 From 6b570a5822008c33be14b3c3e4d5107b328284d1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 11:57:44 +0000 Subject: [PATCH 70/98] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alsa-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index ec448f6..f235b43 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -25,7 +25,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.2.2 -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 @@ -201,6 +201,9 @@ install -m 644 %{SOURCE1} %{buildroot}/lib/udev/rules.d %endif %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 1.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Feb 19 2020 Jaroslav Kysela - 1.2.2-1 - Updated to 1.2.2 From 485e1c3bc78a475fe0281923919f67e6d106ba03 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jul 2020 23:56:01 +0000 Subject: [PATCH 71/98] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alsa-tools.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index f235b43..4b57c8c 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -25,7 +25,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.2.2 -Release: 2%{?dist} +Release: 3%{?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 @@ -201,6 +201,10 @@ install -m 644 %{SOURCE1} %{buildroot}/lib/udev/rules.d %endif %changelog +* Fri Jul 31 2020 Fedora Release Engineering - 1.2.2-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 1.2.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 2273b4947ede7e23f540aaca436041428074fb4e Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Wed, 16 Dec 2020 23:24:57 +0000 Subject: [PATCH 72/98] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- alsa-tools.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/alsa-tools.spec b/alsa-tools.spec index 4b57c8c..8a5ddbd 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -44,6 +44,7 @@ BuildRequires: gtk+-devel BuildRequires: gtk2-devel BuildRequires: gtk3-devel BuildRequires: fltk-devel +BuildRequires: make Buildrequires: desktop-file-utils Requires: xorg-x11-fonts-misc # Needed for hwmixvolume From 99acdc3deb36fa9d509d8ae88fb40f8704cbe844 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 00:01:00 +0000 Subject: [PATCH 73/98] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alsa-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index 8a5ddbd..bf79f0c 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -25,7 +25,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.2.2 -Release: 3%{?dist} +Release: 4%{?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 @@ -202,6 +202,9 @@ install -m 644 %{SOURCE1} %{buildroot}/lib/udev/rules.d %endif %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.2.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Fri Jul 31 2020 Fedora Release Engineering - 1.2.2-3 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 45141e198910ef683168cc79b4cb0edfdf403d04 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Sun, 30 May 2021 19:50:05 +0200 Subject: [PATCH 74/98] updated to 1.2.5 --- alsa-tools.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index bf79f0c..880cdae 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -24,8 +24,8 @@ Summary: Specialist tools for ALSA Name: alsa-tools -Version: 1.2.2 -Release: 4%{?dist} +Version: 1.2.5 +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 @@ -202,6 +202,9 @@ install -m 644 %{SOURCE1} %{buildroot}/lib/udev/rules.d %endif %changelog +* Sun May 30 2021 Jaroslav Kysela - 1.2.5-1 +- Updated to 1.2.5 + * Tue Jan 26 2021 Fedora Release Engineering - 1.2.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 06879a8..4e163bc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (alsa-tools-1.2.2.tar.bz2) = 935d46ee3cc843566ccea183bcf7ea36439a4a6aa22964ebf6fd2722b78ec634d3be4e6a30b04c608abe6c5a132dd633f8343fff19f9d90a756d6699fc849a16 +SHA512 (alsa-tools-1.2.5.tar.bz2) = 1c4ff947d9f2424056a6748e04a1250fb73443a3f470f61d0b563c91be082bc42d56e550d6cc27eaed3edcea2066a107e20455c959b053b5deafa2d811b7e498 From 1b2fc79f4e6c604af6d1f41780fd58b0d71ff79a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 12:33:13 +0000 Subject: [PATCH 75/98] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From b78d4f7aa2267ed870df4e57e1c97eb611b55768 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 17:28:37 +0000 Subject: [PATCH 76/98] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alsa-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index 880cdae..b9154ab 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -25,7 +25,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.2.5 -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 @@ -202,6 +202,9 @@ install -m 644 %{SOURCE1} %{buildroot}/lib/udev/rules.d %endif %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 1.2.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Sun May 30 2021 Jaroslav Kysela - 1.2.5-1 - Updated to 1.2.5 From e0120caa71e735923dcc7b30a432d9b6efed7722 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 21:09:41 +0000 Subject: [PATCH 77/98] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alsa-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index b9154ab..3ab8852 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -25,7 +25,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.2.5 -Release: 2%{?dist} +Release: 3%{?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 @@ -202,6 +202,9 @@ install -m 644 %{SOURCE1} %{buildroot}/lib/udev/rules.d %endif %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 1.2.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 1.2.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From dc1d10d5986655e75c5465491388bf8bbc0c02af Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Tue, 8 Mar 2022 12:36:50 +0000 Subject: [PATCH 78/98] Remove unused gtk+-devel --- alsa-tools.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index 3ab8852..781e22e 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -25,7 +25,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.2.5 -Release: 3%{?dist} +Release: 4%{?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 @@ -40,7 +40,6 @@ Patch1: hwmixvolume-python.patch BuildRequires: gcc gcc-c++ BuildRequires: alsa-lib-devel >= %{version} %if 0%{!?_without_tools:1} -BuildRequires: gtk+-devel BuildRequires: gtk2-devel BuildRequires: gtk3-devel BuildRequires: fltk-devel @@ -202,6 +201,9 @@ install -m 644 %{SOURCE1} %{buildroot}/lib/udev/rules.d %endif %changelog +* Tue Mar 08 2022 Leigh Scott - 1.2.5-4 +- Remove unused gtk+-devel + * Wed Jan 19 2022 Fedora Release Engineering - 1.2.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 885b748c473dafbf334cf24041801f2e26ce3742 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 20:41:24 +0000 Subject: [PATCH 79/98] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alsa-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index 781e22e..443f290 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -25,7 +25,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.2.5 -Release: 4%{?dist} +Release: 5%{?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 @@ -201,6 +201,9 @@ install -m 644 %{SOURCE1} %{buildroot}/lib/udev/rules.d %endif %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 1.2.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Tue Mar 08 2022 Leigh Scott - 1.2.5-4 - Remove unused gtk+-devel From 6ad29dcd503842206ebb06689c1e24c444e48982 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:38:05 +0000 Subject: [PATCH 80/98] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alsa-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index 443f290..25d9938 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -25,7 +25,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.2.5 -Release: 5%{?dist} +Release: 6%{?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 @@ -201,6 +201,9 @@ install -m 644 %{SOURCE1} %{buildroot}/lib/udev/rules.d %endif %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 1.2.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jul 20 2022 Fedora Release Engineering - 1.2.5-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 39025e14ef0e52a86af52539cd863dd520edb733 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 6 Jun 2023 20:41:59 +0200 Subject: [PATCH 81/98] SPDX license --- alsa-tools.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index 25d9938..5af0b35 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -25,11 +25,11 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.2.5 -Release: 6%{?dist} +Release: 8%{?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 -License: GPLv2+ +License: GPL-2.0-or-later URL: http://www.alsa-project.org/ Source: ftp://ftp.alsa-project.org/pub/tools/%{name}-%{version}.tar.bz2 @@ -201,6 +201,9 @@ install -m 644 %{SOURCE1} %{buildroot}/lib/udev/rules.d %endif %changelog +* Tue Jun 6 2023 Jaroslav Kysela - 1.2.5-8 +- SPDX license + * Wed Jan 18 2023 Fedora Release Engineering - 1.2.5-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 0abdf21640eac162e5da0693ea612a1ff58b963f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 13:10:04 +0000 Subject: [PATCH 82/98] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alsa-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index 5af0b35..220551f 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -25,7 +25,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.2.5 -Release: 8%{?dist} +Release: 9%{?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 @@ -201,6 +201,9 @@ install -m 644 %{SOURCE1} %{buildroot}/lib/udev/rules.d %endif %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 1.2.5-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jun 6 2023 Jaroslav Kysela - 1.2.5-8 - SPDX license From 4e028d85fc4bfa6fccd43f269e2497235b29c775 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 9 Jan 2024 18:01:04 +0100 Subject: [PATCH 83/98] Fix C type errors using G_CALLBACK Related to: --- alsa-tools-c99.patch | 132 +++++++++++++++++++++++++++++++++++++++++++ alsa-tools.spec | 7 ++- 2 files changed, 138 insertions(+), 1 deletion(-) create mode 100644 alsa-tools-c99.patch diff --git a/alsa-tools-c99.patch b/alsa-tools-c99.patch new file mode 100644 index 0000000..ef07ed0 --- /dev/null +++ b/alsa-tools-c99.patch @@ -0,0 +1,132 @@ +Submitted upstream: + +diff --git a/echomixer/echomixer.c b/echomixer/echomixer.c +index 4946a5ddd5de6790..80124baefa6608f3 100644 +--- a/echomixer/echomixer.c ++++ b/echomixer/echomixer.c +@@ -2105,7 +2105,7 @@ printf("components = %s\n", snd_ctl_card_info_get_components(hw_info));*/ + for (i=0; i= %{version} @@ -93,6 +94,7 @@ The following tools are available: %prep %setup -q -n %{name}-%{version} %patch1 -p1 -b .hwmixvolume-python +%patch -P 2 -p1 %build mv seq/sbiload . ; rm -rf seq @@ -201,6 +203,9 @@ install -m 644 %{SOURCE1} %{buildroot}/lib/udev/rules.d %endif %changelog +* Tue Jan 09 2024 Florian Weimer - 1.2.5-10 +- Fix C type errors using G_CALLBACK + * Wed Jul 19 2023 Fedora Release Engineering - 1.2.5-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From da2baee7f87e38995d1b91c0727bd3f8501a548c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 12:45:23 +0000 Subject: [PATCH 84/98] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- alsa-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index 75069ba..2e766c8 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -25,7 +25,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.2.5 -Release: 10%{?dist} +Release: 11%{?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 @@ -203,6 +203,9 @@ install -m 644 %{SOURCE1} %{buildroot}/lib/udev/rules.d %endif %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 1.2.5-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Tue Jan 09 2024 Florian Weimer - 1.2.5-10 - Fix C type errors using G_CALLBACK From 4a4e60461b6f2111b837e99c520f82b5826dceec Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 22:56:38 +0000 Subject: [PATCH 85/98] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- alsa-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index 2e766c8..f562863 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -25,7 +25,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.2.5 -Release: 11%{?dist} +Release: 12%{?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 @@ -203,6 +203,9 @@ install -m 644 %{SOURCE1} %{buildroot}/lib/udev/rules.d %endif %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 1.2.5-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 1.2.5-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 52d234f681f55a9e287e08cd14f093e5b704c958 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 29 Jan 2024 15:16:07 +0100 Subject: [PATCH 86/98] Updated to 1.2.11 --- alsa-tools.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index f562863..f24a307 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -24,8 +24,8 @@ Summary: Specialist tools for ALSA Name: alsa-tools -Version: 1.2.5 -Release: 12%{?dist} +Version: 1.2.11 +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 @@ -203,6 +203,9 @@ install -m 644 %{SOURCE1} %{buildroot}/lib/udev/rules.d %endif %changelog +* Tue Jan 29 2024 Jaroslav Kysela - 1.2.11-1 +- Updated to 1.2.11 + * Mon Jan 22 2024 Fedora Release Engineering - 1.2.5-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 4e163bc..05ba85a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (alsa-tools-1.2.5.tar.bz2) = 1c4ff947d9f2424056a6748e04a1250fb73443a3f470f61d0b563c91be082bc42d56e550d6cc27eaed3edcea2066a107e20455c959b053b5deafa2d811b7e498 +SHA512 (alsa-tools-1.2.11.tar.bz2) = b5a29a83121a637eaa16d225875feeabaea893eabc61b97d0c18a5852d851ff2e6932bd732786bb43525b410c2bb9185261cc4509fd3ee5fd8536557f12b2154 From e13e7719f87153b3f54a84b19870e17ffd4e9b92 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 29 Jan 2024 15:31:17 +0100 Subject: [PATCH 87/98] fix bogus date --- alsa-tools.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index f24a307..19ba4a9 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -25,7 +25,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.2.11 -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 @@ -203,7 +203,7 @@ install -m 644 %{SOURCE1} %{buildroot}/lib/udev/rules.d %endif %changelog -* Tue Jan 29 2024 Jaroslav Kysela - 1.2.11-1 +* Mon Jan 29 2024 Jaroslav Kysela - 1.2.11-2 - Updated to 1.2.11 * Mon Jan 22 2024 Fedora Release Engineering - 1.2.5-12 From ffcb3cb8feb9035ee215b2b9af5bfe45b5b8be4d Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 30 Jan 2024 09:31:25 +0100 Subject: [PATCH 88/98] remove c99 patch (obsolete) --- alsa-tools.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index 19ba4a9..4f8b773 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -36,7 +36,6 @@ Source: ftp://ftp.alsa-project.org/pub/tools/%{name}-%{version}.tar.bz2 Source1: 90-alsa-tools-firmware.rules Patch1: hwmixvolume-python.patch -Patch2: alsa-tools-c99.patch BuildRequires: gcc gcc-c++ BuildRequires: alsa-lib-devel >= %{version} @@ -93,8 +92,7 @@ The following tools are available: %prep %setup -q -n %{name}-%{version} -%patch1 -p1 -b .hwmixvolume-python -%patch -P 2 -p1 +%patch -P 1 -p1 -b .hwmixvolume-python %build mv seq/sbiload . ; rm -rf seq From 8829589d0216c932864a245a446a9ca26fed847c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 16:53:11 +0000 Subject: [PATCH 89/98] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- alsa-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index 4f8b773..7ccdd5a 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -25,7 +25,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.2.11 -Release: 2%{?dist} +Release: 3%{?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 @@ -201,6 +201,9 @@ install -m 644 %{SOURCE1} %{buildroot}/lib/udev/rules.d %endif %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 1.2.11-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jan 29 2024 Jaroslav Kysela - 1.2.11-2 - Updated to 1.2.11 From 975c04e64eafc97294313fd0f4a317c89995b84c Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Wed, 18 Dec 2024 12:06:03 +0100 Subject: [PATCH 90/98] move remaining files to /usr tree --- 90-alsa-tools-firmware.rules | 13 ++++++------- alsa-tools.spec | 17 ++++++++++------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/90-alsa-tools-firmware.rules b/90-alsa-tools-firmware.rules index 790cddf..d19bcba 100644 --- a/90-alsa-tools-firmware.rules +++ b/90-alsa-tools-firmware.rules @@ -1,12 +1,11 @@ # TASCAM US-428 usb sound card. -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" +SUBSYSTEM=="usb", ACTION=="add", ATTRS{idVendor}=="1604", ATTRS{idProduct}=="8000", RUN+="/usr/lib/udev/tascam_fw" +SUBSYSTEM=="usb", ACTION=="add", ATTRS{idVendor}=="1604", ATTRS{idProduct}=="8001", RUN+="/usr/lib/udev/tascam_fpga" # TASCAM US-224 usb sound card. -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" +SUBSYSTEM=="usb", ACTION=="add", ATTRS{idVendor}=="1604", ATTRS{idProduct}=="8004", RUN+="/usr/lib/udev/tascam_fw" +SUBSYSTEM=="usb", ACTION=="add", ATTRS{idVendor}=="1604", ATTRS{idProduct}=="8005", RUN+="/usr/lib/udev/tascam_fpga" # TASCAM US-122 usb sound card. -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" - +SUBSYSTEM=="usb", ACTION=="add", ATTRS{idVendor}=="1604", ATTRS{idProduct}=="8006", RUN+="/usr/lib/udev/tascam_fw" +SUBSYSTEM=="usb", ACTION=="add", ATTRS{idVendor}=="1604", ATTRS{idProduct}=="8007", RUN+="/usr/lib/udev/tascam_fpga" diff --git a/alsa-tools.spec b/alsa-tools.spec index 7ccdd5a..de27228 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -110,7 +110,7 @@ for i in %{?builddirstools:%builddirstools} %{?builddirsfirmw:%builddirsfirmw} do case $i in usx2yloader) - (cd $i ; %make_install hotplugdir=/lib/udev) || exit 1 + (cd $i ; %make_install hotplugdir=/usr/lib/udev) || exit 1 ;; *) (cd $i ; %make_install) || exit 1 @@ -140,9 +140,9 @@ do done # convert hotplug stuff to udev -rm -f %{buildroot}/lib/udev/tascam_fw.usermap -mkdir -p %{buildroot}/lib/udev/rules.d -install -m 644 %{SOURCE1} %{buildroot}/lib/udev/rules.d +rm -f %{buildroot}/usr/lib/udev/tascam_fw.usermap +mkdir -p %{buildroot}/usr/lib/udev/rules.d +install -m 644 %{SOURCE1} %{buildroot}/usr/lib/udev/rules.d %if 0%{!?_without_tools:1} %files @@ -191,9 +191,9 @@ install -m 644 %{SOURCE1} %{buildroot}/lib/udev/rules.d %doc %{_pkgdocdir}/mixartloader %doc %{_pkgdocdir}/usx2yloader %doc %{_pkgdocdir}/vxloader -/lib/udev/rules.d/*.rules -/lib/udev/tascam_fpga -/lib/udev/tascam_fw +/usr/lib/udev/rules.d/*.rules +/usr/lib/udev/tascam_fpga +/usr/lib/udev/tascam_fw %{_bindir}/hdsploader %{_bindir}/mixartloader %{_bindir}/usx2yloader @@ -201,6 +201,9 @@ install -m 644 %{SOURCE1} %{buildroot}/lib/udev/rules.d %endif %changelog +* Wed Dec 18 2024 Jaroslav Kysela - 1.2.11-4 +- Move remaining files to /usr tree + * Wed Jul 17 2024 Fedora Release Engineering - 1.2.11-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 3093b64f6becb27170a9a5dbfcebc3d6c1af2516 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Wed, 18 Dec 2024 12:06:44 +0100 Subject: [PATCH 91/98] increase release --- alsa-tools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index de27228..b6e0762 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -25,7 +25,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.2.11 -Release: 3%{?dist} +Release: 4%{?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 From 23424782ca8c19d85d4235b0ab1abf8f798d32a9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 10:54:46 +0000 Subject: [PATCH 92/98] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- alsa-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index b6e0762..efaffaa 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -25,7 +25,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.2.11 -Release: 4%{?dist} +Release: 5%{?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 @@ -201,6 +201,9 @@ install -m 644 %{SOURCE1} %{buildroot}/usr/lib/udev/rules.d %endif %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 1.2.11-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Dec 18 2024 Jaroslav Kysela - 1.2.11-4 - Move remaining files to /usr tree From bb55e3433c3f68b6cbf760a22d4f6267b2666272 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 27 Jan 2025 10:46:35 +0100 Subject: [PATCH 93/98] gcc warning fixes Signed-off-by: Jaroslav Kysela --- alsa-tools.spec | 7 +- gcc-fixes.patch | 827 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 833 insertions(+), 1 deletion(-) create mode 100644 gcc-fixes.patch diff --git a/alsa-tools.spec b/alsa-tools.spec index efaffaa..4d84122 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -25,7 +25,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.2.11 -Release: 5%{?dist} +Release: 6%{?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 @@ -36,6 +36,7 @@ Source: ftp://ftp.alsa-project.org/pub/tools/%{name}-%{version}.tar.bz2 Source1: 90-alsa-tools-firmware.rules Patch1: hwmixvolume-python.patch +Patch2: gcc-fixes.patch BuildRequires: gcc gcc-c++ BuildRequires: alsa-lib-devel >= %{version} @@ -93,6 +94,7 @@ The following tools are available: %prep %setup -q -n %{name}-%{version} %patch -P 1 -p1 -b .hwmixvolume-python +%patch -P 2 -p1 -b .gcc-fixes %build mv seq/sbiload . ; rm -rf seq @@ -201,6 +203,9 @@ install -m 644 %{SOURCE1} %{buildroot}/usr/lib/udev/rules.d %endif %changelog +* Mon Jan 27 2025 Jaroslav Kysela - 1.2.11-6 +- GCC warning fixes + * Thu Jan 16 2025 Fedora Release Engineering - 1.2.11-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/gcc-fixes.patch b/gcc-fixes.patch new file mode 100644 index 0000000..d136ba0 --- /dev/null +++ b/gcc-fixes.patch @@ -0,0 +1,827 @@ +From 97092591e03fa01a7b3b38ecf120fc28f437b9ca Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Sun, 26 Jan 2025 12:40:23 +0100 +Subject: [PATCH 01/11] envy24control: fix cast warnings and string array + overflows + +Signed-off-by: Jaroslav Kysela +--- + envy24control/config.c | 2 +- + envy24control/envy24control.c | 4 ++-- + envy24control/levelmeters.c | 2 +- + envy24control/new_process.c | 6 +++--- + envy24control/profiles.c | 13 ++++++------- + envy24control/profiles.h | 2 +- + envy24control/strstr_icase_blank.c | 7 ++++++- + 7 files changed, 20 insertions(+), 16 deletions(-) + +diff --git a/envy24control/config.c b/envy24control/config.c +index 6933eef..c27cf27 100644 +--- a/envy24control/config.c ++++ b/envy24control/config.c +@@ -46,7 +46,7 @@ void config_close() + + void config_set_stereo(GtkWidget *but, gpointer data) + { +- gint i=(gint)data; ++ gint i=GPOINTER_TO_INT(data); + config_stereo[i]=GTK_TOGGLE_BUTTON(but)->active; + } + +diff --git a/envy24control/envy24control.c b/envy24control/envy24control.c +index 107a843..bce41eb 100644 +--- a/envy24control/envy24control.c ++++ b/envy24control/envy24control.c +@@ -249,7 +249,7 @@ static void create_mixer_frame(GtkWidget *box, int stream) + gtk_box_pack_end(GTK_BOX(vbox), toggle, FALSE, FALSE, 0); + /* gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle), TRUE); */ + gtk_signal_connect(GTK_OBJECT(toggle), "toggled", +- GTK_SIGNAL_FUNC(config_set_stereo), (gpointer)stream-1); ++ GTK_SIGNAL_FUNC(config_set_stereo), GINT_TO_POINTER(stream-1)); + + hbox = gtk_hbox_new(TRUE, 6); + gtk_widget_show(hbox); +@@ -2176,7 +2176,7 @@ int main(int argc, char **argv) + + if (! name) { + /* probe cards */ +- static char cardname[8]; ++ static char cardname[16]; + /* FIXME: hardcoded max number of cards */ + for (card_number = 0; card_number < 8; card_number++) { + sprintf(cardname, "hw:%d", card_number); +diff --git a/envy24control/levelmeters.c b/envy24control/levelmeters.c +index 24e00db..5933721 100644 +--- a/envy24control/levelmeters.c ++++ b/envy24control/levelmeters.c +@@ -65,7 +65,7 @@ static GdkGC *get_pen(int idx, int nRed, int nGreen, int nBlue) + return gc; + } + +-static int get_index(gchar *name) ++static int get_index(const gchar *name) + { + int result; + +diff --git a/envy24control/new_process.c b/envy24control/new_process.c +index 7ea89a6..2168489 100644 +--- a/envy24control/new_process.c ++++ b/envy24control/new_process.c +@@ -20,9 +20,9 @@ int new_process(char * const cmd_line[MAX_PARAM]) + struct stat file_status; + + /* memory for storage of function pointers from the signal handling routines */ +- void (*int_stat)(); +- void (*quit_stat)(); +- void (*usr2_stat)(); ++ void (*int_stat)(int); ++ void (*quit_stat)(int); ++ void (*usr2_stat)(int); + + /* + * check command file +diff --git a/envy24control/profiles.c b/envy24control/profiles.c +index 8e23bfd..17a418c 100644 +--- a/envy24control/profiles.c ++++ b/envy24control/profiles.c +@@ -54,9 +54,9 @@ void subst_tilde_in_filename(char * const filename) + + if ((pos_after_tilde = strchr(filename, '~')) != NULL) { + pos_after_tilde++; +- strncpy(new_filename, getenv("HOME"), MAX_FILE_NAME_LENGTH); +- strncpy(new_filename + strlen(new_filename), pos_after_tilde, MAX_FILE_NAME_LENGTH - strlen(new_filename)); +- new_filename[MAX_FILE_NAME_LENGTH - 1] = '\0'; ++ strncpy(new_filename, getenv("HOME"), sizeof(new_filename) - 1); ++ strncpy(new_filename + strlen(new_filename), pos_after_tilde, sizeof(new_filename) - strlen(new_filename) - 1); ++ new_filename[sizeof(new_filename) - 1] = '\0'; + strncpy(filename, new_filename, MAX_FILE_NAME_LENGTH); + } + } +@@ -522,7 +522,7 @@ int reorganize_profiles(char * const buffer, const int max_length) + { + int profile_number, card_number, card_number_max; + int res; +- int pos_profile_begin, pos_profile_end, pos_card_begin, pos_card_end, pos_name_header; ++ int pos_profile_begin, pos_card_begin, pos_card_end, pos_name_header; + int pos_alsa_section_begin, pos_after_alsa_section; + char header[MAX_SEARCH_FIELD_LENGTH]; + void *buffer_copy = NULL; +@@ -547,7 +547,6 @@ int reorganize_profiles(char * const buffer, const int max_length) + compose_search_string(header, PROFILE_HEADER_TEMPL, profile_or_card_number_as_str, place_holder, MAX_SEARCH_FIELD_LENGTH); + header[MAX_SEARCH_FIELD_LENGTH - 1] = '\0'; + snprintf(buffer_copy + strlen(buffer_copy), max_length - strlen(buffer_copy), "%s\n", header); +- pos_profile_end = get_profile_end(buffer, profile_number); + /* search max card number in profile */ + card_number_max = get_max_card_number_in_profile(buffer, profile_number); + for (card_number = 0; card_number <= card_number_max; card_number++) +@@ -641,9 +640,9 @@ int save_restore_alsactl_settings(char * const tmpfile, const int card_number, c + + void compose_tmpfile_name(char * const tmpfile, const char * const cfgfile) + { +- strncpy(tmpfile, cfgfile, MAX_FILE_NAME_LENGTH); ++ strncpy(tmpfile, cfgfile, MAX_FILE_NAME_LENGTH - 1); + tmpfile[MAX_FILE_NAME_LENGTH - 1] = '\0'; +- strncpy(tmpfile + strlen(tmpfile), "_alsactl_tmp", MAX_FILE_NAME_LENGTH - strlen(tmpfile)); ++ strncpy(tmpfile + strlen(tmpfile), "_alsactl_tmp", MAX_FILE_NAME_LENGTH - strlen(tmpfile) - 1); + tmpfile[MAX_FILE_NAME_LENGTH - 1] = '\0'; + } + +diff --git a/envy24control/profiles.h b/envy24control/profiles.h +index 2063bff..b586291 100644 +--- a/envy24control/profiles.h ++++ b/envy24control/profiles.h +@@ -44,7 +44,7 @@ + #define MAX_PROFILE_SIZE 32768 + #define MAX_SEARCH_FIELD_LENGTH 1024 + #define MAX_FILE_NAME_LENGTH 1024 +-#define MAX_NUM_STR_LENGTH 10 ++#define MAX_NUM_STR_LENGTH 11 + #define TOKEN_SEP "|" + #define SEP_CHAR ' ' + +diff --git a/envy24control/strstr_icase_blank.c b/envy24control/strstr_icase_blank.c +index 8078d2a..6b7c500 100644 +--- a/envy24control/strstr_icase_blank.c ++++ b/envy24control/strstr_icase_blank.c +@@ -48,6 +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; ++ size_t len; + + strncpy(search_string, string2, MAX_SEARCH_FIELD_LENGTH); + search_string[MAX_SEARCH_FIELD_LENGTH - 1] = '\0'; +@@ -84,7 +85,11 @@ int strstr_icase_blank(const char * const string1, const char * const string2) + } + } + } +- strncpy(search_string, cmp_line, strlen(search_string)); ++ len = strlen(search_string); ++ if (len > sizeof(search_string) - 1) ++ len = sizeof(search_string) - 1; ++ strncpy(search_string, cmp_line, len); ++ search_string[len] = '\0'; + + position = 0; + while (position < strlen(string1)) +-- +2.47.1 + + +From 787857d61a434b6afd6241106ea792f408e4cb59 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Sun, 26 Jan 2025 13:05:40 +0100 +Subject: [PATCH 02/11] as10k1: fix gcc warnings + +Signed-off-by: Jaroslav Kysela +--- + as10k1/as10k1.c | 14 +++++++++----- + as10k1/assemble.c | 7 ++----- + as10k1/macro.c | 5 +---- + as10k1/parse.c | 3 ++- + as10k1/parse.h | 5 ++++- + 5 files changed, 18 insertions(+), 16 deletions(-) + +diff --git a/as10k1/as10k1.c b/as10k1/as10k1.c +index e226051..079f1c2 100644 +--- a/as10k1/as10k1.c ++++ b/as10k1/as10k1.c +@@ -244,6 +244,7 @@ void asm_open(char *name) + struct stat st; + char *next; + int backup_line_num,backup_file_num; ++ size_t rsize; + + + +@@ -284,8 +285,10 @@ void asm_open(char *name) + + buff[i].mem_end = buff[i].mem_start+st.st_size; + +- read(fd, buff[i].mem_start, st.st_size); ++ rsize = read(fd, buff[i].mem_start, st.st_size); + close(fd); ++ if (rsize != st.st_size) ++ as_exit("short read from input file\n"); + + #ifdef DEBUG + printf("File %s opened:\n",name); +@@ -383,13 +386,14 @@ void output_tram_line(struct list_head *line_head, int type) + val = __cpu_to_le32(tram_sym->data.value); + fwrite(&val,sizeof(u32),1,fp); + if(listing){ +- if(type==TYPE_TRAM_ADDR_READ) ++ if(type==TYPE_TRAM_ADDR_READ) { + fprintf(listfile,"\tRead"); +- else ++ } else { + fprintf(listfile,"\tWrite"); ++ } + +- fprintf(listfile,": 0x3%02x/0x2%02x (%s), offset 0x%07x\n",tram_sym->data.address,tram_sym->data.address, +- (prev_sym((&tram_sym->list)))->data.name,tram_sym->data.value); ++ fprintf(listfile,": 0x3%02x/0x2%02x (%s), offset 0x%07x\n",tram_sym->data.address,tram_sym->data.address, ++ (prev_sym((&tram_sym->list)))->data.name,tram_sym->data.value); + } + + } +diff --git a/as10k1/assemble.c b/as10k1/assemble.c +index 4508973..ced57c7 100644 +--- a/as10k1/assemble.c ++++ b/as10k1/assemble.c +@@ -22,6 +22,7 @@ + + #include"types.h" + #include"proto.h" ++#include"parse.h" + + extern int dbg_opt; + extern FILE *listfile; +@@ -45,7 +46,6 @@ void op(int op, int z,int w,int x,int y) + int w0, w1; + extern int dsp_code[DSP_CODE_SIZE]; + extern int ip; +- extern char op_codes[35][9]; + extern char listtemp[60]; + if (ip >= 0x200) + as_exit("to many instructions"); +@@ -306,7 +306,6 @@ void add_symbol(char *name, u16 type, u16 address, u32 value) + + extern int gpr_input_count,gpr_output_count,gpr_static_count,gpr_dynamic_count,gpr_control_count,gpr_constant_count; + struct sym *sym; +- struct tram *tmp_ptr; + extern struct list_head sym_head; + extern struct delay tram_delay[MAX_TANK_ADDR]; + extern struct lookup tram_lookup[MAX_TANK_ADDR]; +@@ -356,10 +355,8 @@ void add_symbol(char *name, u16 type, u16 address, u32 value) + else + tram_delay[tmp].write++; + }else{ +- tmp_ptr=(struct tram *)sym; + list_add_tail(&(((struct tram *)sym)->tram) , &(tram_lookup[tmp].tram) ); +- tmp_ptr=(struct tram *)sym; +- if(type== TYPE_TRAM_ADDR_READ) ++ if(type== TYPE_TRAM_ADDR_READ) + tram_lookup[tmp].read++; + else + tram_lookup[tmp].write++; +diff --git a/as10k1/macro.c b/as10k1/macro.c +index a01ad6f..70e4ef9 100644 +--- a/as10k1/macro.c ++++ b/as10k1/macro.c +@@ -72,14 +72,11 @@ void new_macro(char *symbol, char *line, char *operand) + void macro_expand(int macnum,char *operand ) + { + char *line,*next; +- int done=0,i,old; ++ int done=0,old; + extern unsigned int macro_depth; + extern int macro_line_num; + char string[MAX_LINE_LENGTH]; + +- //initialize macro use: +- i=0; +- + if(macro_depth+1> MAX_MAC_DEPTH) + as_exit("Error exceeded maximum number of recursive macro calls"); + +diff --git a/as10k1/parse.c b/as10k1/parse.c +index 8523717..02d4f5e 100644 +--- a/as10k1/parse.c ++++ b/as10k1/parse.c +@@ -18,6 +18,7 @@ + #include + #include + #include"types.h" ++#define DECLARE_OP_CODES + #include"parse.h" + #include"proto.h" + +@@ -87,7 +88,7 @@ int parse( char line_string[MAX_LINE_LENGTH], char *line) + if((tmp=ismacro(op_name_ptr)) != -1 ){ + if(defmacro==0) + macro_expand(tmp,strtok(NULL,"")); +- return(0); ++ return(0); + } + + if( (op_num=op_decode(op_name_ptr))==-1) { +diff --git a/as10k1/parse.h b/as10k1/parse.h +index be71daa..b79ed8b 100644 +--- a/as10k1/parse.h ++++ b/as10k1/parse.h +@@ -63,7 +63,9 @@ enum foo { + + }; + +- ++#ifndef DECLARE_OP_CODES ++extern char op_codes[NUM_OPS+1][9]; ++#else + char op_codes[NUM_OPS+1][9]= + { + "MACS", +@@ -110,6 +112,7 @@ char op_codes[NUM_OPS+1][9]= + "con", + "NotAnOp" + }; ++#endif + + //extern int file_num,source_line_num + +-- +2.47.1 + + +From 6549725ec59eafb24e9f8d9ddacbf33305524fd3 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Sun, 26 Jan 2025 13:12:05 +0100 +Subject: [PATCH 03/11] hdspconf: fix gcc warnings (const) + +Signed-off-by: Jaroslav Kysela +--- + hdspconf/src/HC_AboutText.h | 2 +- + hdspconf/src/HC_Aeb.cxx | 2 +- + hdspconf/src/HC_SpdifOut.cxx | 2 +- + hdspconf/src/HC_SyncCheck.h | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/hdspconf/src/HC_AboutText.h b/hdspconf/src/HC_AboutText.h +index 2a76c40..1b579e5 100644 +--- a/hdspconf/src/HC_AboutText.h ++++ b/hdspconf/src/HC_AboutText.h +@@ -32,7 +32,7 @@ public: + HC_AboutText(int x, int y, int w, int h); + void draw(); + private: +- char *text; ++ const char *text; + }; + + #endif +diff --git a/hdspconf/src/HC_Aeb.cxx b/hdspconf/src/HC_Aeb.cxx +index d7a98d6..6df4848 100644 +--- a/hdspconf/src/HC_Aeb.cxx ++++ b/hdspconf/src/HC_Aeb.cxx +@@ -21,7 +21,7 @@ + #pragma implementation + #include "HC_Aeb.h" + +-static void setAebStatus(char *ctl_name, int val, int card_index) ++static void setAebStatus(const char *ctl_name, int val, int card_index) + { + int err; + char card_name[6]; +diff --git a/hdspconf/src/HC_SpdifOut.cxx b/hdspconf/src/HC_SpdifOut.cxx +index 71c7bfe..674140b 100644 +--- a/hdspconf/src/HC_SpdifOut.cxx ++++ b/hdspconf/src/HC_SpdifOut.cxx +@@ -21,7 +21,7 @@ + #pragma implementation + #include "HC_SpdifOut.h" + +-static void setSpdifBit(char *ctl_name, int val, int card_index) ++static void setSpdifBit(const char *ctl_name, int val, int card_index) + { + int err; + char card_name[6]; +diff --git a/hdspconf/src/HC_SyncCheck.h b/hdspconf/src/HC_SyncCheck.h +index 6aa6d13..c79d21f 100644 +--- a/hdspconf/src/HC_SyncCheck.h ++++ b/hdspconf/src/HC_SyncCheck.h +@@ -51,7 +51,7 @@ public: + void setAdatSyncStatus(unsigned char s); + void setWCStatus(unsigned char s); + private: +- char *adat_name; ++ const char *adat_name; + int h_step; + Fl_Box_Draw_F *draw_box; + }; +-- +2.47.1 + + +From 9cb754084ba073342491704078f68e62f38fda7f Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Sun, 26 Jan 2025 13:16:53 +0100 +Subject: [PATCH 04/11] mixartloader: fix gcc warnings (string truncation) + +Signed-off-by: Jaroslav Kysela +--- + mixartloader/mixartloader.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/mixartloader/mixartloader.c b/mixartloader/mixartloader.c +index f34ed58..19a1615 100644 +--- a/mixartloader/mixartloader.c ++++ b/mixartloader/mixartloader.c +@@ -89,7 +89,8 @@ static int get_file_name(const char *key, unsigned int idx, char *fname) + for (p = buf + len; *p && isspace(*p); p++) + ; + if (*p == '/') { +- strncpy(fname, p, MAX_PATH); ++ strncpy(fname, p, MAX_PATH - 1); ++ fname[MAX_PATH - 1] = '\0'; + } else { + snprintf(fname, MAX_PATH, "%s/%s", DATAPATH, p); + } +-- +2.47.1 + + +From 48128777e0f528d3aaf3eca65f9d16a393901c63 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Sun, 26 Jan 2025 13:19:59 +0100 +Subject: [PATCH 05/11] pcxhrloader: fix gcc warnings (string truncation) + +Signed-off-by: Jaroslav Kysela +--- + pcxhrloader/pcxhrloader.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/pcxhrloader/pcxhrloader.c b/pcxhrloader/pcxhrloader.c +index de9420e..5cd1845 100644 +--- a/pcxhrloader/pcxhrloader.c ++++ b/pcxhrloader/pcxhrloader.c +@@ -89,7 +89,8 @@ static int get_file_name(const char *key, unsigned int idx, char *fname) + for (p = buf + len; *p && isspace(*p); p++) + ; + if (*p == '/') { +- strncpy(fname, p, MAX_PATH); ++ strncpy(fname, p, MAX_PATH - 1); ++ fname[MAX_PATH - 1] = '\0'; + } else { + snprintf(fname, MAX_PATH, "%s/%s", DATAPATH, p); + } +-- +2.47.1 + + +From a2a0167ed9e91ad2c427fae31dc89daa4022b0cc Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Sun, 26 Jan 2025 13:21:13 +0100 +Subject: [PATCH 06/11] rmedigicontrol: fix gcc warnings (string size) + +Signed-off-by: Jaroslav Kysela +--- + rmedigicontrol/rmedigicontrol.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/rmedigicontrol/rmedigicontrol.c b/rmedigicontrol/rmedigicontrol.c +index 973299b..1119637 100644 +--- a/rmedigicontrol/rmedigicontrol.c ++++ b/rmedigicontrol/rmedigicontrol.c +@@ -29,7 +29,7 @@ void destroy(GtkWidget *widget,gpointer data) + int main(int argc, char *argv[]) + { + int card; +- char name[8],*err; ++ char name[16],*err; + snd_ctl_card_info_t *hw_info; + card_type_t type; + +-- +2.47.1 + + +From 3bd780896e7f0316fa0b36e4445888546d3396cd Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Mon, 27 Jan 2025 09:28:53 +0100 +Subject: [PATCH 07/11] usx2yloader: fix gcc warnings (string size) + +Signed-off-by: Jaroslav Kysela +--- + usx2yloader/usx2yloader.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/usx2yloader/usx2yloader.c b/usx2yloader/usx2yloader.c +index 61583c2..363cbdc 100644 +--- a/usx2yloader/usx2yloader.c ++++ b/usx2yloader/usx2yloader.c +@@ -225,7 +225,8 @@ static int get_file_name(const char *key, unsigned int idx, char *fname) + for (p = buf + len; *p && isspace(*p); p++) + ; + if (*p == '/') { +- strncpy(fname, p, MAX_PATH); ++ strncpy(fname, p, MAX_PATH - 1); ++ fname[MAX_PATH - 1] = '\0'; + } else { + snprintf(fname, MAX_PATH, "%s/%s", DATAPATH, p); + } +-- +2.47.1 + + +From cd9ee08dcb504822ac24f09c823b89f8391095f2 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Mon, 27 Jan 2025 09:29:37 +0100 +Subject: [PATCH 08/11] vxloader: fix gcc warnings (string size) + +Signed-off-by: Jaroslav Kysela +--- + vxloader/vxloader.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/vxloader/vxloader.c b/vxloader/vxloader.c +index 69d654d..cc62e1e 100644 +--- a/vxloader/vxloader.c ++++ b/vxloader/vxloader.c +@@ -214,7 +214,8 @@ static int get_file_name(const char *key, unsigned int idx, char *fname) + for (p = buf + len; *p && isspace(*p); p++) + ; + if (*p == '/') { +- strncpy(fname, p, MAX_PATH); ++ strncpy(fname, p, MAX_PATH - 1); ++ fname[MAX_PATH - 1] = '\0'; + } else { + snprintf(fname, MAX_PATH, "%s/%s", DATAPATH, p); + } +-- +2.47.1 + + +From 2420b2a6dfe33ae90cfa7b5bb1de04c008366ff9 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Mon, 27 Jan 2025 09:34:38 +0100 +Subject: [PATCH 09/11] echomixer: fix various gcc warnings + +Signed-off-by: Jaroslav Kysela +--- + echomixer/echomixer.c | 20 ++++++-------------- + 1 file changed, 6 insertions(+), 14 deletions(-) + +diff --git a/echomixer/echomixer.c b/echomixer/echomixer.c +index 80124ba..adc10e1 100644 +--- a/echomixer/echomixer.c ++++ b/echomixer/echomixer.c +@@ -629,9 +629,7 @@ gint DrawMixer(gpointer unused) { + int OutPeak[ECHO_MAXAUDIOOUTPUTS]; + int VirLevel[ECHO_MAXAUDIOOUTPUTS]; + int VirPeak[ECHO_MAXAUDIOOUTPUTS]; +- static int InClip[ECHO_MAXAUDIOINPUTS]; +- static int OutClip[ECHO_MAXAUDIOOUTPUTS]; +- char str[8]; ++ char str[16]; + int i, o, dB; + GdkColor Grid={0x787878, 0, 0, 0}; + GdkColor Labels={0x9694C4, 0, 0, 0}; +@@ -647,13 +645,8 @@ gint DrawMixer(gpointer unused) { + update_rect.height = Mixheight; + GetVUmeters(InLevel, InPeak, OutLevel, OutPeak, VirLevel, VirPeak); + +- if (!gc) { ++ if (!gc) + gc=gdk_gc_new(gtk_widget_get_parent_window(Mixdarea)); +- for (i=0; istyle->black_gc, TRUE, 0, 0, Mixwidth, Mixheight); + +@@ -1693,7 +1686,7 @@ void ToggleWindow(GtkWidget *widget, gpointer window) { + // Scan all controls and sets up the structures needed to access them. + int OpenControls(const char *card, const char *cardname) { + int err, i, o; +- int numid, count, items, item; ++ int numid, items, item; + snd_hctl_t *handle; + snd_hctl_elem_t *elem; + snd_ctl_elem_id_t *id; +@@ -1726,7 +1719,6 @@ int OpenControls(const char *card, const char *cardname) { + continue; + snd_hctl_elem_get_id(elem, id); + numid=snd_ctl_elem_id_get_numid(id); +- count=snd_ctl_elem_info_get_count(info); + if (!strcmp("Monitor Mixer Volume", snd_ctl_elem_id_get_name(id))) { + if (!mixerId) { + mixerId=numid; +@@ -1879,7 +1871,7 @@ int main(int argc, char *argv[]) { + GtkWidget *label, *menu, *menuitem; + GSList *bgroup; + int err, i, o, n, cardnum, value; +- char hwname[8], cardname[32], load, save; ++ char hwname[16], cardname[32], load, save; + snd_ctl_card_info_t *hw_info; + + load=save=1; +@@ -1900,8 +1892,8 @@ int main(int argc, char *argv[]) { + } + if ((err=snd_ctl_card_info(ctlhandle, hw_info))>=0) { + if (!strncmp(snd_ctl_card_info_get_driver(hw_info), "Echo_", 5)) { +- strncpy(card, hwname, 7); +- hwname[7]=0; ++ strncpy(card, hwname, sizeof(hwname)-1); ++ card[sizeof(hwname)-1]=0; + strncpy(cardname, snd_ctl_card_info_get_name(hw_info), 31); + cardname[31]=0; + strncpy(cardId, snd_ctl_card_info_get_name(hw_info), 15); +-- +2.47.1 + + +From 90c2aa263906492bd511d929feeb14ddf162d02d Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Mon, 27 Jan 2025 09:42:39 +0100 +Subject: [PATCH 10/11] ld10k1: fix various gcc warnings + +Signed-off-by: Jaroslav Kysela +--- + ld10k1/src/dl10k1.c | 2 +- + ld10k1/src/ld10k1.c | 8 ++++---- + ld10k1/src/ld10k1_driver.c | 4 ++-- + ld10k1/src/ld10k1_fnc.c | 2 +- + ld10k1/src/ld10k1_fnc1.c | 3 --- + ld10k1/src/lo10k1.c | 14 +++++++------- + 6 files changed, 15 insertions(+), 18 deletions(-) + +diff --git a/ld10k1/src/dl10k1.c b/ld10k1/src/dl10k1.c +index 42d54a1..b2f3a54 100644 +--- a/ld10k1/src/dl10k1.c ++++ b/ld10k1/src/dl10k1.c +@@ -354,7 +354,7 @@ int dump_load(int audigy, char *file_name) + fctrl = (ld10k1_ctl_dump_t *)ptr; + memset(ctrl, 0, sizeof(emu10k1_fx8010_control_gpr_t) * header->ctl_count); + for (i = 0; i < header->ctl_count; i++) { +- strcpy(ctrl[i].id.name, fctrl[i].name); ++ strcpy((char *)ctrl[i].id.name, fctrl[i].name); + ctrl[i].id.iface = EMU10K1_CTL_ELEM_IFACE_MIXER; + ctrl[i].id.index = fctrl[i].index; + ctrl[i].vcount = fctrl[i].vcount; +diff --git a/ld10k1/src/ld10k1.c b/ld10k1/src/ld10k1.c +index b0b5a9b..97be2c0 100644 +--- a/ld10k1/src/ld10k1.c ++++ b/ld10k1/src/ld10k1.c +@@ -77,7 +77,7 @@ void error(const char *fmt, ...) + va_end(va); + } + +-static void log(const char *fmt, ...) ++static void alog(const char *fmt, ...) + { + va_list va; + +@@ -116,7 +116,7 @@ static void cleanup() + { + if (pidpath[0]) + unlink(pidpath); +- log("Exiting daemon"); ++ alog("Exiting daemon"); + } + + static void term_handler(int i) +@@ -247,7 +247,7 @@ int main(int argc, char *argv[]) + + pidfile = fopen(pidpath, "wt"); + if (!pidfile) { +- log("%s: pidfile (%s)\n", strerror(errno), pidpath); ++ alog("%s: pidfile (%s)\n", strerror(errno), pidpath); + return 1; + } + +@@ -263,7 +263,7 @@ int main(int argc, char *argv[]) + dup2(fileno(logfile), fileno(stdout)); + } + +- log("Starting daemon"); ++ alog("Starting daemon"); + } + + params.type = uses_pipe ? COMM_TYPE_LOCAL : COMM_TYPE_IP; +diff --git a/ld10k1/src/ld10k1_driver.c b/ld10k1/src/ld10k1_driver.c +index 38ee873..05b1415 100644 +--- a/ld10k1/src/ld10k1_driver.c ++++ b/ld10k1/src/ld10k1_driver.c +@@ -199,7 +199,7 @@ int ld10k1_update_driver(ld10k1_dsp_mgr_t *dsp_mgr) + if (!add_ctrl) + return LD10K1_ERR_NO_MEM; + for (i = 0, item = dsp_mgr->add_ctl_list; item != NULL; item = item->next, i++) { +- strcpy(add_ctrl[i].id.name, item->ctl.name); ++ strcpy((char *)add_ctrl[i].id.name, item->ctl.name); + add_ctrl[i].id.iface = EMU10K1_CTL_ELEM_IFACE_MIXER; + add_ctrl[i].id.index = item->ctl.index; + add_ctrl[i].vcount = item->ctl.vcount; +@@ -225,7 +225,7 @@ int ld10k1_update_driver(ld10k1_dsp_mgr_t *dsp_mgr) + if (!del_ids) + return LD10K1_ERR_NO_MEM; + for (i = 0, item = dsp_mgr->del_ctl_list; item != NULL; item = item->next, i++) { +- strcpy(del_ids[i].name, item->ctl.name); ++ strcpy((char *)del_ids[i].name, item->ctl.name); + del_ids[i].iface = EMU10K1_CTL_ELEM_IFACE_MIXER; + del_ids[i].index = item->ctl.index; + } +diff --git a/ld10k1/src/ld10k1_fnc.c b/ld10k1/src/ld10k1_fnc.c +index c88f4c0..7e99d55 100644 +--- a/ld10k1/src/ld10k1_fnc.c ++++ b/ld10k1/src/ld10k1_fnc.c +@@ -2152,7 +2152,7 @@ int ld10k1_conn_point_add(ld10k1_dsp_mgr_t *dsp_mgr, ld10k1_conn_point_t *point, + int allocgprcount = 0; + int allocinstrcount = 0; + unsigned int reserved[2]; +- unsigned int res[2]; ++ int res[2]; + int reservedcount = 0; + int usedreserved = 0; + +diff --git a/ld10k1/src/ld10k1_fnc1.c b/ld10k1/src/ld10k1_fnc1.c +index ddc43c6..c3ea754 100644 +--- a/ld10k1/src/ld10k1_fnc1.c ++++ b/ld10k1/src/ld10k1_fnc1.c +@@ -792,12 +792,9 @@ int ld10k1_fnc_name_find(int data_conn, int op, int size) + int ld10k1_fnc_name_rename(int data_conn, int op, int size) + { + ld10k1_fnc_name_t name_info; +- int ret; + int err; + ld10k1_patch_t *patch; + +- ret = -1; +- + if ((err = receive_msg_data(data_conn, &name_info, sizeof(ld10k1_fnc_name_t))) < 0) + return err; + +diff --git a/ld10k1/src/lo10k1.c b/ld10k1/src/lo10k1.c +index 93a9369..c1223cb 100644 +--- a/ld10k1/src/lo10k1.c ++++ b/ld10k1/src/lo10k1.c +@@ -473,8 +473,9 @@ static int transfer_patch(int udin, char *ctrl_opt, liblo10k1_emu_patch_t *ep, l + if (*ctrl_opt != ',') { + error("wrong ctrl option format - wrong separator beetwen subfunctions"); + return 1; +- } else +- *ctrl_opt++; ++ } else { ++ ctrl_opt++; ++ } + } + } + +@@ -691,8 +692,9 @@ static int transfer_native_patch(liblo10k1_dsp_patch_t *p, char *ctrl_opt) + if (*ctrl_opt != ',') { + error("wrong ctrl option format - wrong separator beetwen subfunctions"); + return 1; +- } else +- *ctrl_opt++; ++ } else { ++ ctrl_opt++; ++ } + } + } + +@@ -1466,7 +1468,6 @@ int main(int argc, char *argv[]) + + int opt_list; + int opt_setup; +- int opt_info; + int opt_add; + int opt_del; + int opt_con_add; +@@ -1526,7 +1527,6 @@ int main(int argc, char *argv[]) + opt_add = 0; + opt_del = 0; + opt_list_patch = NULL; +- opt_info = 0; + opt_con_add = 0; + opt_con_del = 0; + opt_debug = 0; +@@ -1618,7 +1618,7 @@ int main(int argc, char *argv[]) + opt_list_patch = optarg; + break; + case 'i': +- opt_info = 1; ++ /* nothing */ + break; + case 'q': + opt_con_add = 1; +-- +2.47.1 + + +From 5eaadd15bda4cf0424ee2470a6d304a0c2ce10cb Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Mon, 27 Jan 2025 11:02:21 +0100 +Subject: [PATCH 11/11] hdajackretask: fix reset_changes_boot() declaration + +Signed-off-by: Jaroslav Kysela +--- + hdajackretask/apply-changes.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/hdajackretask/apply-changes.h b/hdajackretask/apply-changes.h +index e08d66d..e431a0d 100644 +--- a/hdajackretask/apply-changes.h ++++ b/hdajackretask/apply-changes.h +@@ -9,7 +9,7 @@ gboolean apply_changes_reconfig(pin_configs_t* pins, int entries, int card, int + + gboolean apply_changes_boot(pin_configs_t* pins, int entries, int card, int device, + const char* model, const char* hints, GError** err); +-gboolean reset_changes_boot(); ++gboolean reset_changes_boot(GError ** err); + + #endif + +-- +2.47.1 + From 7240923ba4bb1b4c159f93a01927026550a4ffc7 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 14 Apr 2025 15:13:39 +0200 Subject: [PATCH 94/98] update to 1.2.14 Signed-off-by: Jaroslav Kysela --- alsa-tools.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index 4d84122..a9b271d 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -24,8 +24,8 @@ Summary: Specialist tools for ALSA Name: alsa-tools -Version: 1.2.11 -Release: 6%{?dist} +Version: 1.2.14 +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 @@ -203,6 +203,9 @@ install -m 644 %{SOURCE1} %{buildroot}/usr/lib/udev/rules.d %endif %changelog +- Mon Apr 14 2025 Jaroslav Kysela - 1.2.14-1 +- Updated to 1.2.14 + * Mon Jan 27 2025 Jaroslav Kysela - 1.2.11-6 - GCC warning fixes diff --git a/sources b/sources index 05ba85a..991cb24 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (alsa-tools-1.2.11.tar.bz2) = b5a29a83121a637eaa16d225875feeabaea893eabc61b97d0c18a5852d851ff2e6932bd732786bb43525b410c2bb9185261cc4509fd3ee5fd8536557f12b2154 +SHA512 (alsa-tools-1.2.14.tar.bz2) = 36996eb19c590f3f8deb5831ef4e4a9016578e42172901dd97ebe78a4c6fc14e8d84d8f6639cc37d2db91c1d73727226cf1a5d952c586cfc909768377b04e8c7 From c76143a5e78a6f74915231cbb4e8cfe9adaebe95 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 14 Apr 2025 16:17:02 +0200 Subject: [PATCH 95/98] remove gcc fixes patch (duplicate) Signed-off-by: Jaroslav Kysela --- alsa-tools.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index a9b271d..b477b46 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -36,7 +36,6 @@ Source: ftp://ftp.alsa-project.org/pub/tools/%{name}-%{version}.tar.bz2 Source1: 90-alsa-tools-firmware.rules Patch1: hwmixvolume-python.patch -Patch2: gcc-fixes.patch BuildRequires: gcc gcc-c++ BuildRequires: alsa-lib-devel >= %{version} @@ -94,7 +93,6 @@ The following tools are available: %prep %setup -q -n %{name}-%{version} %patch -P 1 -p1 -b .hwmixvolume-python -%patch -P 2 -p1 -b .gcc-fixes %build mv seq/sbiload . ; rm -rf seq From 2f71082f08656ce7d7fe4c951f8438d5c2fffe7b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 16:55:20 +0000 Subject: [PATCH 96/98] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- alsa-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index b477b46..d5e831c 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -25,7 +25,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.2.14 -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 @@ -201,6 +201,9 @@ install -m 644 %{SOURCE1} %{buildroot}/usr/lib/udev/rules.d %endif %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 1.2.14-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + - Mon Apr 14 2025 Jaroslav Kysela - 1.2.14-1 - Updated to 1.2.14 From f7df5493214e9afd91047e9ad186ec3960cfb8ac Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 8 Dec 2025 10:07:32 +0100 Subject: [PATCH 97/98] update to 1.2.15 Signed-off-by: Jaroslav Kysela --- alsa-tools.spec | 10 +++++++--- sources | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index d5e831c..68efb84 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -24,8 +24,8 @@ Summary: Specialist tools for ALSA Name: alsa-tools -Version: 1.2.14 -Release: 2%{?dist} +Version: 1.2.15 +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 @@ -42,6 +42,7 @@ BuildRequires: alsa-lib-devel >= %{version} %if 0%{!?_without_tools:1} BuildRequires: gtk2-devel BuildRequires: gtk3-devel +BuildRequires: gtk4-devel BuildRequires: fltk-devel BuildRequires: make Buildrequires: desktop-file-utils @@ -201,10 +202,13 @@ install -m 644 %{SOURCE1} %{buildroot}/usr/lib/udev/rules.d %endif %changelog +* Mon Dec 8 2025 Jaroslav Kysela - 1.2.15-1 +- Updated to 1.2.15 + * Wed Jul 23 2025 Fedora Release Engineering - 1.2.14-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild -- Mon Apr 14 2025 Jaroslav Kysela - 1.2.14-1 +* Mon Apr 14 2025 Jaroslav Kysela - 1.2.14-1 - Updated to 1.2.14 * Mon Jan 27 2025 Jaroslav Kysela - 1.2.11-6 diff --git a/sources b/sources index 991cb24..8fc480e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (alsa-tools-1.2.14.tar.bz2) = 36996eb19c590f3f8deb5831ef4e4a9016578e42172901dd97ebe78a4c6fc14e8d84d8f6639cc37d2db91c1d73727226cf1a5d952c586cfc909768377b04e8c7 +SHA512 (alsa-tools-1.2.15.tar.bz2) = b2354fcaccfa316df7847438ad6b4ca3702be4ca88c46878c198a52ca6c659263b61759d4898e7a73acf64dd0e3004c103fa67a1cbdb2e53212f13368173be23 From a16a7842fe0d1b9d815d4c34091e94a75fde765b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:36:49 +0000 Subject: [PATCH 98/98] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- alsa-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index 68efb84..25ae794 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -25,7 +25,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.2.15 -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 @@ -202,6 +202,9 @@ install -m 644 %{SOURCE1} %{buildroot}/usr/lib/udev/rules.d %endif %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 1.2.15-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Mon Dec 8 2025 Jaroslav Kysela - 1.2.15-1 - Updated to 1.2.15