From f3497960c433cdbc64a8cacdf82189df7401da54 Mon Sep 17 00:00:00 2001 From: Arun Raghavan Date: Wed, 16 Jun 2010 07:00:40 +0530 Subject: [PATCH] build: Build against gupnp-dlna The DLNA profile storage and detection bits are being moved to a separate library and we use this in media-export now. --- configure.ac | 6 +++++- src/plugins/media-export/Makefile.am | 4 +++- src/plugins/media-export/rygel-media-export-metadata-extractor.vala | 1 + src/rygel/Makefile.am | 2 -- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 6e2e5a8..882f215 100644 --- a/configure.ac +++ b/configure.ac @@ -36,9 +36,9 @@ 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(LIBDBUS_GLIB, dbus-glib-1 >= $DBUS_GLIB_REQUIRED) PKG_CHECK_MODULES(LIBGSTREAMER, gstreamer-0.10 >= $GSTREAMER_REQUIRED) -PKG_CHECK_MODULES(LIBGSTDISCOVERER, gstreamer-discoverer-0.10 >= $GST_DISCOVERER_REQUIRED) PKG_CHECK_MODULES(LIBGIO, gio-2.0 >= $GIO_REQUIRED) PKG_CHECK_MODULES(GEE, gee-1.0 >= $GEE_REQUIRED) PKG_CHECK_MODULES(UUID, uuid >= $UUID_REQUIRED) @@ -94,6 +94,10 @@ if test x$enable_vala = xyes ; then true, [AC_MSG_ERROR("Unable to find Vala bindings for gupnp-av-1.0")]) + AC_CHECK_FILE("${VAPIDIR}/gupnp-dlna-1.0.vapi", + true, + [AC_MSG_ERROR("Unable to find Vala bindings for gupnp-dlna-1.0")]) + AC_CHECK_FILE("${VAPIDIR}/dbus-glib-1.vapi", true, [AC_MSG_ERROR("Unable to find Vala bindings for dbus-glib-1")]) diff --git a/src/plugins/media-export/Makefile.am b/src/plugins/media-export/Makefile.am index ed059ae..47a4f8b 100644 --- a/src/plugins/media-export/Makefile.am +++ b/src/plugins/media-export/Makefile.am @@ -10,8 +10,8 @@ plugin_LTLIBRARIES = librygel-media-export.la AM_CFLAGS = $(LIBGUPNP_CFLAGS) \ $(LIBGUPNP_AV_CFLAGS) \ + $(LIBGUPNP_DLNA_CFLAGS) \ $(LIBDBUS_GLIB_CFLAGS) \ - $(LIBGSTREAMER_CFLAGS) \ $(LIBSQLITE3_CFLAGS) \ $(GEE_CFLAGS) \ $(UUID_CFLAGS) \ @@ -42,6 +42,7 @@ librygel_media_export_la_VALAFLAGS = --vapidir=$(top_srcdir)/src/rygel \ --pkg rygel-1.0 \ --pkg gupnp-1.0 \ --pkg gupnp-av-1.0 \ + --pkg gupnp-dlna-1.0 \ --pkg libsoup-2.4 \ --pkg gee-1.0 \ --pkg libxml-2.0 \ @@ -49,6 +50,7 @@ librygel_media_export_la_VALAFLAGS = --vapidir=$(top_srcdir)/src/rygel \ librygel_media_export_la_LIBADD = $(LIBGUPNP_LIBS) \ $(LIBGUPNP_AV_LIBS) \ + $(LIBGUPNP_DLNA_LIBS) \ $(LIBDBUS_GLIB_LIBS) \ $(LIBGSTREAMER_LIBS) \ $(LIBSQLITE3_LIBS) \ diff --git a/src/plugins/media-export/rygel-media-export-metadata-extractor.vala b/src/plugins/media-export/rygel-media-export-metadata-extractor.vala index a6dae3d..c784d14 100644 --- a/src/plugins/media-export/rygel-media-export-metadata-extractor.vala +++ b/src/plugins/media-export/rygel-media-export-metadata-extractor.vala @@ -25,6 +25,7 @@ using Gst; using Gee; +using GUPnP; /** * Metadata extractor based on Gstreamer. Just set the URI of the media on the diff --git a/src/rygel/Makefile.am b/src/rygel/Makefile.am index f8271db..aeb7dbf 100644 --- a/src/rygel/Makefile.am +++ b/src/rygel/Makefile.am @@ -13,7 +13,6 @@ endif AM_CFLAGS = $(LIBGUPNP_CFLAGS) \ $(LIBGUPNP_AV_CFLAGS) \ $(LIBGSTREAMER_CFLAGS) \ - $(LIBGSTDISCOVERER_FLAGS) \ $(GIO_CFLAGS) \ $(GEE_CFLAGS) \ $(UUID_CFLAGS) \ @@ -117,7 +116,6 @@ rygel_LDADD = librygel-configuration.a \ $(LIBGUPNP_LIBS) \ $(LIBGUPNP_AV_LIBS) \ $(LIBGSTREAMER_LIBS) \ - $(LIBGSTDISCOVERER_LIBS) \ $(GIO_LIBS) \ $(GEE_LIBS) \ $(UUID_LIBS) \ -- 2.7.4