diff options
Diffstat (limited to 'media-sound/alsa-utils/files')
4 files changed, 7 insertions, 63 deletions
diff --git a/media-sound/alsa-utils/files/alsa-utils-1.0.26-kmod.patch b/media-sound/alsa-utils/files/alsa-utils-1.0.26-kmod.patch index 991002a71c9e..11f199503556 100644 --- a/media-sound/alsa-utils/files/alsa-utils-1.0.26-kmod.patch +++ b/media-sound/alsa-utils/files/alsa-utils-1.0.26-kmod.patch @@ -6,6 +6,13 @@ be a no-op thesedays. * We have just /etc/modprobe.d; Nothing to do! +however even with this patch, kmod won't work because it doesn't generate the +required modules.pcimap (and propably modules.usbmap) files in /lib/modules +anymore, therefore it's disabled in gentoo since 1.0.27.1 + +editing the dummy /etc/modprobe.d/alsa.conf directly is preferred, forget this +ever existed (was useful helper for ancient PCMCIA and ISA hardware) + --- alsaconf/alsaconf.in +++ alsaconf/alsaconf.in @@ -924,7 +924,7 @@ diff --git a/media-sound/alsa-utils/files/alsa-utils-1.0.27-alsactl.patch b/media-sound/alsa-utils/files/alsa-utils-1.0.27-alsactl.patch deleted file mode 100644 index 3b5a761db492..000000000000 --- a/media-sound/alsa-utils/files/alsa-utils-1.0.27-alsactl.patch +++ /dev/null @@ -1,27 +0,0 @@ -http://bugs.gentoo.org/468160 - -From: Jaroslav Kysela <perex@perex.cz> -Date: Mon, 15 Apr 2013 12:44:13 +0000 (+0200) -Subject: alsactl: Fix the string size for the lock file contents -X-Git-Url: http://git.alsa-project.org/?p=alsa-utils.git;a=commitdiff_plain;h=95788fea25c1a59985828d4b91af0772d077600b - -alsactl: Fix the string size for the lock file contents - -The string length is 10 characters + LF + '\0' = 12 characters. - -Signed-off-by: Jaroslav Kysela <perex@perex.cz> ---- - -diff --git a/alsactl/lock.c b/alsactl/lock.c -index d34d013..fce208b 100644 ---- a/alsactl/lock.c -+++ b/alsactl/lock.c -@@ -35,7 +35,7 @@ static int state_lock_(const char *file, int lock, int timeout) - int fd = -1, err = 0; - struct flock lck; - struct stat st; -- char lcktxt[11]; -+ char lcktxt[12]; - char *nfile; - - if (!do_lock) diff --git a/media-sound/alsa-utils/files/alsa-utils-1.0.27-arecord.patch b/media-sound/alsa-utils/files/alsa-utils-1.0.27-arecord.patch deleted file mode 100644 index f9edb2d21363..000000000000 --- a/media-sound/alsa-utils/files/alsa-utils-1.0.27-arecord.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Jaroslav Kysela <perex@perex.cz> -Date: Wed, 17 Apr 2013 06:34:34 +0000 (+0200) -Subject: arecord: add a missing break to the capture loop -X-Git-Url: http://git.alsa-project.org/?p=alsa-utils.git;a=commitdiff_plain;h=b4f34ac26037c10ac51c4bb29203500165848977 - -arecord: add a missing break to the capture loop - -Signed-off-by: Jaroslav Kysela <perex@perex.cz> ---- - -diff --git a/aplay/aplay.c b/aplay/aplay.c -index 5bdc39c..000d25b 100644 ---- a/aplay/aplay.c -+++ b/aplay/aplay.c -@@ -3021,6 +3021,9 @@ static void capture(char *orig_name) - fd = -1; - } - -+ if (in_aborting) -+ break; -+ - /* repeat the loop when format is raw without timelimit or - * requested counts of data are recorded - */ diff --git a/media-sound/alsa-utils/files/alsa-utils-1.0.27-service.patch b/media-sound/alsa-utils/files/alsa-utils-1.0.27-service.patch deleted file mode 100644 index dfe83e011ddc..000000000000 --- a/media-sound/alsa-utils/files/alsa-utils-1.0.27-service.patch +++ /dev/null @@ -1,12 +0,0 @@ -http://git.alsa-project.org/?p=alsa-utils.git;a=commitdiff;h=3616b1fe3ca603832b2f88abeb722cba2f0dde7e - ---- alsactl/alsa-restore.service.in -+++ alsactl/alsa-restore.service.in -@@ -12,6 +12,6 @@ - Conflicts=shutdown.target - - [Service] --Type=oneshop -+Type=oneshot - ExecStart=-@sbindir@/alsactl restore - StandardOutput=syslog |