Skip to contentSkip to conversation

package/vala/vala-wrapper: fix wrapper

PATCH New aduskett at gmail.com 3 participants 15 messages Mar 27, 2020 – Apr 6, 2020

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/7 package/vala/vala-wrapper: fix wrapper

From: Adam Duskett <[email protected]>

Add double quotes around the $@ variable to prevent globbing.

---
 package/vala/vala-wrapper | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/vala/vala-wrapper +1 -1
index ae2f7ca671..84fc905b9f 100644
@@ -1,2 +1,2 @@
 #!/bin/sh
-$0- at VALA_VERSION@ --vapidir=${STAGING_DIR}/usr/share/vala/vapi --girdir=${STAGING_DIR}/usr/share/gir-1.0 $@
+$0- at VALA_VERSION@ --vapidir=${STAGING_DIR}/usr/share/vala/vapi --girdir=${STAGING_DIR}/usr/share/gir-1.0 "$@"
Signature · 1 line
2.25.1
#1 lore raw

PATCH v3 2/7 package/vala: install wrapper to vapigen

From: Adam Duskett <[email protected]>

when compiling gobject-introspection .gir files, some packages use vapigen to generate a vala-api compatible .gir file. These packages tend to call vapigen directly instead of vala or valac.

Without the wrapper, building the .gir files fail. In the case of for example, gupnp-dlna throws the following error:
"error: Package `Gst-1.0' not found in specified Vala API directories or GObject-Introspection GIR directories."

Installing the vala wrapper to vapigen fixes the above issue.

---
Changes v2 -> v3:
- Add $(HOST_DIR)/bin/vapigen to the sed line.

 package/vala/vala.mk | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
package/vala/vala.mk +5 -2
index b8a69f8c5e..95365faf18 100644
@@ -17,16 +17,19 @@ HOST_VALA_DEPENDENCIES = host-bison host-flex host-libglib2
 HOST_VALA_CONF_ENV = ac_cv_path_XSLTPROC=:
 HOST_VALA_CONF_OPTS += --disable-valadoc
 
-# We wrap vala & valac to point to the proper gir and vapi data dirs
+# We wrap vala, valac and vapigen to point to the proper gir and vapi data dirs
 # Otherwise we'll get host directory data which isn't enough
 define HOST_VALA_INSTALL_WRAPPER
 	$(INSTALL) -D -m 0755 package/vala/vala-wrapper \
 		$(HOST_DIR)/bin/vala
 	$(INSTALL) -D -m 0755 package/vala/vala-wrapper \
 		$(HOST_DIR)/bin/valac
+	$(INSTALL) -D -m 0755 package/vala/vala-wrapper \
+		$(HOST_DIR)/bin/vapigen
 	$(SED) 's, at VALA_VERSION@,$(VALA_VERSION_MAJOR),' \
 		$(HOST_DIR)/bin/vala \
-		$(HOST_DIR)/bin/valac
+		$(HOST_DIR)/bin/valac \
+		$(HOST_DIR)/bin/vapigen
 endef
 HOST_VALA_POST_INSTALL_HOOKS += HOST_VALA_INSTALL_WRAPPER
 
Signature · 1 line
2.25.1
#2 lore raw

PATCH v3 2/7 package/vala: install wrapper to vapigen

On 2020-03-27 11:29 -0700, aduskett at gmail.com spake thusly:

Quoted 6 lines

From: Adam Duskett <[email protected]>

when compiling gobject-introspection .gir files, some packages use vapigen to generate a vala-api compatible .gir file. These packages tend to call vapigen directly instead of vala or valac.

Quoted 8 lines

Without the wrapper, building the .gir files fail. In the case of for example, gupnp-dlna throws the following error:
"error: Package `Gst-1.0' not found in specified Vala API directories or GObject-Introspection GIR directories."

Installing the vala wrapper to vapigen fixes the above issue.

Applied to master with very minor tweaks in the commit log. Thanks!

I haven't applied the rest of the series for now; I've left it pending while I think about it...

Regards,
Yann E. MORIN.

Quoted 40 lines

---
Changes v2 -> v3:
- Add $(HOST_DIR)/bin/vapigen to the sed line.

 package/vala/vala.mk | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
package/vala/vala.mk +5 -2
index b8a69f8c5e..95365faf18 100644
@@ -17,16 +17,19 @@ HOST_VALA_DEPENDENCIES = host-bison host-flex host-libglib2
 HOST_VALA_CONF_ENV = ac_cv_path_XSLTPROC=:
 HOST_VALA_CONF_OPTS += --disable-valadoc
 
-# We wrap vala & valac to point to the proper gir and vapi data dirs
+# We wrap vala, valac and vapigen to point to the proper gir and vapi data dirs
 # Otherwise we'll get host directory data which isn't enough
 define HOST_VALA_INSTALL_WRAPPER
 	$(INSTALL) -D -m 0755 package/vala/vala-wrapper \
 		$(HOST_DIR)/bin/vala
 	$(INSTALL) -D -m 0755 package/vala/vala-wrapper \
 		$(HOST_DIR)/bin/valac
+	$(INSTALL) -D -m 0755 package/vala/vala-wrapper \
+		$(HOST_DIR)/bin/vapigen
 	$(SED) 's, at VALA_VERSION@,$(VALA_VERSION_MAJOR),' \
 		$(HOST_DIR)/bin/vala \
-		$(HOST_DIR)/bin/valac
+		$(HOST_DIR)/bin/valac \
+		$(HOST_DIR)/bin/vapigen
 endef
 HOST_VALA_POST_INSTALL_HOOKS += HOST_VALA_INSTALL_WRAPPER
 
Signature · 6 lines
2.25.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#3 lore raw

PATCH v3 3/7 package/gssdp: enable vala support if gobject-introspection is selected

In reply to aduskett at gmail.com

From: Adam Duskett <[email protected]>

gupnp gobject-introspection support requires gssdp built with vala bindings.

---
 package/gssdp/gssdp.mk | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
package/gssdp/gssdp.mk +4 -6
index bab3cbe0f7..d91c8acda0 100644
@@ -12,15 +12,13 @@ GSSDP_LICENSE = LGPL-2.0+
 GSSDP_LICENSE_FILES = COPYING
 GSSDP_INSTALL_STAGING = YES
 GSSDP_DEPENDENCIES = host-pkgconf libglib2 libsoup
-GSSDP_CONF_OPTS = \
-	-Dexamples=false \
-	-Dvapi=false
+GSSDP_CONF_OPTS = -Dexamples=false
 
 ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
-GSSDP_CONF_OPTS += -Dintrospection=true
-GSSDP_DEPENDENCIES += gobject-introspection
+GSSDP_CONF_OPTS += -Dintrospection=true -Dvapi=true
+GSSDP_DEPENDENCIES += host-vala gobject-introspection
 else
-GSSDP_CONF_OPTS += -Dintrospection=false
+GSSDP_CONF_OPTS += -Dintrospection=false -Dvapi=false
 endif
 
 ifeq ($(BR2_PACKAGE_LIBGTK3),y)
Signature · 1 line
2.25.1
#4 lore raw

PATCH v3 3/7 package/gssdp: enable vala support if gobject-introspection is selected

Adam, all,

On 2020-03-27 11:29 -0700, aduskett at gmail.com spake thusly:

Quoted 5 lines

From: Adam Duskett <[email protected]>

gupnp gobject-introspection support requires gssdp built with vala bindings.

Applied to master with an extended commit log. Thanks! :-)

Regards,
Yann E. MORIN.

Quoted 35 lines
---
 package/gssdp/gssdp.mk | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
package/gssdp/gssdp.mk +4 -6
index bab3cbe0f7..d91c8acda0 100644
@@ -12,15 +12,13 @@ GSSDP_LICENSE = LGPL-2.0+
 GSSDP_LICENSE_FILES = COPYING
 GSSDP_INSTALL_STAGING = YES
 GSSDP_DEPENDENCIES = host-pkgconf libglib2 libsoup
-GSSDP_CONF_OPTS = \
-	-Dexamples=false \
-	-Dvapi=false
+GSSDP_CONF_OPTS = -Dexamples=false
 
 ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
-GSSDP_CONF_OPTS += -Dintrospection=true
-GSSDP_DEPENDENCIES += gobject-introspection
+GSSDP_CONF_OPTS += -Dintrospection=true -Dvapi=true
+GSSDP_DEPENDENCIES += host-vala gobject-introspection
 else
-GSSDP_CONF_OPTS += -Dintrospection=false
+GSSDP_CONF_OPTS += -Dintrospection=false -Dvapi=false
 endif
 
 ifeq ($(BR2_PACKAGE_LIBGTK3),y)
Signature · 6 lines
2.25.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#5 lore raw

PATCH v3 4/7 package/gssdp: bump version to 1.2.2

In reply to aduskett at gmail.com

From: Adam Duskett <[email protected]>

---
 package/gssdp/gssdp.hash | 4 ++--
 package/gssdp/gssdp.mk   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
package/gssdp/gssdp.hash +2 -2
index b389d0205c..325ac00171 100644
@@ -1,5 +1,5 @@
-# Hash from: http://ftp.gnome.org/pub/gnome/sources/gssdp/1.0/gssdp-1.0.3.sha256sum:
-sha256 211387a62bc1d99821dd0333d873a781320287f5436f91e58b2ca145b378be41  gssdp-1.0.3.tar.xz
+# Hash from: http://ftp.gnome.org/pub/gnome/sources/gssdp/1.2/gssdp-1.2.2.sha256sum:
+sha256 cabb9e3b456b8354a55e23eb0207545d974643cda6d623523470ebbc4188b0a4  gssdp-1.2.2.tar.xz
 
 # Hash for license file:
 sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5  COPYING
package/gssdp/gssdp.mk +2 -2
index d91c8acda0..14eec0b5fd 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-GSSDP_VERSION_MAJOR = 1.0
-GSSDP_VERSION = $(GSSDP_VERSION_MAJOR).3
+GSSDP_VERSION_MAJOR = 1.2
+GSSDP_VERSION = $(GSSDP_VERSION_MAJOR).2
 GSSDP_SOURCE = gssdp-$(GSSDP_VERSION).tar.xz
 GSSDP_SITE = http://ftp.gnome.org/pub/gnome/sources/gssdp/$(GSSDP_VERSION_MAJOR)
 GSSDP_LICENSE = LGPL-2.0+
Signature · 1 line
2.25.1
#6 lore raw

PATCH v3 4/7 package/gssdp: bump version to 1.2.2

Adam, All,

On 2020-03-27 11:29 -0700, aduskett at gmail.com spake thusly:

Quoted 3 lines

From: Adam Duskett <[email protected]>

This version bump and the one for gupnp applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 39 lines
---
 package/gssdp/gssdp.hash | 4 ++--
 package/gssdp/gssdp.mk   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
package/gssdp/gssdp.hash +2 -2
index b389d0205c..325ac00171 100644
@@ -1,5 +1,5 @@
-# Hash from: http://ftp.gnome.org/pub/gnome/sources/gssdp/1.0/gssdp-1.0.3.sha256sum:
-sha256 211387a62bc1d99821dd0333d873a781320287f5436f91e58b2ca145b378be41  gssdp-1.0.3.tar.xz
+# Hash from: http://ftp.gnome.org/pub/gnome/sources/gssdp/1.2/gssdp-1.2.2.sha256sum:
+sha256 cabb9e3b456b8354a55e23eb0207545d974643cda6d623523470ebbc4188b0a4  gssdp-1.2.2.tar.xz
 
 # Hash for license file:
 sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5  COPYING
package/gssdp/gssdp.mk +2 -2
index d91c8acda0..14eec0b5fd 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-GSSDP_VERSION_MAJOR = 1.0
-GSSDP_VERSION = $(GSSDP_VERSION_MAJOR).3
+GSSDP_VERSION_MAJOR = 1.2
+GSSDP_VERSION = $(GSSDP_VERSION_MAJOR).2
 GSSDP_SOURCE = gssdp-$(GSSDP_VERSION).tar.xz
 GSSDP_SITE = http://ftp.gnome.org/pub/gnome/sources/gssdp/$(GSSDP_VERSION_MAJOR)
 GSSDP_LICENSE = LGPL-2.0+
Signature · 6 lines
2.25.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#7 lore raw

PATCH v3 5/7 package/gupnp: bump version to 1.2.2

In reply to aduskett at gmail.com

From: Adam Duskett <[email protected]>

Other changes:
- Convert the package type to meson as there is no longer autotools support.

---
 package/gupnp/gupnp.hash |  4 ++--
 package/gupnp/gupnp.mk   | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)
package/gupnp/gupnp.hash +2 -2
index c530eb7ef5..df3e9bafae 100644
@@ -1,5 +1,5 @@
-# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp/1.0/gupnp-1.0.4.sha256sum:
-sha256	8b0992650c6ef8566d2d0c9198c8a669106dc2c73aa908fcc4a4d043a8c0b544	gupnp-1.0.4.tar.xz
+# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp/1.2/gupnp-1.2.2.sha256sum:
+sha256	9a80bd953e5c8772ad26b72f8da01cbe7241a113edd6084903f413ce751c9989	gupnp-1.2.2.tar.xz
 
 # Hash for license file:
 sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5  COPYING
package/gupnp/gupnp.mk +5 -5
index 75bbfa8d1d..612359ba55 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-GUPNP_VERSION_MAJOR = 1.0
-GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).4
+GUPNP_VERSION_MAJOR = 1.2
+GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).2
 GUPNP_SOURCE = gupnp-$(GUPNP_VERSION).tar.xz
 GUPNP_SITE = http://ftp.gnome.org/pub/gnome/sources/gupnp/$(GUPNP_VERSION_MAJOR)
 GUPNP_LICENSE = LGPL-2.0+
@@ -14,10 +14,10 @@ GUPNP_INSTALL_STAGING = YES
 GUPNP_DEPENDENCIES = host-pkgconf libglib2 libxml2 gssdp util-linux
 
 ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
-GUPNP_CONF_OPTS += --enable-introspection
+GUPNP_CONF_OPTS += -Dintrospection=true
 GUPNP_DEPENDENCIES += gobject-introspection
 else
-GUPNP_CONF_OPTS += --disable-introspection
+GUPNP_CONF_OPTS += -Dintrospection=false
 endif
 
-$(eval $(autotools-package))
+$(eval $(meson-package))
Signature · 1 line
2.25.1
#8 lore raw

PATCH v3 6/7 package/gupnp: Depend on host-vala if gobject-introspection is selected.

In reply to aduskett at gmail.com

From: Adam Duskett <[email protected]>

Because there is no way to select host-vala explicitly and some packages may require the vala bindings, it is better to unconditionally build the vala bindings into the .gir and .typelib files.

---
 package/gupnp/gupnp.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
package/gupnp/gupnp.mk +3 -3
index 612359ba55..c86eb6db2c 100644
@@ -14,10 +14,10 @@ GUPNP_INSTALL_STAGING = YES
 GUPNP_DEPENDENCIES = host-pkgconf libglib2 libxml2 gssdp util-linux
 
 ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
-GUPNP_CONF_OPTS += -Dintrospection=true
-GUPNP_DEPENDENCIES += gobject-introspection
+GUPNP_CONF_OPTS += -Dintrospection=true -Dvapi=true
+GUPNP_DEPENDENCIES += host-vala gobject-introspection
 else
-GUPNP_CONF_OPTS += -Dintrospection=false
+GUPNP_CONF_OPTS += -Dintrospection=false -Dvapi=false
 endif
 
 $(eval $(meson-package))
Signature · 1 line
2.25.1
#9 lore raw

PATCH v3 6/7 package/gupnp: Depend on host-vala if gobject-introspection is selected.

Adam, All,

On 2020-03-27 11:29 -0700, aduskett at gmail.com spake thusly:

Quoted 7 lines

From: Adam Duskett <[email protected]>

Because there is no way to select host-vala explicitly and some packages may require the vala bindings, it is better to unconditionally build the vala bindings into the .gir and .typelib files.

Applied to master with a tweaked comit log, thanks!

Regards,
Yann E. MORIN.

Quoted 29 lines
---
 package/gupnp/gupnp.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
package/gupnp/gupnp.mk +3 -3
index 612359ba55..c86eb6db2c 100644
@@ -14,10 +14,10 @@ GUPNP_INSTALL_STAGING = YES
 GUPNP_DEPENDENCIES = host-pkgconf libglib2 libxml2 gssdp util-linux
 
 ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
-GUPNP_CONF_OPTS += -Dintrospection=true
-GUPNP_DEPENDENCIES += gobject-introspection
+GUPNP_CONF_OPTS += -Dintrospection=true -Dvapi=true
+GUPNP_DEPENDENCIES += host-vala gobject-introspection
 else
-GUPNP_CONF_OPTS += -Dintrospection=false
+GUPNP_CONF_OPTS += -Dintrospection=false -Dvapi=false
 endif
 
 $(eval $(meson-package))
Signature · 6 lines
2.25.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#10 lore raw

PATCH v3 7/7 package/gupnp-dlna: add optional dependency for gobject-introspection

In reply to aduskett at gmail.com

From: Adam Duskett <[email protected]>

If gobject-introspection is selected, explicitly set --enable-introspection in the configure options and add a dependency for both gobject-introspection and host-vala.

Host-vala is necessary because the introspection includes vala bindings files with no way to explicitly disable them.

---
 package/gupnp-dlna/gupnp-dlna.mk | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)
package/gupnp-dlna/gupnp-dlna.mk +10 -4
index 85d30b7cd2..845667ca53 100644
@@ -15,15 +15,21 @@ GUPNP_DLNA_LICENSE_FILES = COPYING
 GUPNP_DLNA_INSTALL_STAGING = YES
 GUPNP_DLNA_DEPENDENCIES = host-pkgconf libglib2 libxml2
 
-GUPNP_DLNA_CONF_OPTS = \
-	--disable-introspection \
-	--disable-legacy-gstreamer-metadata-backend
+GUPNP_DLNA_CONF_OPTS = --disable-legacy-gstreamer-metadata-backend
 
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE),y)
 GUPNP_DLNA_CONF_OPTS += --enable-gstreamer-metadata-backend
 GUPNP_DLNA_DEPENDENCIES += gstreamer1 gst1-plugins-base
+# Gobject-introspection requires gstreamer .gir files.
+# Vala bindings are created with the .gir files.
+ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
+GUPNP_DLNA_CONF_OPTS += --enable-introspection
+GUPNP_DLNA_DEPENDENCIES += host-vala gobject-introspection
+endif
 else
-GUPNP_DLNA_CONF_OPTS += --disable-gstreamer-metadata-backend
+GUPNP_DLNA_CONF_OPTS += \
+	--disable-gstreamer-metadata-backend \
+	--disable-introspection
 endif
 
 $(eval $(autotools-package))
Signature · 1 line
2.25.1
#11 lore raw

PATCH v3 7/7 package/gupnp-dlna: add optional dependency for gobject-introspection

Adam, All,

Bringing Thomas in the loop: I have a question for you...

Adam, there is also a question for you...

On 2020-03-27 11:30 -0700, aduskett at gmail.com spake thusly:

Quoted 8 lines

From: Adam Duskett <[email protected]>

If gobject-introspection is selected, explicitly set --enable-introspection in the configure options and add a dependency for both gobject-introspection and host-vala.

Host-vala is necessary because the introspection includes vala bindings files with no way to explicitly disable them.

Adam, this one is for you: what good are vala bindings for? Why do we care in Buildroot, Do we have a package that may use them?

Quoted 17 lines
---
 package/gupnp-dlna/gupnp-dlna.mk | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)
package/gupnp-dlna/gupnp-dlna.mk +1 -3
index 85d30b7cd2..845667ca53 100644
@@ -15,15 +15,21 @@ GUPNP_DLNA_LICENSE_FILES = COPYING
 GUPNP_DLNA_INSTALL_STAGING = YES
 GUPNP_DLNA_DEPENDENCIES = host-pkgconf libglib2 libxml2
 
-GUPNP_DLNA_CONF_OPTS = \
-	--disable-introspection \
-	--disable-legacy-gstreamer-metadata-backend
+GUPNP_DLNA_CONF_OPTS = --disable-legacy-gstreamer-metadata-backend

package/gupnp-dlna/gupnp-dlna.mk GUPNP_DLNA_LICENSE_FILES = COPYING · line 28

Quoted 10 lines
package/gupnp-dlna/gupnp-dlna.mk +6 -0
 
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE),y)
 GUPNP_DLNA_CONF_OPTS += --enable-gstreamer-metadata-backend
 GUPNP_DLNA_DEPENDENCIES += gstreamer1 gst1-plugins-base
+# Gobject-introspection requires gstreamer .gir files.
+# Vala bindings are created with the .gir files.
+ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
+GUPNP_DLNA_CONF_OPTS += --enable-introspection
+GUPNP_DLNA_DEPENDENCIES += host-vala gobject-introspection
+endif

So, vala is _not_ needed to build with introspection.

However, when building with introspection, vala bindings _can_ be generated if the needed tools are present. But this is totally optional.

However, vala is a host-only package, that has no entry on the menuconfig (because it is just a tool akin to bison, flex et al.).

So, we have no way to express automatically whether vala bindings should be enabled.

However, it might be possible that an earlier package has brought host-vala. So we may or may not have host-vala built by the time gupnp-dlna is built.

As such, we have three options:

1. Forcibly bring a dependency ti host-vala and build vala bindings, like Adam did;

2. Add an option to gupnp-dlna to build vala bindings;

3. Add a vala/Config.in/host to manually enable vala, and thus automatically build the vala bindings.

I am basically OK with point 1, but I'd like a second pair of eyes...

Regards,
Yann E. MORIN.

Quoted 15 lines
package/gupnp-dlna/gupnp-dlna.mk +3 -1
 else
-GUPNP_DLNA_CONF_OPTS += --disable-gstreamer-metadata-backend
+GUPNP_DLNA_CONF_OPTS += \
+	--disable-gstreamer-metadata-backend \
+	--disable-introspection
 endif
 
 $(eval $(autotools-package))
Signature · 6 lines
2.25.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#12 lore raw

PATCH v3 7/7 package/gupnp-dlna: add optional dependency for gobject-introspection

Hello,

Quoted 1 line · On Sun, 29 Mar 2020 22:42:51 +0200 "Yann E. MORIN" <[email protected]>…

So, vala is _not_ needed to build with introspection.

Right, totally correct. HAVE_INTROSPECTION is used in libgupnp-dlna/Makefile.am and vala/Makefile.am. In the former case, Vala support is not needed.

Quoted 6 lines

As such, we have three options:

1. Forcibly bring a dependency ti host-vala and build vala bindings, like Adam did;

2. Add an option to gupnp-dlna to build vala bindings;

I would prefer this solution, but there may not even be a need to add an option: there is an AC_PATH_PROG check for vapigen, so probably we can feed some stupid autoconf cache variable to make sure vapigen is not detected, even if available.

Quoted 2 lines

3. Add a vala/Config.in/host to manually enable vala, and thus automatically build the vala bindings.

I would really prefer to handle the whole Vala binding thing once someone really needs to do Vala stuff with gupnp-dlna.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#13 lore raw

PATCH v3 7/7 package/gupnp-dlna: add optional dependency for gobject-introspection

Thomas, Adam, All,

On 2020-04-06 22:38 +0200, Thomas Petazzoni spake thusly:

Quoted 2 lines

On Sun, 29 Mar 2020 22:42:51 +0200
"Yann E. MORIN" <[email protected]> wrote:

[--SNIP--]

Quoted 10 lines
Quoted 5 lines

As such, we have three options:

1. Forcibly bring a dependency ti host-vala and build vala bindings, like Adam did;
2. Add an option to gupnp-dlna to build vala bindings;

I would prefer this solution, but there may not even be a need to add an option: there is an AC_PATH_PROG check for vapigen, so probably we can feed some stupid autoconf cache variable to make sure vapigen is not detected, even if available.

GUPNP_PROG_VAPIGEN uses AC_PATH_PROG under the hood, and we can override the detection by setting VAPIGEN="something". Not sure what happens if we pass it an empty string, or 'no'...

Adam, care to look into this, please? Thanks!

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#14 lore raw

PATCH v3 1/7 package/vala/vala-wrapper: fix wrapper

In reply to aduskett at gmail.com

Adam, All,

On 2020-03-27 11:29 -0700, aduskett at gmail.com spake thusly:

Quoted 3 lines

From: Adam Duskett <[email protected]>

Add double quotes around the $@ variable to prevent globbing.

s/globbing/word splitting/

Applied to master with that fixed (and a small tweak to the titile too). I also added yself as Reported-by, while at it. ;-)

Thanks!

Regards,
Yann E. MORIN.

Quoted 20 lines
---
 package/vala/vala-wrapper | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/vala/vala-wrapper +1 -1
index ae2f7ca671..84fc905b9f 100644
@@ -1,2 +1,2 @@
 #!/bin/sh
-$0- at VALA_VERSION@ --vapidir=${STAGING_DIR}/usr/share/vala/vapi --girdir=${STAGING_DIR}/usr/share/gir-1.0 $@
+$0- at VALA_VERSION@ --vapidir=${STAGING_DIR}/usr/share/vala/vapi --girdir=${STAGING_DIR}/usr/share/gir-1.0 "$@"
Signature · 6 lines
2.25.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'