[gupnp-dlna/gstreamer-1.0: 2/2] More 1.0 fixes

[Jens Georg <jensgeorg src gnome org>]

commit f665ee10afdcf0d9ce4706b6ac0058e38e549681
Author: Jens Georg <mail jensge org>
Date:   Wed Jul 25 08:59:15 2012 +0200

    More 1.0 fixes

 configure.ac                    |    2 +-
 libgupnp-dlna/Makefile.am       |    4 ++--
 libgupnp-dlna/profile-loading.c |    2 +-
 tests/dlna-encoding.c           |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 921d1c1..f403377 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,7 +39,7 @@ LT_INIT([win32-dll])
 
 PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= 2.5.0)
 
-GST_MAJORMINOR=0.11
+GST_MAJORMINOR=1.0
 GST_REQ=0.10.29.2
 GSTPBU_REQ=0.10.32
 
diff --git a/libgupnp-dlna/Makefile.am b/libgupnp-dlna/Makefile.am
index 55f4ed2..4c93cc5 100644
--- a/libgupnp-dlna/Makefile.am
+++ b/libgupnp-dlna/Makefile.am
@@ -65,9 +65,9 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(top_srcdir)
 
 if HAVE_INTROSPECTION
 GUPnPDLNA-1.0.gir: libgupnp-dlna-1.0.la
-GUPnPDLNA_1_0_gir_INCLUDES = libxml2-2.0 GObject-2.0 GstPbutils-0.10
+GUPnPDLNA_1_0_gir_INCLUDES = libxml2-2.0 GObject-2.0 GstPbutils-1.0
 GUPnPDLNA_1_0_gir_CFLAGS =  $(INCLUDES) $(AM_CFLAGS)
-GUPnPDLNA_1_0_gir_LIBS = libgupnp-dlna-1.0.la gstreamer-0.10
+GUPnPDLNA_1_0_gir_LIBS = libgupnp-dlna-1.0.la gstreamer-1.0
 GUPnPDLNA_1_0_gir_FILES = $(introspection_sources)
 GUPnPDLNA_1_0_gir_NAMESPACE = GUPnPDLNA
 GUPnPDLNA_1_0_gir_VERSION = 1.0
diff --git a/libgupnp-dlna/profile-loading.c b/libgupnp-dlna/profile-loading.c
index 874fe44..783aa1e 100644
--- a/libgupnp-dlna/profile-loading.c
+++ b/libgupnp-dlna/profile-loading.c
@@ -57,7 +57,7 @@ merge_caps (GstCaps *caps1, GstCaps *caps2)
         if (!gst_caps_is_any (caps1) && !gst_caps_is_any (caps2)) {
                 any = TRUE;
                 gst_caps_merge (caps1, gst_caps_copy (caps2));
-                gst_caps_do_simplify (caps1);
+                gst_caps_simplify (caps1);
         }
 
         ret = gst_caps_make_writable (caps1);
diff --git a/tests/dlna-encoding.c b/tests/dlna-encoding.c
index 714cc1b..8dc89b8 100644
--- a/tests/dlna-encoding.c
+++ b/tests/dlna-encoding.c
@@ -104,7 +104,7 @@ transcode_file (gchar * uri, gchar * outputuri, GstEncodingProfile * prof)
   g_print (" Input URI  : %s\n", uri);
   g_print (" Output URI : %s\n", outputuri);
 
-  sink = gst_element_make_from_uri (GST_URI_SINK, outputuri, "sink");
+  sink = gst_element_make_from_uri (GST_URI_SINK, outputuri, "sink", NULL);
   if (G_UNLIKELY (sink == NULL)) {
     g_print ("Can't create output sink, most likely invalid output URI !\n");
     return;