Signed-off-by: Andreas Müller <[email protected]> --- .../0001-Swtich-to-new-GUPnP-API.patch | 101 ------------------ ...{gupnp-igd_0.2.5.bb => gupnp-igd_1.2.0.bb} | 11 +- 2 files changed, 4 insertions(+), 108 deletions(-) delete mode 100644 meta-multimedia/recipes-connectivity/gupnp/gupnp-igd/0001-Swtich-to-new-GUPnP-API.patch rename meta-multimedia/recipes-connectivity/gupnp/{gupnp-igd_0.2.5.bb => gupnp-igd_1.2.0.bb} (46%)
diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd/0001-Swtich-to-new-GUPnP-API.patch b/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd/0001-Swtich-to-new-GUPnP-API.patch deleted file mode 100644 index ff5a6d9c6..000000000 --- a/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd/0001-Swtich-to-new-GUPnP-API.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 63531558a16ac2334a59f627b2fca5576dcfbb2e Mon Sep 17 00:00:00 2001 -From: Jens Georg <[email protected]> -Date: Sat, 1 Dec 2018 21:33:21 +0100 -Subject: [PATCH] Swtich to new GUPnP API - -Signed-off-by: Khem Raj <[email protected]> -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gupnp-igd/commit/63531558a16ac2334a59f627b2fca5576dcfbb2e] ---- - configure.ac | 2 +- - gupnp-igd-1.0-uninstalled.pc.in | 2 +- - gupnp-igd-1.0.pc.in | 2 +- - libgupnp-igd/Makefile.am | 2 +- - tests/gtest/gupnp-simple-igd.c | 6 ++++-- - 5 files changed, 8 insertions(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f03921f..aa7f0ca 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -11,7 +11,7 @@ AC_STDC_HEADERS - AC_PROG_LIBTOOL - AC_FUNC_MMAP - --PKG_CHECK_MODULES(LIBGUPNP, glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.0 gupnp-1.0 >= 0.18 gthread-2.0) -+PKG_CHECK_MODULES(LIBGUPNP, glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.2 gupnp-1.2 >= 0.18 gthread-2.0) - - # glib-genmarshal - GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0` -diff --git a/gupnp-igd-1.0-uninstalled.pc.in b/gupnp-igd-1.0-uninstalled.pc.in -index 483956f..6db3bee 100644 ---- a/gupnp-igd-1.0-uninstalled.pc.in -+++ b/gupnp-igd-1.0-uninstalled.pc.in -@@ -5,7 +5,7 @@ includedir=${pcfiledir}/ - - Name: gupnp-igd-1.0 - Description: GUPnP Simple IGD library --Requires: gupnp-1.0 -+Requires: gupnp-1.2 - Version: @VERSION@ - Libs: ${libdir}/libgupnp-av-1.0.la - Cflags: -I${includedir} -diff --git a/gupnp-igd-1.0.pc.in b/gupnp-igd-1.0.pc.in -index 6660d63..aa74ed3 100644 ---- a/gupnp-igd-1.0.pc.in -+++ b/gupnp-igd-1.0.pc.in -@@ -5,7 +5,7 @@ includedir=@includedir@ - - Name: gupnp-igd-1.0 - Description: GUPnP Simple IGD library --Requires: gupnp-1.0 -+Requires: gupnp-1.2 - Version: @VERSION@ - Libs: -L${libdir} -lgupnp-igd-1.0 - Cflags: -I${includedir}/gupnp-igd-1.0 -diff --git a/libgupnp-igd/Makefile.am b/libgupnp-igd/Makefile.am -index fe020b5..e10d857 100644 ---- a/libgupnp-igd/Makefile.am -+++ b/libgupnp-igd/Makefile.am -@@ -60,7 +60,7 @@ GUPnPIgd_1_0_gir_VERSION = 1.0 - GUPnPIgd_1_0_gir_LIBS = $(lib_LTLIBRARIES) - GUPnPIgd_1_0_gir_FILES = $(libgupnp_igd_1_0_la_SOURCES) $(libgupnp_igd_inc_HEADERS) - GUPnPIgd_1_0_gir_INCLUDES=GObject-2.0 --GUPnPIgd_1_0_gir_PACKAGES=gupnp-1.0 -+GUPnPIgd_1_0_gir_PACKAGES=gupnp-1.2 - GUPnPIgd_1_0_gir_CFLAGS=-I$(srcdir) -I$(top_srcdir) - - if HAVE_INTROSPECTION -diff --git a/tests/gtest/gupnp-simple-igd.c b/tests/gtest/gupnp-simple-igd.c -index 9b32b2a..d051d13 100644 ---- a/tests/gtest/gupnp-simple-igd.c -+++ b/tests/gtest/gupnp-simple-igd.c -@@ -273,13 +273,14 @@ run_gupnp_simple_igd_test (GMainContext *mainctx, GUPnPSimpleIgd *igd, - GUPnPDeviceInfo *subdev1; - GUPnPDeviceInfo *subdev2; - const gchar *xml_path = "."; -+ GError *error = NULL; - - g_signal_connect (igd, "context-available", - G_CALLBACK (ignore_non_localhost), NULL); - - if (mainctx) - g_main_context_push_thread_default (mainctx); -- context = gupnp_context_new (NULL, "lo", 0, NULL); -+ context = gupnp_context_new ("lo", 0, NULL); - g_assert (context); - - if (g_getenv ("XML_PATH")) -@@ -293,8 +294,9 @@ run_gupnp_simple_igd_test (GMainContext *mainctx, GUPnPSimpleIgd *igd, - gupnp_context_host_path (context, "WANPPPConnection.xml", "/WANPPPConnection.xml"); - */ - -- dev = gupnp_root_device_new (context, "InternetGatewayDevice.xml", xml_path); -+ dev = gupnp_root_device_new (context, "InternetGatewayDevice.xml", xml_path, &error); - g_assert (dev); -+ g_assert (error == NULL); - - subdev1 = gupnp_device_info_get_device (GUPNP_DEVICE_INFO (dev), - "urn:schemas-upnp-org:device:WANDevice:1"); --- -2.25.1 - diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.5.bb b/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_1.2.0.bb similarity index 46% rename from meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.5.bb rename to meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_1.2.0.bb index 1a98ace80..4bbfb6e70 100644 --- a/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.5.bb +++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_1.2.0.bb @@ -5,12 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ DEPENDS = "glib-2.0 gssdp gupnp sqlite3" -SRC_URI = "http://download.gnome.org/sources/${BPN}/0.2/${BPN}-${PV}.tar.xz \ - file://0001-Swtich-to-new-GUPnP-API.patch \ - " -SRC_URI[md5sum] = "d164e096d0f140bb1f5d9503727b424a" -SRC_URI[sha256sum] = "8b4a1aa38bacbcac2c1755153147ead7ee9af7d4d1f544b6577cfc35e10e3b20" +SRC_URI = "http://download.gnome.org/sources/${BPN}/1.2/${BPN}-${PV}.tar.xz"; +SRC_URI[sha256sum] = "4b5120098aa13edd27818ba9ee4d7fe961bf540bf50d056ff703c61545e02be1" -inherit autotools pkgconfig gtk-doc gobject-introspection +GTKDOC_MESON_OPTION = "gtk_doc" -EXTRA_OECONF = "--disable-python" +inherit meson pkgconfig gtk-doc gobject-introspection -- 2.31.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#94597): https://lists.openembedded.org/g/openembedded-devel/message/94597 Mute This Topic: https://lists.openembedded.org/mt/88058499/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
