Skip to contentSkip to conversation

package/vala: install wrapper to vapigen

PATCH New aduskett at gmail.com 1 participant 3 messages Mar 23, 2020

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 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 v1 -> v2:
- Add this patch to the series.

 package/vala/vala.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
package/vala/vala.mk +3 -1
index b8a69f8c5e..d000393d71 100644
@@ -17,13 +17,15 @@ 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
Signature · 1 line
2.25.1
#1 lore raw

PATCH v2 1/2 package/vala: install wrapper to vapigen

All;

Quoted 33 lines · On Mon, Mar 23, 2020 at 10:58 AM <[email protected]> wrote:

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 v1 -> v2:
- Add this patch to the series.

 package/vala/vala.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
package/vala/vala.mk +1 -1
index b8a69f8c5e..d000393d71 100644
@@ -17,13 +17,15 @@ 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

package/vala/vala.mk HOST_VALA_DEPENDENCIES = host-bison host-flex host-libglib2 · line 31

Quoted 10 lines
package/vala/vala.mk +2 -0
 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

I added vapigen to this line but didn't save the .mk file before committing. If you want me to resend
a new patch with $(HOST_DIR)/bin/vapigen please let me know!

Adam

Quoted 3 lines

--
2.25.1

#2 lore raw

PATCH v2 2/2 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 disable them.

---
Changes v1 -> v2:
- Depend on gst plugins (Fabrice Fontaine)
- Add host-vala to the dependencies.
- Move the goi check inside of the gst1_plugins_base check.

 package/gupnp-dlna/gupnp-dlna.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
package/gupnp-dlna/gupnp-dlna.mk +7 -1
index 85d30b7cd2..4eecc0754e 100644
@@ -16,12 +16,18 @@ GUPNP_DLNA_INSTALL_STAGING = YES
 GUPNP_DLNA_DEPENDENCIES = host-pkgconf libglib2 libxml2
 
 GUPNP_DLNA_CONF_OPTS = \
-	--disable-introspection \
 	--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
+# vala bindings are created with the .gir files.
+ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
+GUPNP_DLNA_CONF_OPTS += --enable-introspection
+GUPNP_DLNA_DEPENDENCIES += gobject-introspection host-vala
+else
+GUPNP_DLNA_CONF_OPTS += --disable-introspection
+endif
 else
 GUPNP_DLNA_CONF_OPTS += --disable-gstreamer-metadata-backend
 endif
Signature · 1 line
2.25.1