Patchwork gst-plugins-base: make alsa plug-in configurable

login
register
mail settings
Submitter Sven Neumann
Date Dec. 20, 2012, 10:49 a.m.
Message ID <1356000566-32423-1-git-send-email-s.neumann@raumfeld.com>
Download mbox | patch
Permalink /patch/207648/
State Accepted
Headers show

Comments

Sven Neumann - Dec. 20, 2012, 10:49 a.m.
It may be desirable not to use the alsa sink for playback
even though alsa-lib is installed. So make this a configuration
option. This also takes care of selecting the proper options
for alsa-lib
(BR2_PACKAGE_ALSA_LIB_MIXER and BR2_PACKAGE_ALSA_LIB_PCM).

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
---
 package/multimedia/gst-plugins-base/Config.in           |    6 ++++++
 package/multimedia/gst-plugins-base/gst-plugins-base.mk |    3 +--
 2 files changed, 7 insertions(+), 2 deletions(-)
Peter Korsgaard - Jan. 5, 2013, 11:56 a.m.
>>>>> "Sven" == Sven Neumann <s.neumann@raumfeld.com> writes:

 Sven> It may be desirable not to use the alsa sink for playback
 Sven> even though alsa-lib is installed. So make this a configuration
 Sven> option. This also takes care of selecting the proper options
 Sven> for alsa-lib
 Sven> (BR2_PACKAGE_ALSA_LIB_MIXER and BR2_PACKAGE_ALSA_LIB_PCM).

 Sven> Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
 Sven> ---
 Sven>  package/multimedia/gst-plugins-base/Config.in           |    6 ++++++
 Sven>  package/multimedia/gst-plugins-base/gst-plugins-base.mk |    3 +--
 Sven>  2 files changed, 7 insertions(+), 2 deletions(-)

 Sven> diff --git a/package/multimedia/gst-plugins-base/Config.in b/package/multimedia/gst-plugins-base/Config.in
 Sven> index 5d82533..70d664d 100644
 Sven> --- a/package/multimedia/gst-plugins-base/Config.in
 Sven> +++ b/package/multimedia/gst-plugins-base/Config.in
 Sven> @@ -73,6 +73,12 @@ config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VOLUME
 
 Sven>  comment "plugins with external dependencies (there may be more available)"
 
 Sven> +config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_ALSA
 Sven> +	bool "alsa (mandatory for audio playback)"
 Sven> +        select BR2_PACKAGE_ALSA_LIB
 Sven> +        select BR2_PACKAGE_ALSA_LIB_MIXER
 Sven> +        select BR2_PACKAGE_ALSA_LIB_PCM

select lines should also be indented with <tab>. I've fixed that and
committed, thanks.

Patch

diff --git a/package/multimedia/gst-plugins-base/Config.in b/package/multimedia/gst-plugins-base/Config.in
index 5d82533..70d664d 100644
--- a/package/multimedia/gst-plugins-base/Config.in
+++ b/package/multimedia/gst-plugins-base/Config.in
@@ -73,6 +73,12 @@  config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VOLUME
 
 comment "plugins with external dependencies (there may be more available)"
 
+config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_ALSA
+	bool "alsa (mandatory for audio playback)"
+        select BR2_PACKAGE_ALSA_LIB
+        select BR2_PACKAGE_ALSA_LIB_MIXER
+        select BR2_PACKAGE_ALSA_LIB_PCM
+
 config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_OGG
 	bool "ogg (*.ogg audio/video)"
 	select BR2_PACKAGE_LIBOGG
diff --git a/package/multimedia/gst-plugins-base/gst-plugins-base.mk b/package/multimedia/gst-plugins-base/gst-plugins-base.mk
index b044516..02e7ca4 100644
--- a/package/multimedia/gst-plugins-base/gst-plugins-base.mk
+++ b/package/multimedia/gst-plugins-base/gst-plugins-base.mk
@@ -40,8 +40,7 @@  ifeq ($(BR2_PACKAGE_ORC),y)
 GST_PLUGINS_BASE_DEPENDENCIES += orc
 endif
 
-# alsa support needs pcm+mixer support, but configure fails to check for it
-ifeq ($(BR2_PACKAGE_ALSA_LIB)$(BR2_PACKAGE_ALSA_LIB_MIXER)$(BR2_PACKAGE_ALSA_LIB_PCM),yyy)
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_ALSA),y)
 GST_PLUGINS_BASE_DEPENDENCIES += alsa-lib
 else
 GST_PLUGINS_BASE_CONF_OPT += --disable-alsa