Port to GSSDP/GUPnP 1.2 APIwip/new-gupnp

Signed-off-by: Jens Georg <mail@jensge.org>

5 files changed, 26 insertions, 23 deletions

diff --git a/configure.ac b/configure.ac
index 50812e1d..575117da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,8 +37,8 @@ GLIB_REQUIRED=2.40.0
 LIBXML_REQUIRED=2.7
 VALA_REQUIRED=0.24.0
 VALADOC_REQUIRED=0.2
-GSSDP_REQUIRED=0.13.0
-GUPNP_REQUIRED=0.20.14
+GSSDP_REQUIRED=1.1.0
+GUPNP_REQUIRED=1.1.0
 GUPNP_AV_REQUIRED=0.12.8
 GUPNP_DLNA_REQUIRED=0.9.4
 GSTREAMER_REQUIRED=1.0
@@ -65,20 +65,20 @@ VALAFLAGS="--enable-deprecated --target-glib=2.40 $VALAFLAGS"
 ########################################################
 ## Base
 ########################################################
-RYGEL_BASE_MODULES="gupnp-1.0 >= $GUPNP_REQUIRED gee-0.8 >= $GEE_REQUIRED"
+RYGEL_BASE_MODULES="gupnp-1.2 >= $GUPNP_REQUIRED gee-0.8 >= $GEE_REQUIRED"
 
 PKG_CHECK_MODULES([LIBRYGEL_CORE_DEPS],
                   [$RYGEL_BASE_MODULES
-                   gssdp-1.0 >= $GSSDP_REQUIRED
+                   gssdp-1.2 >= $GSSDP_REQUIRED
                    gio-2.0 >= $GIO_REQUIRED
                    gmodule-2.0
                    libxml-2.0 >= $LIBXML_REQUIRED])
-RYGEL_BASE_MODULES_VALAFLAGS='--pkg gupnp-1.0 --pkg gee-0.8'
+RYGEL_BASE_MODULES_VALAFLAGS='--pkg gupnp-1.2 --pkg gee-0.8'
 
 ########################################################
 ## Core
 ########################################################
-LIBRYGEL_CORE_DEPS_VALAFLAGS="$RYGEL_BASE_MODULES_VALAFLAGS --pkg gssdp-1.0 --pkg gio-2.0 --pkg gmodule-2.0 --pkg posix"
+LIBRYGEL_CORE_DEPS_VALAFLAGS="$RYGEL_BASE_MODULES_VALAFLAGS --pkg gssdp-1.2 --pkg gio-2.0 --pkg gmodule-2.0 --pkg posix"
 AC_SUBST([LIBRYGEL_CORE_DEPS_VALAFLAGS])
 
 ########################################################
@@ -113,13 +113,13 @@ AC_SUBST([LIBRYGEL_DB_DEPS_VALAFLAGS])
 ########################################################
 PKG_CHECK_MODULES([LIBRYGEL_SERVER_DEPS],
                   [$RYGEL_COMMON_MODULES
-                   gssdp-1.0 >= $GSSDP_REQUIRED
+                   gssdp-1.2 >= $GSSDP_REQUIRED
                    gio-2.0 >= $GIO_REQUIRED
                    gmodule-2.0
                    libxml-2.0 >= $LIBXML_REQUIRED
                    libsoup-2.4 >= $LIBSOUP_REQUIRED
                    libmediaart-2.0 >= $MEDIAART_REQUIRED])
-LIBRYGEL_SERVER_DEPS_VALAFLAGS="$RYGEL_COMMON_MODULES_VALAFLAGS --pkg gssdp-1.0 --pkg gio-2.0 --pkg libsoup-2.4 --pkg gmodule-2.0 --pkg libmediaart-2.0"
+LIBRYGEL_SERVER_DEPS_VALAFLAGS="$RYGEL_COMMON_MODULES_VALAFLAGS --pkg gssdp-1.2 --pkg gio-2.0 --pkg libsoup-2.4 --pkg gmodule-2.0 --pkg libmediaart-2.0"
 AC_SUBST([LIBRYGEL_SERVER_DEPS_VALAFLAGS])
 
 ########################################################
@@ -146,7 +146,7 @@ AC_SUBST([LIBRYGEL_RUIH_DEPS_VALAFLAGS])
 PKG_CHECK_MODULES([RYGEL_DEPS],
                   [$RYGEL_COMMON_MODULES
                    gio-2.0 >= $GIO_REQUIRED
-                   gssdp-1.0 >= $GSSDP_REQUIRED])
+                   gssdp-1.2 >= $GSSDP_REQUIRED])
 
 
 # Not all tests use all of these dependencies,
@@ -158,10 +158,10 @@ PKG_CHECK_MODULES([RYGEL_DEPS],
 PKG_CHECK_MODULES([TEST_DEPS],
                   [$RYGEL_COMMON_MODULES
                    gio-2.0 >= $GIO_REQUIRED
-                   gssdp-1.0 >= $GSSDP_REQUIRED
+                   gssdp-1.2 >= $GSSDP_REQUIRED
                    libsoup-2.4 >= $LIBSOUP_REQUIRED
                    libxml-2.0 >= $LIBXML_REQUIRED])
-TEST_DEPS_VALAFLAGS="$RYGEL_COMMON_MODULES_VALAFLAGS --pkg gio-2.0 --pkg gssdp-1.0 --pkg libsoup-2.4 --pkg libxml-2.0 --pkg gmodule-2.0"
+TEST_DEPS_VALAFLAGS="$RYGEL_COMMON_MODULES_VALAFLAGS --pkg gio-2.0 --pkg gssdp-1.2 --pkg libsoup-2.4 --pkg libxml-2.0 --pkg gmodule-2.0"
 AC_SUBST([TEST_DEPS_VALAFLAGS])
 
 ########################################################
@@ -170,7 +170,7 @@ AC_SUBST([TEST_DEPS_VALAFLAGS])
 PKG_CHECK_MODULES([EXAMPLE_DEPS],
                   [$RYGEL_COMMON_MODULES
                    gio-2.0 >= $GIO_REQUIRED
-                   gssdp-1.0 >= $GSSDP_REQUIRED])
+                   gssdp-1.2 >= $GSSDP_REQUIRED])
 
 dnl Media engine to use
 BUILT_ENGINES="librygel-media-engine-simple"
@@ -348,15 +348,15 @@ AC_ARG_WITH( ui,
 HAVE_GTK=no
 if test x$try_ui = xyes ; then
     dnl check for gtk
-    PKG_CHECK_MODULES([RYGEL_UI_DEPS], [$RYGEL_BASE_MODULES gtk+-3.0 >= $GTK_REQUIRED gssdp-1.0 >= $GSSDP_REQUIRED gee-0.8 >= $GEE_REQUIRED],
+    PKG_CHECK_MODULES([RYGEL_UI_DEPS], [$RYGEL_BASE_MODULES gtk+-3.0 >= $GTK_REQUIRED gssdp-1.2 >= $GSSDP_REQUIRED gee-0.8 >= $GEE_REQUIRED],
       [
         RYGEL_CHECK_PACKAGES([gtk+-3.0], [HAVE_GTK=yes])
-        RYGEL_UI_DEPS_VALAFLAGS="$RYGEL_BASE_MODULES_VALAFLAGS --pkg gtk+-3.0 --pkg gssdp-1.0 --pkg gee-0.8"
+        RYGEL_UI_DEPS_VALAFLAGS="$RYGEL_BASE_MODULES_VALAFLAGS --pkg gtk+-3.0 --pkg gssdp-1.2 --pkg gee-0.8"
         AC_SUBST([RYGEL_UI_DEPS_VALAFLAGS])
 
         PKG_CHECK_MODULES([EXAMPLE_UI_DEPS],
                           [$RYGEL_COMMON_MODULES gio-2.0 >= $GIO_REQUIRED
-                           gssdp-1.0 >= $GSSDP_REQUIRED
+                           gssdp-1.2 >= $GSSDP_REQUIRED
                            gstreamer-video-1.0 >= $GSTREAMER_REQUIRED
                            gtk+-3.0 >= $GTK_REQUIRED])
       ],
@@ -439,7 +439,7 @@ AS_IF([test "x$enable_tracker_plugin" = "xyes"],
 
 # This should be called only after all RYGEL_CHECK_VALA() and RYGEL_ADD_PLUGIN() calls:
 RYGEL_CHECK_VALA([$VALA_REQUIRED],
-                 [gupnp-1.0
+                 [gupnp-1.2
                   gupnp-av-1.0
                   gio-2.0
                   gee-0.8
diff --git a/src/librygel-core/rygel-core-2.6.deps b/src/librygel-core/rygel-core-2.6.deps
index c65d41bb..e30cec7a 100644
--- a/src/librygel-core/rygel-core-2.6.deps
+++ b/src/librygel-core/rygel-core-2.6.deps
@@ -1,4 +1,4 @@
 gee-0.8
 gio-2.0
 libxml-2.0
-gupnp-1.0
+gupnp-1.2
diff --git a/src/librygel-core/rygel-root-device.vala b/src/librygel-core/rygel-root-device.vala
index 4d212d51..b14bf8c0 100644
--- a/src/librygel-core/rygel-root-device.vala
+++ b/src/librygel-core/rygel-root-device.vala
@@ -37,23 +37,24 @@ using Gee;
  * having first instantiated the #RygelRootDeviceFactory
  * for a #GUPnPContext.
  */
-public class Rygel.RootDevice: GUPnP.RootDevice {
+public class Rygel.RootDevice: GUPnP.RootDevice, GLib.Initable {
     public ArrayList<ServiceInfo> services { get; internal set; }   /* Services we implement */
 
     public RootDevice (GUPnP.Context context,
                        Plugin        plugin,
                        XMLDoc        description_doc,
                        string        description_path,
-                       string        description_dir) {
+                       string        description_dir) throws Error {
         Object (context : context,
                 resource_factory : plugin,
                 description_doc : description_doc,
                 description_path: description_path,
                 description_dir: description_dir);
+        init (null);
     }
 
-    public override void constructed () {
-        base.constructed ();
+    public bool init (Cancellable? cancellable) throws Error {
+        base.init (cancellable);
 
         this.services = new ArrayList<ServiceInfo> ();
         var plugin = this.resource_factory as Plugin;
@@ -67,5 +68,7 @@ public class Rygel.RootDevice: GUPnP.RootDevice {
                 this.services.add (service);
             }
         }
+
+        return true;
     }
 }
diff --git a/src/librygel-ruih/rygel-ruih-2.0.deps b/src/librygel-ruih/rygel-ruih-2.0.deps
index 55a17667..490da8a3 100644
--- a/src/librygel-ruih/rygel-ruih-2.0.deps
+++ b/src/librygel-ruih/rygel-ruih-2.0.deps
@@ -1,5 +1,5 @@
 gee-0.8
-gupnp-1.0
+gupnp-1.2
 gio-2.0
 rygel-core-2.6
 gupnp-av-1.0
diff --git a/src/librygel-server/rygel-server-2.6.deps b/src/librygel-server/rygel-server-2.6.deps
index 55a17667..490da8a3 100644
--- a/src/librygel-server/rygel-server-2.6.deps
+++ b/src/librygel-server/rygel-server-2.6.deps
@@ -1,5 +1,5 @@
 gee-0.8
-gupnp-1.0
+gupnp-1.2
 gio-2.0
 rygel-core-2.6
 gupnp-av-1.0