Hello community, here is the log from the commit of package alsa-utils for openSUSE:Factory checked in at Tue Oct 18 13:56:43 CEST 2011.
-------- --- openSUSE:Factory/alsa-utils/alsa-utils.changes 2011-09-23 01:51:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/alsa-utils/alsa-utils.changes 2011-09-20 09:58:25.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Sep 20 09:47:45 CEST 2011 - [email protected] + +- Backport upstream fixes + - Increase the max channels of aplay to 256. + - Fix sed usage in Makefile.am + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- 0019-aplay-increase-channel-limit-to-256.patch 0020-fix-use-of-SED.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa-utils.spec ++++++ --- /var/tmp/diff_new_pack.4kPZXp/_old 2011-10-18 13:56:39.000000000 +0200 +++ /var/tmp/diff_new_pack.4kPZXp/_new 2011-10-18 13:56:39.000000000 +0200 @@ -53,8 +53,9 @@ Patch16: 0016-aplay-Use-standard-endian-convesions.patch Patch17: 0017-speaker-test.1-Clarify-man-page-by-giving-examples.patch Patch18: 0018-alsa-utils-amixer-Fix-SND_CTL_TLVT_DB_RANGE-handling.patch +Patch19: 0019-aplay-increase-channel-limit-to-256.patch +Patch20: 0020-fix-use-of-SED.patch Patch99: alsa-utils-gettext-version-removal.diff -# Patch100: alsa-utils-po-pre-patch.diff Url: http://www.alsa-project.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -66,10 +67,8 @@ %setup -q -n %{name}-%{package_version} # fix stupid automake's automatic action sed -i -e's/EXTRA_DIST= config.rpath /EXTRA_DIST=/' Makefile.am -# fix po changes in tarball first -# %%patch100 -p1 # rm -f po/Makefile* po/*.gmo po/*.pot po/*.header po/stamp-* -# %%patch -p1 +# patch -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 @@ -87,6 +86,8 @@ %patch16 -p1 %patch17 -p1 %patch18 -p1 +%patch19 -p1 +%patch20 -p1 %if %suse_version < 1020 %patch99 -p1 %endif ++++++ 0019-aplay-increase-channel-limit-to-256.patch ++++++ >From 0131ab6a67e18ae3c30b7b3fabc2fdf1592f075c Mon Sep 17 00:00:00 2001 From: Tim Blechmann <[email protected]> Date: Wed, 29 Jun 2011 09:44:06 +0200 Subject: [PATCH] aplay: increase channel limit to 256 aplay is limited to 32 channels, which makes it impossible to use it for testing devices with more channels. here we increase the limit to 256, which should be sufficient for a virtual device made of 4 64-channel soundcards. Signed-off-by: Tim Blechmann <[email protected]> Signed-off-by: Jaroslav Kysela <[email protected]> --- aplay/aplay.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aplay/aplay.c b/aplay/aplay.c index 50e01ef..07e6bc0 100644 --- a/aplay/aplay.c +++ b/aplay/aplay.c @@ -526,7 +526,7 @@ int main(int argc, char *argv[]) break; case 'c': rhwparams.channels = strtol(optarg, NULL, 0); - if (rhwparams.channels < 1 || rhwparams.channels > 32) { + if (rhwparams.channels < 1 || rhwparams.channels > 256) { error(_("value %i for channels is invalid"), rhwparams.channels); return 1; } @@ -1015,7 +1015,7 @@ static int test_au(int fd, void *buffer) if (hwparams.rate < 2000 || hwparams.rate > 256000) return -1; hwparams.channels = BE_INT(ap->channels); - if (hwparams.channels < 1 || hwparams.channels > 128) + if (hwparams.channels < 1 || hwparams.channels > 256) return -1; if ((size_t)safe_read(fd, buffer + sizeof(AuHeader), BE_INT(ap->hdr_size) - sizeof(AuHeader)) != BE_INT(ap->hdr_size) - sizeof(AuHeader)) { error(_("read error")); -- 1.7.6.1 ++++++ 0020-fix-use-of-SED.patch ++++++ >From e80b015689ce7a632c8cf57a29bd703eef4edbbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <[email protected]> Date: Wed, 31 Aug 2011 22:27:10 +0200 Subject: [PATCH] fix use of $(SED) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The alsactl Makefile used 'sed $(SED)' which is going to failed when SED is actually set. Replaced that with '$(SED)', and a few 'sed' calls in alsaconf Makefile as well. Added AC_PROG_SED to configure to have it set. Fixes: https://bugtrack.alsa-project.org/alsa-bug/view.php?id=5363 Fixes: http://bugs.gentoo.org/show_bug.cgi?id=366587 Signed-off-by: Michał Górny <[email protected]> Signed-off-by: Clemens Ladisch <[email protected]> --- alsaconf/Makefile.am | 16 ++++++++-------- alsactl/Makefile.am | 2 +- configure.in | 1 + 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/alsaconf/Makefile.am b/alsaconf/Makefile.am index a11ecc5..a4f5e4a 100644 --- a/alsaconf/Makefile.am +++ b/alsaconf/Makefile.am @@ -5,13 +5,13 @@ SUBDIRS = po install-man8: @for i in $(man_MANS); do \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - inst=`echo $$i | sed -e 's/\\.[^.]*$$//'`; \ + ext=`echo $$i | $(SED) -e 's/^.*\\.//'`; \ + inst=`echo $$i | $(SED) -e 's/\\.[^.]*$$//'`; \ case $$inst in \ *.[a-za-z]*)\ - loc=`echo $$inst | sed -e 's/^.*\\.//'`; \ + loc=`echo $$inst | $(SED) -e 's/^.*\\.//'`; \ loc="/$$loc"; \ - inst=`echo $$inst | sed -e 's/\\.[^.]*$$//'`;; \ + inst=`echo $$inst | $(SED) -e 's/\\.[^.]*$$//'`;; \ *)\ loc="";; \ esac; \ @@ -22,13 +22,13 @@ install-man8: uninstall-man8: @for i in $(man_MANS); do \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - inst=`echo $$i | sed -e 's/\\.[^.]*$$//'`; \ + ext=`echo $$i | $(SED) -e 's/^.*\\.//'`; \ + inst=`echo $$i | $(SED) -e 's/\\.[^.]*$$//'`; \ case $$inst in \ *.[a-za-z]*)\ - loc=`echo $$inst | sed -e 's/^.*\\.//'`; \ + loc=`echo $$inst | $(SED) -e 's/^.*\\.//'`; \ loc="/$$loc"; \ - inst=`echo $$inst | sed -e 's/\\.[^.]*$$//'`;; \ + inst=`echo $$inst | $(SED) -e 's/\\.[^.]*$$//'`;; \ *)\ loc="";; \ esac; \ diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am index 5cfc415..c434e44 100644 --- a/alsactl/Makefile.am +++ b/alsactl/Makefile.am @@ -34,7 +34,7 @@ install-data-hook: endif edit = \ - sed $(SED) -r 's,@sbindir\@,$(sbindir),g' < $< > $@ || rm $@ + $(SED) -r 's,@sbindir\@,$(sbindir),g' < $< > $@ || rm $@ alsa-store.service: alsa-store.service.in $(edit) diff --git a/configure.in b/configure.in index 9ec1fac..b28af80 100644 --- a/configure.in +++ b/configure.in @@ -28,6 +28,7 @@ dnl AC_PROG_CXX AC_PROG_INSTALL AC_PROG_MKDIR_P AC_PROG_LN_S +AC_PROG_SED AM_PATH_ALSA(1.0.16) dnl Check components -- 1.7.6.1 continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
