diff mbox

[v2] gst1-plugins-base: update configure options

Message ID 1444773987-19382-1-git-send-email-ps.report@gmx.net
State Changes Requested
Headers show

Commit Message

Peter Seiderer Oct. 13, 2015, 10:06 p.m. UTC
- add new gio_unix_2_0 option

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
Changes v1 -> v2:
  - change gio_unix_2_0 from disabled to option (needed library
    already provided by libglib2 package) (suggested by Thomas Petazzoni)
---
 package/gstreamer1/gst1-plugins-base/Config.in            | 5 +++++
 package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 6 ++++++
 2 files changed, 11 insertions(+)

Comments

Thomas Petazzoni Oct. 14, 2015, 8:40 p.m. UTC | #1
Dear Peter Seiderer,

On Wed, 14 Oct 2015 00:06:27 +0200, Peter Seiderer wrote:

> +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_GIO_UNIX_2_0
> +	bool "gio-unix-2.0"
> +	help
> +	  glib GIO unix plugin
> +
>  endif
> diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
> index 08ebe03..f391530 100644
> --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
> +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
> @@ -202,4 +202,10 @@ else
>  GST1_PLUGINS_BASE_CONF_OPTS += --disable-vorbis
>  endif
>  
> +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_GIO_UNIX_2_0),y)
> +GST1_PLUGINS_BASE_CONF_OPTS += --enable-gio_unix_2_0
> +else
> +GST1_PLUGINS_BASE_CONF_OPTS += --disable-gio_unix_2_0
> +endif

This is still not good I believe. You're confusing --disable-gio and
--disable-gio_unix_2_0. According ./configure --help:

  --disable-gio           disable dependency-less gio plugin
  --disable-gio_unix_2_0       disable glib GIO unix: gio-unix-2.0

So the option that enables/disables the gio plugin (as indicated by
your Config.in option help text) is --disable-gio.

On the other hand, --disable-gio_unix_2_0 is only used for this (from
configure.ac):

dnl *** gio-unix-2.0 for tests/check/pipelines/tcp.c ***
translit(dnm, m, l) AM_CONDITIONAL(USE_GIO_UNIX_2_0, true)
AG_GST_CHECK_FEATURE(GIO_UNIX_2_0, [glib GIO unix], gio-unix-2.0, [
  AG_GST_PKG_CHECK_MODULES(GIO_UNIX_2_0, gio-unix-2.0 >= 2.24)
])

So I believe we don't really care about gio_unix_2_0, it's only used
for tests. We could just as well pass --disable-gio_unix_2_0
unconditionally, and have an option
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_GIO to enable/disable the gio
plugin.

Thanks,

Thomas
Peter Seiderer Oct. 15, 2015, 7:12 p.m. UTC | #2
Hello Thomas,

On Wed, 14 Oct 2015 22:40:11 +0200, Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote:

> Dear Peter Seiderer,
> 
> On Wed, 14 Oct 2015 00:06:27 +0200, Peter Seiderer wrote:
> 
> > +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_GIO_UNIX_2_0
> > +	bool "gio-unix-2.0"
> > +	help
> > +	  glib GIO unix plugin
> > +
> >  endif
> > diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
> > index 08ebe03..f391530 100644
> > --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
> > +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
> > @@ -202,4 +202,10 @@ else
> >  GST1_PLUGINS_BASE_CONF_OPTS += --disable-vorbis
> >  endif
> >  
> > +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_GIO_UNIX_2_0),y)
> > +GST1_PLUGINS_BASE_CONF_OPTS += --enable-gio_unix_2_0
> > +else
> > +GST1_PLUGINS_BASE_CONF_OPTS += --disable-gio_unix_2_0
> > +endif
> 
> This is still not good I believe. You're confusing --disable-gio and
> --disable-gio_unix_2_0. According ./configure --help:
> 
>   --disable-gio           disable dependency-less gio plugin
>   --disable-gio_unix_2_0       disable glib GIO unix: gio-unix-2.0
> 
> So the option that enables/disables the gio plugin (as indicated by
> your Config.in option help text) is --disable-gio.
> 
> On the other hand, --disable-gio_unix_2_0 is only used for this (from
> configure.ac):
> 
> dnl *** gio-unix-2.0 for tests/check/pipelines/tcp.c ***
> translit(dnm, m, l) AM_CONDITIONAL(USE_GIO_UNIX_2_0, true)
> AG_GST_CHECK_FEATURE(GIO_UNIX_2_0, [glib GIO unix], gio-unix-2.0, [
>   AG_GST_PKG_CHECK_MODULES(GIO_UNIX_2_0, gio-unix-2.0 >= 2.24)
> ])
> 
> So I believe we don't really care about gio_unix_2_0, it's only used
> for tests. We could just as well pass --disable-gio_unix_2_0
> unconditionally, and have an option
> BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_GIO to enable/disable the gio
> plugin.
>

...did mostly concentrate on the 'configure --help' diff between 1.4.5 and
1.6.0 version..., but will fix it in the next patch version...

Regards,
Peter

 
> Thanks,
> 
> Thomas
diff mbox

Patch

diff --git a/package/gstreamer1/gst1-plugins-base/Config.in b/package/gstreamer1/gst1-plugins-base/Config.in
index 44367eb..d91f56e 100644
--- a/package/gstreamer1/gst1-plugins-base/Config.in
+++ b/package/gstreamer1/gst1-plugins-base/Config.in
@@ -150,4 +150,9 @@  config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VORBIS
 	help
 	  Vorbis plugin library
 
+config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_GIO_UNIX_2_0
+	bool "gio-unix-2.0"
+	help
+	  glib GIO unix plugin
+
 endif
diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
index 08ebe03..f391530 100644
--- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
+++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
@@ -202,4 +202,10 @@  else
 GST1_PLUGINS_BASE_CONF_OPTS += --disable-vorbis
 endif
 
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_GIO_UNIX_2_0),y)
+GST1_PLUGINS_BASE_CONF_OPTS += --enable-gio_unix_2_0
+else
+GST1_PLUGINS_BASE_CONF_OPTS += --disable-gio_unix_2_0
+endif
+
 $(eval $(autotools-package))