summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2010-09-07 11:57:12 +0000
committerPacho Ramos <pacho@gentoo.org>2010-09-07 11:57:12 +0000
commit1b35189b0278d761ec722f0c292dcecac28cc12a (patch)
tree715663f7f4e3fa3c288635aeccfa05f479a13e0f /media-sound/alsa-utils/files
parentRespect LDFLAGS wrt bug 336348. Thanks to Diego for the report. Add proper pt... (diff)
downloadgentoo-2-1b35189b0278d761ec722f0c292dcecac28cc12a.tar.gz
gentoo-2-1b35189b0278d761ec722f0c292dcecac28cc12a.tar.bz2
gentoo-2-1b35189b0278d761ec722f0c292dcecac28cc12a.zip
Revision bump to fix bug #299362 following upstream indications and applying upstream patches that will be included in 1.0.24.
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'media-sound/alsa-utils/files')
-rw-r--r--media-sound/alsa-utils/files/alsa-utils-1.0.23-alsactl-output.patch15
-rw-r--r--media-sound/alsa-utils/files/alsa-utils-1.0.23-alsactl-output2.patch15
2 files changed, 30 insertions, 0 deletions
diff --git a/media-sound/alsa-utils/files/alsa-utils-1.0.23-alsactl-output.patch b/media-sound/alsa-utils/files/alsa-utils-1.0.23-alsactl-output.patch
new file mode 100644
index 000000000000..40e76d8dd3ed
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsa-utils-1.0.23-alsactl-output.patch
@@ -0,0 +1,15 @@
+X-Git-Url: http://git.alsa-project.org/?p=alsa-utils.git;a=blobdiff_plain;f=alsactl%2Finit%2F00main;fp=alsactl%2Finit%2F00main;h=fb7f02cecabdc363bfb47ccdd6141415aa904f65;hp=2d26bbf1b8ff8f29a311e2fc4df25592e48fd3a0;hb=dcb90a779e74315596a4cdb4741983b21cba69c9;hpb=bb865dc10b6dcee9d428d3c5a17ee312e0aaf7e0
+
+diff --git a/alsactl/init/00main b/alsactl/init/00main
+index 2d26bbf..fb7f02c 100644
+--- a/alsactl/init/00main
++++ b/alsactl/init/00main
+@@ -37,7 +37,7 @@ CARDINFO{driver}=="Test", INCLUDE="test", GOTO="init_end"
+ LABEL="init_end"
+ ACCESS=="postinit", INCLUDE="postinit"
+ RESULT=="true", GOTO="00_mainend"
+-ERROR="Unknown hardware: \"$cardinfo{driver}\" \"$cardinfo{mixername}\" \"$cardinfo{components}\" \"$attr{subsystem_vendor}\" \"$attr{subsystem_device}\"\n"
++ERROR="Found hardware: \"$cardinfo{driver}\" \"$cardinfo{mixername}\" \"$cardinfo{components}\" \"$attr{subsystem_vendor}\" \"$attr{subsystem_device}\"\n"
+ ERROR="Hardware is initialized using a guess method\n"
+ INCLUDE="default"
+ EXIT="99"
diff --git a/media-sound/alsa-utils/files/alsa-utils-1.0.23-alsactl-output2.patch b/media-sound/alsa-utils/files/alsa-utils-1.0.23-alsactl-output2.patch
new file mode 100644
index 000000000000..e062c942b74b
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsa-utils-1.0.23-alsactl-output2.patch
@@ -0,0 +1,15 @@
+X-Git-Url: http://git.alsa-project.org/?p=alsa-utils.git;a=blobdiff_plain;f=alsactl%2Finit%2F00main;fp=alsactl%2Finit%2F00main;h=660df389f3339688b0baabe3af1533fe5ced2647;hp=fb7f02cecabdc363bfb47ccdd6141415aa904f65;hb=7f6a55e203e2bb069c35006b605e1a19cfcd88cb;hpb=dcb90a779e74315596a4cdb4741983b21cba69c9
+
+diff --git a/alsactl/init/00main b/alsactl/init/00main
+index fb7f02c..660df38 100644
+--- a/alsactl/init/00main
++++ b/alsactl/init/00main
+@@ -38,7 +38,7 @@ LABEL="init_end"
+ ACCESS=="postinit", INCLUDE="postinit"
+ RESULT=="true", GOTO="00_mainend"
+ ERROR="Found hardware: \"$cardinfo{driver}\" \"$cardinfo{mixername}\" \"$cardinfo{components}\" \"$attr{subsystem_vendor}\" \"$attr{subsystem_device}\"\n"
+-ERROR="Hardware is initialized using a guess method\n"
++ERROR="Hardware is initialized using a generic method\n"
+ INCLUDE="default"
+ EXIT="99"
+