summaryrefslogtreecommitdiffstats
path: root/meta-multimedia
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2020-02-17 22:18:00 -0800
committerKhem Raj <raj.khem@gmail.com>2020-02-17 22:27:14 -0800
commiteb50fb0aeb67a88dbf5a17b7eed53b67f4fd692b (patch)
tree0f72b628b637a6eccecf3998629523c560d55f4e /meta-multimedia
parentd474aab6aeeeb4b40b478badb5de7f60bccc4ea9 (diff)
downloadmeta-openembedded-eb50fb0aeb67a88dbf5a17b7eed53b67f4fd692b.tar.gz
gupnp-igd: Upgrade to 0.2.5
Backport patch to support gupnp 1.2 APIs Add gsspd to deps Signed-off-by: Khem Raj <raj.khem@gmail.com> Cc: Andreas Müller <schnitzeltony@gmail.com>
Diffstat (limited to 'meta-multimedia')
-rw-r--r--meta-multimedia/recipes-connectivity/gupnp/gupnp-igd/0001-Swtich-to-new-GUPnP-API.patch101
-rw-r--r--meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.5.bb (renamed from meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.4.bb)10
2 files changed, 107 insertions, 4 deletions
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
new file mode 100644
index 000000000..ff5a6d9c6
--- /dev/null
+++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd/0001-Swtich-to-new-GUPnP-API.patch
@@ -0,0 +1,101 @@
1From 63531558a16ac2334a59f627b2fca5576dcfbb2e Mon Sep 17 00:00:00 2001
2From: Jens Georg <mail@jensge.org>
3Date: Sat, 1 Dec 2018 21:33:21 +0100
4Subject: [PATCH] Swtich to new GUPnP API
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gupnp-igd/commit/63531558a16ac2334a59f627b2fca5576dcfbb2e]
8---
9 configure.ac | 2 +-
10 gupnp-igd-1.0-uninstalled.pc.in | 2 +-
11 gupnp-igd-1.0.pc.in | 2 +-
12 libgupnp-igd/Makefile.am | 2 +-
13 tests/gtest/gupnp-simple-igd.c | 6 ++++--
14 5 files changed, 8 insertions(+), 6 deletions(-)
15
16diff --git a/configure.ac b/configure.ac
17index f03921f..aa7f0ca 100644
18--- a/configure.ac
19+++ b/configure.ac
20@@ -11,7 +11,7 @@ AC_STDC_HEADERS
21 AC_PROG_LIBTOOL
22 AC_FUNC_MMAP
23
24-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)
25+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)
26
27 # glib-genmarshal
28 GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
29diff --git a/gupnp-igd-1.0-uninstalled.pc.in b/gupnp-igd-1.0-uninstalled.pc.in
30index 483956f..6db3bee 100644
31--- a/gupnp-igd-1.0-uninstalled.pc.in
32+++ b/gupnp-igd-1.0-uninstalled.pc.in
33@@ -5,7 +5,7 @@ includedir=${pcfiledir}/
34
35 Name: gupnp-igd-1.0
36 Description: GUPnP Simple IGD library
37-Requires: gupnp-1.0
38+Requires: gupnp-1.2
39 Version: @VERSION@
40 Libs: ${libdir}/libgupnp-av-1.0.la
41 Cflags: -I${includedir}
42diff --git a/gupnp-igd-1.0.pc.in b/gupnp-igd-1.0.pc.in
43index 6660d63..aa74ed3 100644
44--- a/gupnp-igd-1.0.pc.in
45+++ b/gupnp-igd-1.0.pc.in
46@@ -5,7 +5,7 @@ includedir=@includedir@
47
48 Name: gupnp-igd-1.0
49 Description: GUPnP Simple IGD library
50-Requires: gupnp-1.0
51+Requires: gupnp-1.2
52 Version: @VERSION@
53 Libs: -L${libdir} -lgupnp-igd-1.0
54 Cflags: -I${includedir}/gupnp-igd-1.0
55diff --git a/libgupnp-igd/Makefile.am b/libgupnp-igd/Makefile.am
56index fe020b5..e10d857 100644
57--- a/libgupnp-igd/Makefile.am
58+++ b/libgupnp-igd/Makefile.am
59@@ -60,7 +60,7 @@ GUPnPIgd_1_0_gir_VERSION = 1.0
60 GUPnPIgd_1_0_gir_LIBS = $(lib_LTLIBRARIES)
61 GUPnPIgd_1_0_gir_FILES = $(libgupnp_igd_1_0_la_SOURCES) $(libgupnp_igd_inc_HEADERS)
62 GUPnPIgd_1_0_gir_INCLUDES=GObject-2.0
63-GUPnPIgd_1_0_gir_PACKAGES=gupnp-1.0
64+GUPnPIgd_1_0_gir_PACKAGES=gupnp-1.2
65 GUPnPIgd_1_0_gir_CFLAGS=-I$(srcdir) -I$(top_srcdir)
66
67 if HAVE_INTROSPECTION
68diff --git a/tests/gtest/gupnp-simple-igd.c b/tests/gtest/gupnp-simple-igd.c
69index 9b32b2a..d051d13 100644
70--- a/tests/gtest/gupnp-simple-igd.c
71+++ b/tests/gtest/gupnp-simple-igd.c
72@@ -273,13 +273,14 @@ run_gupnp_simple_igd_test (GMainContext *mainctx, GUPnPSimpleIgd *igd,
73 GUPnPDeviceInfo *subdev1;
74 GUPnPDeviceInfo *subdev2;
75 const gchar *xml_path = ".";
76+ GError *error = NULL;
77
78 g_signal_connect (igd, "context-available",
79 G_CALLBACK (ignore_non_localhost), NULL);
80
81 if (mainctx)
82 g_main_context_push_thread_default (mainctx);
83- context = gupnp_context_new (NULL, "lo", 0, NULL);
84+ context = gupnp_context_new ("lo", 0, NULL);
85 g_assert (context);
86
87 if (g_getenv ("XML_PATH"))
88@@ -293,8 +294,9 @@ run_gupnp_simple_igd_test (GMainContext *mainctx, GUPnPSimpleIgd *igd,
89 gupnp_context_host_path (context, "WANPPPConnection.xml", "/WANPPPConnection.xml");
90 */
91
92- dev = gupnp_root_device_new (context, "InternetGatewayDevice.xml", xml_path);
93+ dev = gupnp_root_device_new (context, "InternetGatewayDevice.xml", xml_path, &error);
94 g_assert (dev);
95+ g_assert (error == NULL);
96
97 subdev1 = gupnp_device_info_get_device (GUPNP_DEVICE_INFO (dev),
98 "urn:schemas-upnp-org:device:WANDevice:1");
99--
1002.25.1
101
diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.4.bb b/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.5.bb
index 0aa594dc7..1a98ace80 100644
--- a/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.4.bb
+++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.5.bb
@@ -3,11 +3,13 @@ LICENSE = "LGPLv2"
3LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ 3LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
4 file://libgupnp-igd/gupnp-simple-igd.c;beginline=1;endline=21;md5=aa292c0d9390463a6e1055dc5fc68e80" 4 file://libgupnp-igd/gupnp-simple-igd.c;beginline=1;endline=21;md5=aa292c0d9390463a6e1055dc5fc68e80"
5 5
6DEPENDS = "glib-2.0 gupnp sqlite3" 6DEPENDS = "glib-2.0 gssdp gupnp sqlite3"
7 7
8SRC_URI = "http://download.gnome.org/sources/${BPN}/0.2/${BPN}-${PV}.tar.xz" 8SRC_URI = "http://download.gnome.org/sources/${BPN}/0.2/${BPN}-${PV}.tar.xz \
9SRC_URI[md5sum] = "124371136b5a7b1056a3681780a62772" 9 file://0001-Swtich-to-new-GUPnP-API.patch \
10SRC_URI[sha256sum] = "38c4a6d7718d17eac17df95a3a8c337677eda77e58978129ad3182d769c38e44" 10 "
11SRC_URI[md5sum] = "d164e096d0f140bb1f5d9503727b424a"
12SRC_URI[sha256sum] = "8b4a1aa38bacbcac2c1755153147ead7ee9af7d4d1f544b6577cfc35e10e3b20"
11 13
12inherit autotools pkgconfig gtk-doc gobject-introspection 14inherit autotools pkgconfig gtk-doc gobject-introspection
13 15