GNOME.org
 

[rhythmbox/gstreamer-1.0: 13/22] GStreamer package and library names changed from 0.11 to 1.0

commit e600fe915960a1463c8e5be8b73f8bf32ccc5b38
Author: Jonathan Matthew <jonathan d14n org>
Date:   Tue Jul 3 09:22:09 2012 +1000

    GStreamer package and library names changed from 0.11 to 1.0

 backends/gstreamer/Makefile.am           |    4 ++--
 backends/gstreamer/rb-encoder-gst.c      |    4 ++--
 backends/gstreamer/rb-player-gst-xfade.c |    2 +-
 configure.ac                             |   21 ++++++++++-----------
 metadata/Makefile.am                     |    4 ++--
 metadata/rb-metadata-gst.c               |    4 ++--
 plugins/mtpdevice/rb-mtp-gst-sink.c      |    1 +
 plugins/visualizer/Makefile.am           |    1 -
 shell/Makefile.am                        |    6 +++---
 9 files changed, 23 insertions(+), 24 deletions(-)
---
diff --git a/backends/gstreamer/Makefile.am b/backends/gstreamer/Makefile.am
index 2d25e0b..af30028 100644
--- a/backends/gstreamer/Makefile.am
+++ b/backends/gstreamer/Makefile.am
@@ -12,8 +12,8 @@ librbbackendsgstreamer_la_SOURCES =			\
 	$(NULL)
 
 librbbackendsgstreamer_la_LIBADD =			\
-	-lgstpbutils-0.11				\
-	-lgstcontroller-0.11
+	-lgstpbutils-1.0				\
+	-lgstcontroller-1.0
 	$(RHYTHMBOX_LIBS)
 
 librbbackendsgstreamer_la_LDFLAGS = -export-dynamic
diff --git a/backends/gstreamer/rb-encoder-gst.c b/backends/gstreamer/rb-encoder-gst.c
index 7cc170e..350be2d 100644
--- a/backends/gstreamer/rb-encoder-gst.c
+++ b/backends/gstreamer/rb-encoder-gst.c
@@ -493,7 +493,7 @@ attach_output_pipeline (RBEncoderGst *encoder,
 	}
 
 	if (sink == NULL) {
-		sink = gst_element_make_from_uri (GST_URI_SINK, dest, "sink");
+		sink = gst_element_make_from_uri (GST_URI_SINK, dest, "sink", NULL);
 		if (sink == NULL) {
 			g_set_error (error, RB_ENCODER_ERROR, RB_ENCODER_ERROR_FILE_ACCESS,
 				     _("Could not create a GStreamer sink element to write to %s"),
@@ -528,7 +528,7 @@ create_pipeline_and_source (RBEncoderGst *encoder,
 		return NULL;
 	}
 
-	src = gst_element_make_from_uri (GST_URI_SRC, uri, "source");
+	src = gst_element_make_from_uri (GST_URI_SRC, uri, "source", NULL);
 	if (src == NULL) {
 		g_set_error (error,
 			     RB_ENCODER_ERROR, RB_ENCODER_ERROR_INTERNAL,
diff --git a/backends/gstreamer/rb-player-gst-xfade.c b/backends/gstreamer/rb-player-gst-xfade.c
index dba4713..49b91b0 100644
--- a/backends/gstreamer/rb-player-gst-xfade.c
+++ b/backends/gstreamer/rb-player-gst-xfade.c
@@ -449,7 +449,7 @@ rb_xfade_stream_dispose (GObject *object)
 	}
 
 	if (sd->tags != NULL) {
-		rb_list_destroy_free (sd->tags, (GDestroyNotify) gst_tag_list_free);
+		rb_list_destroy_free (sd->tags, (GDestroyNotify) gst_tag_list_unref);
 		sd->tags = NULL;
 	}
 
diff --git a/configure.ac b/configure.ac
index b217858..463f30b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,7 +45,7 @@ AC_CHECK_SIZEOF(long)
 
 GTK_REQS=3.4.0
 
-GST_0_11_REQS=0.11.0
+GST_REQS=0.11.92
 GDK_PIXBUF_REQS=2.18.0
 GLIB_REQS=2.32.0
 LIBGPOD_REQS=0.6
@@ -255,16 +255,15 @@ fi
 dnl Sound system
 dnl Now we're ready to ask for gstreamer libs and cflags
 dnl And we can also ask for the right version of gstreamer
-PKG_CHECK_MODULES(GSTREAMER_0_11, \
-	gstreamer-0.11 >= $GST_0_11_REQS
-	gstreamer-audio-0.11 >= $GST_0_11_REQS
-	gstreamer-base-0.11 >= $GST_0_11_REQS
-	gstreamer-plugins-base-0.11 >= $GST_0_11_REQS
-	gstreamer-interfaces-0.11 >= $GST_0_11_REQS
-	gstreamer-pbutils-0.11 >= $GST_0_11_REQS)
-
-RHYTHMBOX_CFLAGS="$RHYTHMBOX_CFLAGS $GSTREAMER_0_11_CFLAGS -DGST_USE_UNSTABLE_API"
-RHYTHMBOX_LIBS="$RHYTHMBOX_LIBS $GSTREAMER_0_11_LIBS"
+PKG_CHECK_MODULES(GSTREAMER, \
+	gstreamer-1.0 >= $GST_REQS
+	gstreamer-audio-1.0 >= $GST_REQS
+	gstreamer-base-1.0 >= $GST_REQS
+	gstreamer-plugins-base-1.0 >= $GST_REQS
+	gstreamer-pbutils-1.0 >= $GST_REQS)
+
+RHYTHMBOX_CFLAGS="$RHYTHMBOX_CFLAGS $GSTREAMER_CFLAGS -DGST_USE_UNSTABLE_API"
+RHYTHMBOX_LIBS="$RHYTHMBOX_LIBS $GSTREAMER_LIBS"
 
 AC_ARG_WITH(mdns,
    AC_HELP_STRING([--with-mdns=auto|avahi],
diff --git a/metadata/Makefile.am b/metadata/Makefile.am
index 63ff837..4d8db76 100644
--- a/metadata/Makefile.am
+++ b/metadata/Makefile.am
@@ -62,7 +62,7 @@ rhythmbox_metadata_LDADD = 				\
 	librbmetadatasvc.la				\
 	$(top_builddir)/lib/librb.la			\
 	$(RHYTHMBOX_LIBS)				\
-	-lgstpbutils-0.11
+	-lgstpbutils-1.0
 
 # test program?
 noinst_PROGRAMS = test-metadata
@@ -73,6 +73,6 @@ test_metadata_LDADD =					\
 	librbmetadata.la				\
 	$(top_builddir)/lib/librb.la			\
 	$(RHYTHMBOX_LIBS)				\
-	-lgstpbutils-0.11
+	-lgstpbutils-1.0
 
 librbmetadata_la_LDFLAGS = -export-dynamic
diff --git a/metadata/rb-metadata-gst.c b/metadata/rb-metadata-gst.c
index 315ecfc..40b5b35 100644
--- a/metadata/rb-metadata-gst.c
+++ b/metadata/rb-metadata-gst.c
@@ -104,7 +104,7 @@ run_typefind (RBMetaData *md, const char *uri)
 {
 	GstElement *src;
 
-	src = gst_element_make_from_uri (GST_URI_SRC, uri, NULL);
+	src = gst_element_make_from_uri (GST_URI_SRC, uri, NULL, NULL);
 	if (src != NULL) {
 		GstElement *pipeline = gst_pipeline_new (NULL);
 		GstElement *sink = gst_element_factory_make ("fakesink", NULL);
@@ -657,7 +657,7 @@ rb_metadata_save (RBMetaData *md, const char *uri, GError **error)
 	md->priv->pipeline = pipeline;
 	md->priv->sink_linked = FALSE;
 
-	urisrc = gst_element_make_from_uri (GST_URI_SRC, uri, "urisrc");
+	urisrc = gst_element_make_from_uri (GST_URI_SRC, uri, "urisrc", NULL);
 	if (urisrc == NULL) {
 		g_set_error (error,
 			     RB_METADATA_ERROR,
diff --git a/plugins/mtpdevice/rb-mtp-gst-sink.c b/plugins/mtpdevice/rb-mtp-gst-sink.c
index 4e4a298..23e6542 100644
--- a/plugins/mtpdevice/rb-mtp-gst-sink.c
+++ b/plugins/mtpdevice/rb-mtp-gst-sink.c
@@ -29,6 +29,7 @@
 #include "config.h"
 
 #include <string.h>
+#include <sys/stat.h>
 
 #include <glib/gi18n.h>
 #include <libmtp.h>
diff --git a/plugins/visualizer/Makefile.am b/plugins/visualizer/Makefile.am
index 14b7c8e..800a092 100644
--- a/plugins/visualizer/Makefile.am
+++ b/plugins/visualizer/Makefile.am
@@ -19,7 +19,6 @@ libvisualizer_la_LIBTOOLFLAGS = --tag=disable-static
 
 libvisualizer_la_LIBADD = 			\
 	$(top_builddir)/shell/librhythmbox-core.la	\
-	-lgstinterfaces-0.11				\
 	$(CLUTTER_LIBS)					\
 	$(RHYTHMBOX_LIBS)
 
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 297b477..a5dd0aa 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -112,9 +112,9 @@ librhythmbox_core_la_LIBADD =				\
 	$(GUDEV_LIBS)					\
 	$(WEBKIT_LIBS)				\
 	$(RHYTHMBOX_LIBS)				\
-	-lgstpbutils-0.11				\
-	-lgstcontroller-0.11				\
-	-lgsttag-0.11
+	-lgstpbutils-1.0				\
+	-lgstcontroller-1.0				\
+	-lgsttag-1.0
 
 librhythmbox_core_la_LDFLAGS = 				\
 	-version-info $(RHYTHMBOX_CORE_CURRENT):$(RHYTHMBOX_CORE_REVISION):$(RHYTHMBOX_CORE_AGE)	\
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]