Skip to contentSkip to conversation

gst1-plugins-base: update configure options

PATCH Superseded Peter Seiderer 2 participants 3 messages Oct 13, 2015 – Oct 15, 2015

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Peter Seiderer

author
#0 lore raw

PATCH v2 1/1 gst1-plugins-base: update configure options

- add new gio_unix_2_0 option

Signed-off-by Peter Seiderer <[email protected]>

---
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(+)
package/gstreamer1/gst1-plugins-base/Config.in +5 -0
index 44367eb..d91f56e 100644
@@ -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
package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +6 -0
index 08ebe03..f391530 100644
@@ -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))
Signature · 1 line
2.1.4
#1 lore raw

PATCH v2 1/1 gst1-plugins-base: update configure options

Dear Peter Seiderer,

Quoted 11 lines · Peter Seiderer
package/gstreamer1/gst1-plugins-base/Config.in +5 -0
+config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_GIO_UNIX_2_0
+	bool "gio-unix-2.0"
+	help
+	  glib GIO unix plugin
+
 endif
package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +0 -0
index 08ebe03..f391530 100644

package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk else · line 209

Quoted 8 lines
package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +5 -0
@@ -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

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#2 lore raw

PATCH v2 1/1 gst1-plugins-base: update configure options

Hello Thomas,

Quoted 42 lines · Thomas Petazzoni

Dear Peter Seiderer,

Quoted 11 lines · Peter Seiderer
package/gstreamer1/gst1-plugins-base/Config.in +5 -0
+config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_GIO_UNIX_2_0
+	bool "gio-unix-2.0"
+	help
+	  glib GIO unix plugin
+
 endif
package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +0 -0
index 08ebe03..f391530 100644

package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk else · line 209

Quoted 8 lines
package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +5 -0
@@ -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)
])

Quoted 6 lines

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

Quoted 3 lines

Thanks,

Thomas