Accepting request 246485 from multimedia:libs
1 OBS-URL: https://build.opensuse.org/request/show/246485 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/alsa-utils?expand=0&rev=92
This commit is contained in:
Stephan Kulow
Git OBS Bridge
commit
f2a95b7b28
@ -0,0 +1,32 @@
|
||||
From 4f569affc420579a1a6e44cf51d7a1e64d6cd8d3 Mon Sep 17 00:00:00 2001
|
||||
From: David Henningsson <david.henningsson@canonical.com>
|
||||
Date: Fri, 22 Aug 2014 10:31:40 +0200
|
||||
Subject: [PATCH] alsa-info: Make sure all full script is run even with
|
||||
"output" option
|
||||
|
||||
For some reason, when the --output option is used, less information
|
||||
is included compared to when no options are used. This is unexpected.
|
||||
|
||||
Fix this by running "withall" also when the output option is used.
|
||||
|
||||
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
|
||||
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
||||
---
|
||||
alsa-info/alsa-info.sh | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/alsa-info/alsa-info.sh b/alsa-info/alsa-info.sh
|
||||
index 859d7bca6b1c..47157f06b159 100755
|
||||
--- a/alsa-info/alsa-info.sh
|
||||
+++ b/alsa-info/alsa-info.sh
|
||||
@@ -661,6 +661,7 @@ if [ -n "$1" ]; then
|
||||
shift
|
||||
NFILE="$1"
|
||||
KEEP_OUTPUT="yes"
|
||||
+ withall
|
||||
;;
|
||||
--debug)
|
||||
echo "Debugging enabled. $FILE and $TEMPDIR will not be deleted"
|
||||
--
|
||||
2.1.0
|
||||
|
||||
130
0006-alsa-info-Refactor-withall-logic.patch
Normal file
130
0006-alsa-info-Refactor-withall-logic.patch
Normal file
@ -0,0 +1,130 @@
|
||||
From 808af5fdb00be048b485c3ea3f5a5081b99dae30 Mon Sep 17 00:00:00 2001
|
||||
From: David Henningsson <david.henningsson@canonical.com>
|
||||
Date: Fri, 22 Aug 2014 10:31:41 +0200
|
||||
Subject: [PATCH] alsa-info: Refactor "withall" logic
|
||||
|
||||
Previously, using --output, --no-upload, --upload and --pastebin
|
||||
switches implied the withall switch.
|
||||
|
||||
A more intuitive logic would be that --with-all is disabled if you
|
||||
use another --with* switch, such as --withdmesg, and only then.
|
||||
|
||||
Also update script version to reflect the behaviour change.
|
||||
|
||||
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
|
||||
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
||||
---
|
||||
alsa-info/alsa-info.sh | 23 +++++++++++++++--------
|
||||
1 file changed, 15 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/alsa-info/alsa-info.sh b/alsa-info/alsa-info.sh
|
||||
index 47157f06b159..acd849588141 100755
|
||||
--- a/alsa-info/alsa-info.sh
|
||||
+++ b/alsa-info/alsa-info.sh
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/bin/bash
|
||||
|
||||
-SCRIPT_VERSION=0.4.63
|
||||
+SCRIPT_VERSION=0.4.64
|
||||
CHANGELOG="http://www.alsa-project.org/alsa-info.sh.changelog"
|
||||
|
||||
#################################################################################
|
||||
@@ -260,6 +260,7 @@ withall() {
|
||||
withlsmod
|
||||
withsysfs
|
||||
withdmesg
|
||||
+ WITHALL="no"
|
||||
}
|
||||
|
||||
get_alsa_library_version() {
|
||||
@@ -629,7 +630,6 @@ fi
|
||||
#If no command line options are specified, then run as though --with-all was specified
|
||||
if [ -z "$1" ]; then
|
||||
update
|
||||
- withall
|
||||
pbcheck
|
||||
fi
|
||||
|
||||
@@ -642,7 +642,6 @@ if [ -n "$1" ]; then
|
||||
case "$1" in
|
||||
--pastebin)
|
||||
update
|
||||
- withall
|
||||
pbcheck
|
||||
;;
|
||||
--update)
|
||||
@@ -651,43 +650,45 @@ if [ -n "$1" ]; then
|
||||
;;
|
||||
--upload)
|
||||
UPLOAD="yes"
|
||||
- withall
|
||||
;;
|
||||
--no-upload)
|
||||
UPLOAD="no"
|
||||
- withall
|
||||
;;
|
||||
--output)
|
||||
shift
|
||||
NFILE="$1"
|
||||
KEEP_OUTPUT="yes"
|
||||
- withall
|
||||
;;
|
||||
--debug)
|
||||
echo "Debugging enabled. $FILE and $TEMPDIR will not be deleted"
|
||||
KEEP_FILES="yes"
|
||||
echo ""
|
||||
- withall
|
||||
;;
|
||||
--with-all)
|
||||
withall
|
||||
;;
|
||||
--with-aplay)
|
||||
withaplay
|
||||
+ WITHALL="no"
|
||||
;;
|
||||
--with-amixer)
|
||||
withamixer
|
||||
+ WITHALL="no"
|
||||
;;
|
||||
--with-alsactl)
|
||||
withalsactl
|
||||
+ WITHALL="no"
|
||||
;;
|
||||
--with-devices)
|
||||
withdevices
|
||||
+ WITHALL="no"
|
||||
;;
|
||||
--with-dmesg)
|
||||
withdmesg
|
||||
+ WITHALL="no"
|
||||
;;
|
||||
--with-configs)
|
||||
+ WITHALL="no"
|
||||
if [[ -e $HOME/.asoundrc ]] || [[ -e /etc/asound.conf ]]
|
||||
then
|
||||
echo "!!ALSA configuration files" >> $FILE
|
||||
@@ -717,7 +718,9 @@ if [ -n "$1" ]; then
|
||||
;;
|
||||
--stdout)
|
||||
UPLOAD="no"
|
||||
- withall
|
||||
+ if [ -z "$WITHALL" ]; then
|
||||
+ withall
|
||||
+ fi
|
||||
cat $FILE
|
||||
rm $FILE
|
||||
;;
|
||||
@@ -766,6 +769,10 @@ if [ "$PROCEED" = "no" ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
+if [ -z "$WITHALL" ]; then
|
||||
+ withall
|
||||
+fi
|
||||
+
|
||||
if [ "$UPLOAD" = "ask" ]; then
|
||||
if [ -n "$DIALOG" ]; then
|
||||
dialog --backtitle "$BGTITLE" --title "Information collected" --yes-label " UPLOAD / SHARE " --no-label " SAVE LOCALLY " --defaultno --yesno "\n\nAutomatically upload ALSA information to $WWWSERVICE?" 10 80
|
||||
--
|
||||
2.1.0
|
||||
|
||||
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 26 12:46:20 CEST 2014 - tiwai@suse.de
|
||||
|
||||
- alsa-info.sh updates to 0.4.64: run withall also when --output
|
||||
is given
|
||||
0005-alsa-info-Make-sure-all-full-script-is-run-even-with.patch
|
||||
0006-alsa-info-Refactor-withall-logic.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 12 16:07:04 CEST 2014 - tiwai@suse.de
|
||||
|
||||
|
||||
@ -49,6 +49,8 @@ Patch1: 0001-alsactl-save-state-do-not-call-rename-for-stdio.patch
|
||||
Patch2: 0002-alsamixer-include-missing-mixer_controls.h.patch
|
||||
Patch3: 0003-Add-alsa-info.sh-to-alsa-utils-repo.patch
|
||||
Patch4: 0004-Add-missing-alsa-info-entry-to-the-root-Makefile.am.patch
|
||||
Patch5: 0005-alsa-info-Make-sure-all-full-script-is-run-even-with.patch
|
||||
Patch6: 0006-alsa-info-Refactor-withall-logic.patch
|
||||
#
|
||||
Patch99: alsa-utils-gettext-version-removal.diff
|
||||
BuildRequires: alsa-devel
|
||||
@ -80,6 +82,8 @@ sed -i -e's/EXTRA_DIST= config.rpath /EXTRA_DIST=/' Makefile.am
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
#
|
||||
%if 0%{?suse_version} < 1020
|
||||
%patch99 -p1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user