[gentoo-commits] repo/gentoo:master commit in: media-plugins/alsa-plugins/files/

[gentoo-commits] repo/gentoo:master commit in: media-plugins/alsa-plugins/files/

[Lars Wendler]

commit:     f2a9db12cc9f77bd87a3c79dc20e2de4117a1c3b
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 18 15:12:47 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Feb 18 15:12:47 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2a9db12

media-plugins/alsa-plugins: Use git formatted patch.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 .../alsa-plugins-1.1.5-optional_plugins.patch      | 26 +++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/media-plugins/alsa-plugins/files/alsa-plugins-1.1.5-optional_plugins.patch b/media-plugins/alsa-plugins/files/alsa-plugins-1.1.5-optional_plugins.patch
index 3ede79860f6..cb232b2da6f 100644
--- a/media-plugins/alsa-plugins/files/alsa-plugins-1.1.5-optional_plugins.patch
+++ b/media-plugins/alsa-plugins/files/alsa-plugins-1.1.5-optional_plugins.patch
@@ -1,15 +1,28 @@
-Alsa upstream added a couple of configure options to disable some plugins but
-forgot to reflect these changes in Makefile.am.
+From 565cfc8800c2e7a122f6574f67a7da8f1165e34d Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Sun, 18 Feb 2018 16:00:39 +0100
+Subject: [PATCH] Makefile.am: Add missing code for enhanced configure option
+ of alsa plugins
 
---- alsa-plugins-1.1.5/Makefile.am
-+++ alsa-plugins-1.1.5/Makefile.am
+Commit 1201e158fb00bf15c353d088c94c1cb3eff9653c added the pieces for
+configure but did not do the same for Makefile.
+As result all plugins were still built regardless of corresponding
+--disable-* option being called with configure.
+---
+ Makefile.am | 14 +++++++++++++-
+ 1 file changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 69cfe0d..76cefef 100644
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -1,4 +1,4 @@
 -SUBDIRS = oss mix usb_stream arcam-av doc
 +SUBDIRS = doc
  if HAVE_JACK
  SUBDIRS += jack
  endif
-@@ -20,6 +20,18 @@
+@@ -20,6 +20,18 @@ endif
  if HAVE_SPEEXDSP
  SUBDIRS += speex
  endif
@@ -28,3 +41,6 @@ forgot to reflect these changes in Makefile.am.
  
  EXTRA_DIST = gitcompile version COPYING.GPL m4/attributes.m4
  AUTOMAKE_OPTIONS = foreign
+-- 
+2.16.2
+

[gentoo-commits] repo/gentoo:master commit in: media-plugins/alsa-plugins/files/

[Michael Palimaka]

commit:     42746c5d56a6e31a05789f65f335539698aa7535
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri May 17 18:28:59 2019 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun May 19 00:20:23 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42746c5d

media-plugins/alsa-plugins: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/12035
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Michael Palimaka <kensington <AT> gentoo.org>

 .../files/alsa-plugins-1.1.7-double_free_fix.patch | 34 ----------------------
 1 file changed, 34 deletions(-)

diff --git a/media-plugins/alsa-plugins/files/alsa-plugins-1.1.7-double_free_fix.patch b/media-plugins/alsa-plugins/files/alsa-plugins-1.1.7-double_free_fix.patch
deleted file mode 100644
index 9b3a81599b3..00000000000
--- a/media-plugins/alsa-plugins/files/alsa-plugins-1.1.7-double_free_fix.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From a4e7e1282c57a2f4e83afe9a4008042d8b4c5bb9 Mon Sep 17 00:00:00 2001
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Tue, 23 Oct 2018 09:32:46 +0200
-Subject: [PATCH] a52_close: set slave to NULL to avoid double pcm free in
- open fcn
-
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
- a52/pcm_a52.c | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/a52/pcm_a52.c b/a52/pcm_a52.c
-index e431fd0..b005bc2 100644
---- a/a52/pcm_a52.c
-+++ b/a52/pcm_a52.c
-@@ -654,10 +654,13 @@ static int a52_poll_revents(snd_pcm_ioplug_t *io, struct pollfd *pfd,
- static int a52_close(snd_pcm_ioplug_t *io)
- {
- 	struct a52_ctx *rec = io->private_data;
-+	snd_pcm_t *slave = rec->slave;
- 
- 	a52_free(rec);
--	if (rec->slave)
--		return snd_pcm_close(rec->slave);
-+	if (slave) {
-+		rec->slave = NULL;
-+		return snd_pcm_close(slave);
-+	}
- 	return 0;
- }
- 			      
--- 
-1.7.11.7
-