diff --git a/.cvsignore b/.cvsignore index 0006edf..66c5cae 100644 --- a/.cvsignore +++ b/.cvsignore @@ -16,3 +16,5 @@ alsa-utils-1.0.14rc2.tar.bz2 alsa-utils-1.0.14.tar.bz2 alsa-utils-1.0.15rc1.tar.bz2 alsa-utils-1.0.16.tar.bz2 +alsa-utils-1.0.17rc2.tar.bz2 +alsa-utils-1.0.17.tar.bz2 diff --git a/alsa-utils-1.0.14-alsaconf.patch b/alsa-utils-1.0.14-alsaconf.patch deleted file mode 100644 index f33a9b9..0000000 --- a/alsa-utils-1.0.14-alsaconf.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- alsa-utils-1.0.14/Makefile.in.orig 2007-05-31 10:07:29.000000000 +0200 -+++ alsa-utils-1.0.14/Makefile.in 2007-06-07 12:15:11.000000000 +0200 -@@ -65,7 +65,7 @@ RECURSIVE_TARGETS = all-recursive check- - uninstall-recursive - ETAGS = etags - CTAGS = ctags --DIST_SUBDIRS = include alsactl alsaconf alsamixer amidi amixer aplay \ -+DIST_SUBDIRS = include alsactl alsamixer amidi amixer aplay \ - iecset seq speaker-test utils m4 po - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - distdir = $(PACKAGE)-$(VERSION) -@@ -194,7 +194,7 @@ target_alias = @target_alias@ - INCLUDES = -I$(top_srcdir)/include - @ALSAMIXER_FALSE@ALSAMIXER_DIR = - @ALSAMIXER_TRUE@ALSAMIXER_DIR = alsamixer --SUBDIRS = include alsactl alsaconf $(ALSAMIXER_DIR) amidi amixer aplay iecset seq speaker-test utils m4 po -+SUBDIRS = include alsactl $(ALSAMIXER_DIR) amidi amixer aplay iecset seq speaker-test utils m4 po - EXTRA_DIST = config.rpath config.rpath mkinstalldirs ChangeLog INSTALL TODO README configure hgcompile depcomp - AUTOMAKE_OPTIONS = foreign - ACLOCAL_AMFLAGS = -I m4 ---- alsa-utils-1.0.14/Makefile.am.orig 2007-05-31 10:07:23.000000000 +0200 -+++ alsa-utils-1.0.14/Makefile.am 2007-06-07 12:15:29.000000000 +0200 -@@ -4,7 +4,7 @@ ALSAMIXER_DIR=alsamixer - else - ALSAMIXER_DIR= - endif --SUBDIRS= include alsactl alsaconf $(ALSAMIXER_DIR) amidi amixer aplay iecset seq speaker-test utils m4 po -+SUBDIRS= include alsactl $(ALSAMIXER_DIR) amidi amixer aplay iecset seq speaker-test utils m4 po - EXTRA_DIST= config.rpath config.rpath mkinstalldirs ChangeLog INSTALL TODO README configure hgcompile depcomp - AUTOMAKE_OPTIONS=foreign - ACLOCAL_AMFLAGS = -I m4 diff --git a/alsa-utils-1.0.17-alsaconf.patch b/alsa-utils-1.0.17-alsaconf.patch new file mode 100644 index 0000000..0a1a8af --- /dev/null +++ b/alsa-utils-1.0.17-alsaconf.patch @@ -0,0 +1,31 @@ +--- alsa-utils-1.0.17/Makefile.am.orig 2008-07-14 11:16:02.000000000 +0200 ++++ alsa-utils-1.0.17/Makefile.am 2008-09-12 10:39:43.000000000 +0200 +@@ -4,7 +4,7 @@ + else + ALSAMIXER_DIR= + endif +-SUBDIRS= include alsactl alsaconf $(ALSAMIXER_DIR) amidi amixer aplay iecset seq speaker-test utils m4 po ++SUBDIRS= include alsactl $(ALSAMIXER_DIR) amidi amixer aplay iecset seq speaker-test utils m4 po + EXTRA_DIST= config.rpath config.rpath mkinstalldirs ChangeLog INSTALL TODO README configure gitcompile depcomp + AUTOMAKE_OPTIONS=foreign + ACLOCAL_AMFLAGS = -I m4 +--- alsa-utils-1.0.17/Makefile.in.orig 2008-07-14 11:16:06.000000000 +0200 ++++ alsa-utils-1.0.17/Makefile.in 2008-09-12 10:39:57.000000000 +0200 +@@ -65,7 +65,7 @@ + uninstall-recursive + ETAGS = etags + CTAGS = ctags +-DIST_SUBDIRS = include alsactl alsaconf alsamixer amidi amixer aplay \ ++DIST_SUBDIRS = include alsactl alsamixer amidi amixer aplay \ + iecset seq speaker-test utils m4 po + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + distdir = $(PACKAGE)-$(VERSION) +@@ -197,7 +197,7 @@ + INCLUDES = -I$(top_srcdir)/include + @ALSAMIXER_FALSE@ALSAMIXER_DIR = + @ALSAMIXER_TRUE@ALSAMIXER_DIR = alsamixer +-SUBDIRS = include alsactl alsaconf $(ALSAMIXER_DIR) amidi amixer aplay iecset seq speaker-test utils m4 po ++SUBDIRS = include alsactl $(ALSAMIXER_DIR) amidi amixer aplay iecset seq speaker-test utils m4 po + EXTRA_DIST = config.rpath config.rpath mkinstalldirs ChangeLog INSTALL TODO README configure gitcompile depcomp + AUTOMAKE_OPTIONS = foreign + ACLOCAL_AMFLAGS = -I m4 diff --git a/alsa-utils-1.0.17-amixer-dbscale.patch b/alsa-utils-1.0.17-amixer-dbscale.patch new file mode 100644 index 0000000..66facda --- /dev/null +++ b/alsa-utils-1.0.17-amixer-dbscale.patch @@ -0,0 +1,82 @@ +From ec73719ec6a7d4ccdd71c32de585217f31a99fb3 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Thu, 14 Aug 2008 14:57:19 +0200 +Subject: [PATCH] amixer - fixed TLV dBscale and added dBrange parsing + +Signed-off-by: Jaroslav Kysela +--- + amixer/amixer.c | 30 +++++++++++++++++++++++++----- + 1 files changed, 25 insertions(+), 5 deletions(-) + +diff --git a/amixer/amixer.c b/amixer/amixer.c +index 61259f6..f93fa9e 100644 +--- a/amixer/amixer.c ++++ b/amixer/amixer.c +@@ -456,7 +456,7 @@ static void decode_tlv(unsigned int spaces, unsigned int *tlv, unsigned int tlv_ + unsigned int type = tlv[0]; + unsigned int size; + unsigned int idx = 0; +- ++ + if (tlv_size < 2 * sizeof(unsigned int)) { + printf("TLV size error!\n"); + return; +@@ -487,12 +487,12 @@ static void decode_tlv(unsigned int spaces, unsigned int *tlv, unsigned int tlv_ + printf("dBscale-"); + if (size != 2 * sizeof(unsigned int)) { + while (size > 0) { +- printf("0x%x", tlv[idx++]); ++ printf("0x%08x,", tlv[idx++]); + size -= sizeof(unsigned int); + } + } else { + printf("min="); +- print_dB(tlv[2]); ++ print_dB((int)tlv[2]); + printf(",step="); + print_dB(tlv[3] & 0xffff); + printf(",mute=%i", (tlv[3] >> 16) & 1); +@@ -503,7 +503,7 @@ static void decode_tlv(unsigned int spaces, unsigned int *tlv, unsigned int tlv_ + printf("dBlinear-"); + if (size != 2 * sizeof(unsigned int)) { + while (size > 0) { +- printf("0x%x", tlv[idx++]); ++ printf("0x%08x,", tlv[idx++]); + size -= sizeof(unsigned int); + } + } else { +@@ -514,10 +514,30 @@ static void decode_tlv(unsigned int spaces, unsigned int *tlv, unsigned int tlv_ + } + break; + #endif ++#ifdef SND_CTL_TLVT_DB_RANGE ++ case SND_CTL_TLVT_DB_RANGE: ++ printf("dBrange-\n"); ++ if ((size / (6 * sizeof(unsigned int))) != 0) { ++ while (size > 0) { ++ printf("0x%08x,", tlv[idx++]); ++ size -= sizeof(unsigned int); ++ } ++ break; ++ } ++ idx = 0; ++ while (idx < size) { ++ print_spaces(spaces + 2); ++ printf("rangemin=%i,", tlv[0]); ++ printf(",rangemax=%i\n", tlv[1]); ++ decode_tlv(spaces + 4, tlv + 2, 6 * sizeof(unsigned int)); ++ idx += 6 * sizeof(unsigned int); ++ } ++ break; ++#endif + default: + printf("unk-%i-", type); + while (size > 0) { +- printf("0x%x", tlv[idx++]); ++ printf("0x%08x,", tlv[idx++]); + size -= sizeof(unsigned int); + } + break; +-- +1.5.5.1 + diff --git a/alsa-utils.spec b/alsa-utils.spec index 1d3379e..f1fe9ad 100644 --- a/alsa-utils.spec +++ b/alsa-utils.spec @@ -1,10 +1,10 @@ -#define prever rc1 -#define prever_dot .rc1 +#define prever rc2 +#define prever_dot .rc2 Summary: Advanced Linux Sound Architecture (ALSA) utilities Name: alsa-utils -Version: 1.0.16 -Release: 3%{?prever_dot}%{?dist} +Version: 1.0.17 +Release: 2%{?prever_dot}%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.alsa-project.org/ @@ -15,8 +15,9 @@ Source4: alsaunmute.c Source5: salsa.1 Source6: alsa-info.sh Source10: alsa.rules -Patch0: alsa-utils-1.0.14-alsaconf.patch +Patch0: alsa-utils-1.0.17-alsaconf.patch Patch1: alsa-utils-1.0.14-statedir.patch +Patch2: alsa-utils-1.0.17-amixer-dbscale.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel >= %{version} BuildRequires: ncurses-devel @@ -31,6 +32,7 @@ Architecture (ALSA). %setup -q -n %{name}-%{version}%{?prever} %patch0 -p1 %patch1 -p1 -b .statedir +%patch2 -p1 -b .amixerdbscale %build %configure CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" --sbindir=/sbin @@ -88,6 +90,12 @@ install -p -m 755 %{SOURCE6} $RPM_BUILD_ROOT/usr/bin/alsa-info %changelog +* Fri Sep 12 2008 Jaroslav Kysela 1.0.17-2 +- updated to 1.0.17 final + +* Thu Jun 19 2008 Jaroslav Kysela 1.0.17-1.rc2 +- updated to 1.0.17rc2 + * Mon Apr 28 2008 Martin Stransky 1.0.16-3 - Added alsa-info.sh script to /usr/bin/alsa-info diff --git a/alsa.rules b/alsa.rules index 680a171..48794bc 100644 --- a/alsa.rules +++ b/alsa.rules @@ -1,2 +1,2 @@ -SUBSYSTEM=="sound", KERNEL=="controlC*" RUN+="/sbin/salsa" -SUBSYSTEM=="sound", KERNEL=="pcm*" RUN+="/sbin/salsa" \ No newline at end of file +SUBSYSTEM=="sound", KERNEL=="controlC*", RUN+="/sbin/salsa" +SUBSYSTEM=="sound", KERNEL=="pcm*", RUN+="/sbin/salsa" diff --git a/sources b/sources index ca7b5d2..bc8e96e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b9f803f45e6988bb27a6bed521a949fc alsa-utils-1.0.16.tar.bz2 +14ccd0c900bf663afb36eac6f92d41d6 alsa-utils-1.0.17.tar.bz2