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