From 84c824f8f5bd5852ba52686e4ad81351d2c52bc0 Mon Sep 17 00:00:00 2001
From: Regis Merlino <regis.merlino@intel.com>
Date: Thu, 7 Mar 2013 10:58:13 +0100
Subject: Updated GUPnP-DLNA version to 0.10.0 (a245d94)

---
 data/Makefile.am |  2 +-
 data/Makefile.in | 31 ++++++++++++++++++++++++-------
 data/common.xml  |  7 +++----
 data/png.xml     |  2 +-
 4 files changed, 29 insertions(+), 13 deletions(-)

(limited to 'data')

diff --git a/data/Makefile.am b/data/Makefile.am
index 550d094..0043f46 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,4 +1,4 @@
-shareddir = $(datadir)/gupnp-dlna
+include $(top_srcdir)/common.am
 
 dlnaschemas = dlna-profiles.rng
 dlnaprofiles = mp3.xml \
diff --git a/data/Makefile.in b/data/Makefile.in
index c9a018b..516f600 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -51,14 +51,15 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/common.am
 subdir = data
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -134,18 +135,30 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_PREFIX = @GLIB_PREFIX@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
+GOBJECT_CFLAGS = @GOBJECT_CFLAGS@
+GOBJECT_LIBS = @GOBJECT_LIBS@
 GREP = @GREP@
 GST_CFLAGS = @GST_CFLAGS@
+GST_LEGACY_CFLAGS = @GST_LEGACY_CFLAGS@
+GST_LEGACY_LIBS = @GST_LEGACY_LIBS@
+GST_LEGACY_MAJORMINOR = @GST_LEGACY_MAJORMINOR@
 GST_LIBS = @GST_LIBS@
 GST_MAJORMINOR = @GST_MAJORMINOR@
 GST_PBU_CFLAGS = @GST_PBU_CFLAGS@
+GST_PBU_LEGACY_CFLAGS = @GST_PBU_LEGACY_CFLAGS@
+GST_PBU_LEGACY_LIBS = @GST_PBU_LEGACY_LIBS@
 GST_PBU_LIBS = @GST_PBU_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
+GUPNP_DLNA_METADATA_BACKEND_CFLAGS = @GUPNP_DLNA_METADATA_BACKEND_CFLAGS@
 GUPNP_DLNA_VERSION_INFO = @GUPNP_DLNA_VERSION_INFO@
 HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
@@ -171,8 +184,10 @@ LIBXML_LIBS = @LIBXML_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
+METADATA_DIRECTORY = @METADATA_DIRECTORY@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -196,6 +211,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+VAPIGEN = @VAPIGEN@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -249,7 +265,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-shareddir = $(datadir)/gupnp-dlna
+shareddir = $(datadir)/gupnp-dlna-2.0
 dlnaschemas = dlna-profiles.rng
 dlnaprofiles = mp3.xml \
 	       ac3.xml \
@@ -271,7 +287,7 @@ EXTRA_DIST = $(dlnaschemas) $(dlnaprofiles)
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/common.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -292,13 +308,14 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
+$(top_srcdir)/common.am:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 
diff --git a/data/common.xml b/data/common.xml
index af0bb71..26589ef 100644
--- a/data/common.xml
+++ b/data/common.xml
@@ -42,11 +42,10 @@
       <field name="profile" type="string">
         <value>lc</value>
       </field>
-      <!-- TODO: not exported in Gst yet
-      <field name="level" type="int">
-        <range min="1" max="2" />
+      <field name="level" type="string">
+        <value>1</value>
+        <value>2</value>
       </field>
-      -->
       <field name="channels" type="int">
         <range min="1" max="2" />
       </field>
diff --git a/data/png.xml b/data/png.xml
index c4c98b5..501ab3e 100644
--- a/data/png.xml
+++ b/data/png.xml
@@ -65,7 +65,7 @@
       <field name="width" type="int">
         <range min="1" max="4096" />
       </field>
-      <field name="depth" type="int">
+      <field name="depth" type="int" used="in-strict">
         <value>1</value>
         <value>2</value>
         <value>4</value>
-- 
cgit v1.2.3