build: Update gupnp-dlna deps

gupnp-dlna now ships an internal gst-discoverer - use this instead of
system gstdiscoverer.

diff --git a/configure.ac b/configure.ac
index 882f215..55b3cd8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -23,10 +23,10 @@ AC_FUNC_MMAP
 VALA_REQUIRED=0.9.3
 GUPNP_REQUIRED=0.13.4
 GUPNP_AV_REQUIRED=0.5.7
+GUPNP_DLNA_REQUIRED=0.1.0
 GUPNP_VALA_REQUIRED=0.6.7
 DBUS_GLIB_REQUIRED=0.74
 GSTREAMER_REQUIRED=0.10.23
-GST_DISCOVERER_REQUIRED=0.10.0.1
 GIO_REQUIRED=2.16
 GEE_REQUIRED=0.5.0
 UUID_REQUIRED=1.41.3
@@ -36,7 +36,7 @@ LIBSQLITE3_REQUIRED=3.5
 
 PKG_CHECK_MODULES(LIBGUPNP, gupnp-1.0 >= $GUPNP_REQUIRED)
 PKG_CHECK_MODULES(LIBGUPNP_AV, gupnp-av-1.0 >= $GUPNP_AV_REQUIRED)
-PKG_CHECK_MODULES(LIBGUPNP_DLNA, gupnp-dlna-1.0 >= $GUPNP_AV_REQUIRED)
+PKG_CHECK_MODULES(LIBGUPNP_DLNA, gupnp-dlna-1.0 >= $GUPNP_DLNA_REQUIRED)
 PKG_CHECK_MODULES(LIBDBUS_GLIB, dbus-glib-1 >= $DBUS_GLIB_REQUIRED)
 PKG_CHECK_MODULES(LIBGSTREAMER, gstreamer-0.10 >= $GSTREAMER_REQUIRED)
 PKG_CHECK_MODULES(LIBGIO, gio-2.0 >= $GIO_REQUIRED)
@@ -106,9 +106,9 @@ if test x$enable_vala = xyes ; then
                   true,
                   [AC_MSG_ERROR("Unable to find Vala bindings for gstreamer-0.10")])
 
-    AC_CHECK_FILE("${VAPIDIR}/gstreamer-discoverer-0.10.vapi",
+    AC_CHECK_FILE("${VAPIDIR}/gstreamer-discoverer-gupnp-dlna-0.10.vapi",
                   true,
-                  [AC_MSG_ERROR("Unable to find Vala bindings for gstreamer-discoverer-0.10")])
+                  [AC_MSG_ERROR("Unable to find Vala bindings for gstreamer-discoverer-gupnp-dlna-0.10")])
 
     AC_CHECK_FILE("${VAPIDIR}/gio-2.0.vapi",
                   true,

diff --git a/src/rygel/Makefile.am b/src/rygel/Makefile.am
index aeb7dbf..87a3633 100644 (file)
--- a/src/rygel/Makefile.am
+++ b/src/rygel/Makefile.am
@@ -107,9 +107,7 @@ rygel_VALAFLAGS = \
        -H rygel.h -C --library=rygel-1.0 --vapidir=$(srcdir) --thread \
        --pkg rygel-build-config --pkg rygel-misc --pkg gupnp-1.0 \
        --pkg gupnp-av-1.0 --pkg dbus-glib-1 --pkg gstreamer-0.10 \
-       --pkg gio-2.0 --pkg gee-1.0 --pkg posix \
-       --pkg gstreamer-discoverer-0.10 \
-       -g
+       --pkg gio-2.0 --pkg gee-1.0 --pkg posix -g
 # Note:  `-- the -g needs to be at the end of VALAFLAGS to not break make dist
 
 rygel_LDADD = librygel-configuration.a \