1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
|
From 41b2e56f67b6fc9c8c256b86957d281644b9b846 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 16 Mar 2019 05:39:38 +0100
Subject: [PATCH] Port to gupnp-1.2
The latest version of gupnp breaks backwards compatibility. Fortunately,
there are not many calls to gupnp functions in core, so we just needed
to bump the dependencies.
There is one deprecated gupnp_service_proxy_cancel_action call but
I am not sure how to change it without breaking Dleyna API.
Let's leave it for now.
---
configure.ac | 2 +-
dleyna-core-1.0.pc.in | 2 +-
libdleyna/core/main-loop.c | 4 ----
libdleyna/core/service-task.c | 1 +
4 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac
index 9a96c84..9f769e2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,7 +39,7 @@ PKG_PROG_PKG_CONFIG(0.16)
PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.28])
PKG_CHECK_MODULES([GIO], [gio-2.0 >= 2.28])
PKG_CHECK_MODULES([GMODULE], [gmodule-2.0 >= 2.28])
-PKG_CHECK_MODULES([GUPNP], [gupnp-1.0 >= 0.20.5])
+PKG_CHECK_MODULES([GUPNP], [gupnp-1.2 >= 1.2.0])
# Checks for header files.
AC_CHECK_HEADERS([stdlib.h string.h syslog.h])
diff --git a/dleyna-core-1.0.pc.in b/dleyna-core-1.0.pc.in
index 966a8e1..52b718e 100644
--- a/dleyna-core-1.0.pc.in
+++ b/dleyna-core-1.0.pc.in
@@ -8,5 +8,5 @@ Name: @PACKAGE@
Description: UPnP & DLNA core library
Libs: -L${libdir} -ldleyna-core-1.0
Cflags: -I${includedir}/dleyna-1.0
-Requires: glib-2.0 gio-2.0 gmodule-2.0 gupnp-1.0
+Requires: glib-2.0 gio-2.0 gmodule-2.0 gupnp-1.2
Version: @VERSION@
diff --git a/libdleyna/core/main-loop.c b/libdleyna/core/main-loop.c
index 3642a5b..9716b06 100644
--- a/libdleyna/core/main-loop.c
+++ b/libdleyna/core/main-loop.c
@@ -128,10 +128,6 @@ int dleyna_main_loop_start(const char *server,
{
int retval = 1;
-#if !GLIB_CHECK_VERSION(2, 35, 0)
- g_type_init();
-#endif
-
dleyna_log_init(server, control_point->get_version());
if (!prv_context_init(server, control_point))
diff --git a/libdleyna/core/service-task.c b/libdleyna/core/service-task.c
index e0ca2df..fb113c3 100644
--- a/libdleyna/core/service-task.c
+++ b/libdleyna/core/service-task.c
@@ -103,6 +103,7 @@ void dleyna_service_task_cancel_cb(dleyna_task_atom_t *atom, gpointer user_data)
if (task->p_action) {
if (task->proxy)
+ // TODO: switch to GCancellable
gupnp_service_proxy_cancel_action(task->proxy,
task->p_action);
task->p_action = NULL;
--
2.20.1
|
GitWeb
