basesystem-jjsandbox/ToshikazuOhiwa/master-jj

recipes

1 files changed, 4 insertions, 10 deletions

diff --git a/external/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp.inc b/external/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp.inc
index 6ce96316..2920581c 100644
--- a/external/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp.inc
+++ b/external/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp.inc
@@ -4,22 +4,16 @@ LICENSE = "LGPLv2+"
 
 DEPENDS = "e2fsprogs gssdp libsoup-2.4 libxml2"
 
-inherit autotools pkgconfig vala gobject-introspection
-
-# Copy vapigen.m4 so that it doesn't get removed by vala class
-# (normally this would be the right thing to do, but in gupnp the vapigen.m4 has only a custom macro)
-do_configure_prepend() {
-        cp -f ${S}/m4/vapigen.m4 ${S}/m4/vapigen-custom.m4 || true
-}
+inherit meson pkgconfig vala gobject-introspection
 
 FILES_${PN} = "${libdir}/*.so.*"
-FILES_${PN}-dev += "${bindir}/gupnp-binding-tool"
+FILES_${PN}-dev += "${bindir}/gupnp-binding-tool*"
 
-RDEPENDS_${PN}-dev = "python-textutils python-xml"
+RDEPENDS_${PN}-dev = "python3 python3-xml"
 
 SYSROOT_PREPROCESS_FUNCS += "gupnp_sysroot_preprocess"
 
 gupnp_sysroot_preprocess () {
     install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/
-    install -m 755 ${D}${bindir}/gupnp-binding-tool ${SYSROOT_DESTDIR}${bindir_crossscripts}/
+    install -m 755 ${D}${bindir}/gupnp-binding-tool* ${SYSROOT_DESTDIR}${bindir_crossscripts}/
 }