diff options
author | Jens Georg <mail@jensge.org> | 2018-12-01 21:33:21 +0100 |
---|---|---|
committer | Olivier CrĂȘte <olivier.crete@collabora.com> | 2020-03-18 19:13:49 -0400 |
commit | dd318feac03dec83e1fb08f6525bed7a87b20fc2 (patch) | |
tree | 9a684fa64968bdc7318c9a5dc129dfd503cd2e5c | |
parent | 32e640c72dc09fb0db898681ccd604fe87e686d6 (diff) | |
download | gupnp-igd-dd318feac03dec83e1fb08f6525bed7a87b20fc2.tar.gz |
Switch to GUPnP 1.2 API
-rw-r--r-- | README | 4 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | gupnp-igd-1.0-uninstalled.pc.in | 2 | ||||
-rw-r--r-- | gupnp-igd-1.0.pc.in | 2 | ||||
-rw-r--r-- | libgupnp-igd/Makefile.am | 2 | ||||
-rw-r--r-- | libgupnp-igd/meson.build | 2 | ||||
-rw-r--r-- | meson.build | 4 | ||||
-rw-r--r-- | tests/gtest/gupnp-simple-igd.c | 6 |
8 files changed, 13 insertions, 11 deletions
@@ -5,5 +5,5 @@ It was written by Olivier CrĂȘte <olivier.crete@collabora.co.uk>. It is supposed to have a very simple API. Read the gtk-doc. The only dependencies are: - - GUPnP 0.12.3 - - GLib 2.14. + - GUPnP 1.2 + - GLib 2.26 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/libgupnp-igd/meson.build b/libgupnp-igd/meson.build index a4f267f..d6eb39b 100644 --- a/libgupnp-igd/meson.build +++ b/libgupnp-igd/meson.build @@ -39,7 +39,7 @@ pkg.generate( subdirs : 'gupnp-igd-1.0', filebase : 'gupnp-igd-1.0', description: 'GUPnP Simple IGD library', - requires : 'gupnp-1.0' + requires : 'gupnp-1.2' ) diff --git a/meson.build b/meson.build index 8dbd0ac..6306588 100644 --- a/meson.build +++ b/meson.build @@ -6,8 +6,8 @@ pkg = import('pkgconfig') dependencies = [ dependency('glib-2.0', version: '>= 2.26', required: true), dependency('gobject-2.0', version: '>= 2.26', required: true), - dependency('gssdp-1.0', required: true), - dependency('gupnp-1.0', version: '>= 0.18', required: true), + dependency('gupnp-1.2', version : '>= 1.1.0'), + dependency('gssdp-1.2', version : '>= 1.1.0'), dependency('gthread-2.0', required: true) ] 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"); |