Commit fdec6d0f authored by Jonathan Matthew's avatar Jonathan Matthew 🥗
Browse files

GStreamer package and library names changed from 0.11 to 1.0

parent 42923998
......@@ -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
......
......@@ -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,
......
......@@ -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;
}
......
......@@ -46,7 +46,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
......@@ -271,16 +271,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],
......
......@@ -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
......@@ -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,
......
......@@ -29,6 +29,7 @@
#include "config.h"
#include <string.h>
#include <sys/stat.h>
#include <glib/gi18n.h>
#include <libmtp.h>
......
......@@ -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)
......
......@@ -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) \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment