Commit 03984ccb authored by Jonathan Matthew's avatar Jonathan Matthew 🥗
Browse files

build against GStreamer 0.11

parent 34aa9933
......@@ -12,8 +12,8 @@ librbbackendsgstreamer_la_SOURCES = \
$(NULL)
librbbackendsgstreamer_la_LIBADD = \
-lgstpbutils-0.10 \
-lgstcontroller-0.10
-lgstpbutils-0.11 \
-lgstcontroller-0.11
$(RHYTHMBOX_LIBS)
librbbackendsgstreamer_la_LDFLAGS = -export-dynamic
......
......@@ -145,11 +145,11 @@ MPID_3_0_gir_PACKAGES = gobject-2.0
MPID_3_0_gir_SCANNERFLAGS = --symbol-prefix mpid_
RB-3.0.gir: $(top_builddir)/shell/librhythmbox-core.la MPID-3.0.gir
RB_3_0_gir_INCLUDES = GObject-2.0 Gio-2.0 Gtk-3.0 Gst-0.10 GstPbutils-0.10 libxml2-2.0
RB_3_0_gir_INCLUDES = GObject-2.0 Gio-2.0 Gtk-3.0 Gst-0.11 GstPbutils-0.11 libxml2-2.0
RB_3_0_gir_CFLAGS = $(RHYTHMBOX_CFLAGS_NOWARN) $(TOTEM_PLPARSER_CFLAGS) $(DBUS_CFLAGS) $(GUDEV_CFLAGS) -I$(top_srcdir)
RB_3_0_gir_LIBS = $(top_builddir)/shell/librhythmbox-core.la
RB_3_0_gir_FILES = $(addprefix $(top_srcdir)/,$(rb_introspection_sources))
RB_3_0_gir_PACKAGES = gobject-2.0 gio-2.0 gtk+-3.0 gstreamer-0.10 libxml-2.0
RB_3_0_gir_PACKAGES = gobject-2.0 gio-2.0 gtk+-3.0 gstreamer-0.11 libxml-2.0
RB_3_0_gir_SCANNERFLAGS = --symbol-prefix rb_ --identifier-prefix RB --accept-unprefixed --include-uninstalled=$(builddir)/MPID-3.0.gir
INTROSPECTION_GIRS += MPID-3.0.gir RB-3.0.gir
......
......@@ -46,7 +46,7 @@ AC_CHECK_SIZEOF(long)
GTK_REQS=3.4.0
GST_0_10_REQS=0.10.32
GST_0_11_REQS=0.11.0
GDK_PIXBUF_REQS=2.18.0
GLIB_REQS=2.32.0
LIBGPOD_REQS=0.6
......@@ -271,15 +271,16 @@ 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_10, \
gstreamer-0.10 >= $GST_0_10_REQS
gstreamer-base-0.10 >= $GST_0_10_REQS
gstreamer-plugins-base-0.10 >= $GST_0_10_REQS
gstreamer-interfaces-0.10 >= $GST_0_10_REQS
gstreamer-pbutils-0.10 >= $GST_0_10_REQS)
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_10_CFLAGS"
RHYTHMBOX_LIBS="$RHYTHMBOX_LIBS $GSTREAMER_0_10_LIBS"
RHYTHMBOX_CFLAGS="$RHYTHMBOX_CFLAGS $GSTREAMER_0_11_CFLAGS -DGST_USE_UNSTABLE_API"
RHYTHMBOX_LIBS="$RHYTHMBOX_LIBS $GSTREAMER_0_11_LIBS"
AC_ARG_WITH(mdns,
AC_HELP_STRING([--with-mdns=auto|avahi],
......@@ -355,11 +356,6 @@ fi
AC_CHECK_LIB(z, uncompress)
dnl check for libgstcdda, needed to list the audio tracks
PKG_CHECK_MODULES(GSTCDDA, gstreamer-cdda-0.10)
AC_SUBST(GSTCDDA_LIBS)
AC_SUBST(GSTCDDA_CFLAGS)
AC_PATH_XTRA
CFLAGS="$CFLAGS $X_CFLAGS"
#LIBS=$X_LIBS
......
......@@ -62,7 +62,7 @@ rhythmbox_metadata_LDADD = \
librbmetadatasvc.la \
$(top_builddir)/lib/librb.la \
$(RHYTHMBOX_LIBS) \
-lgstpbutils-0.10
-lgstpbutils-0.11
# test program?
noinst_PROGRAMS = test-metadata
......@@ -73,6 +73,6 @@ test_metadata_LDADD = \
librbmetadata.la \
$(top_builddir)/lib/librb.la \
$(RHYTHMBOX_LIBS) \
-lgstpbutils-0.10
-lgstpbutils-0.11
librbmetadata_la_LDFLAGS = -export-dynamic
......@@ -16,8 +16,7 @@ libaudiocd_la_LIBTOOLFLAGS = --tag=disable-static
libaudiocd_la_LIBADD = \
$(top_builddir)/shell/librhythmbox-core.la \
$(TOTEM_PLPARSER_LIBS) \
$(GSTCDDA_LIBS)
$(TOTEM_PLPARSER_LIBS)
INCLUDES = \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
......@@ -39,7 +38,6 @@ INCLUDES = \
-DDATADIR=\""$(datadir)"\" \
$(TOTEM_PLPARSER_CFLAGS) \
$(RHYTHMBOX_CFLAGS) \
$(GSTCDDA_CFLAGS) \
-DUSE_TOTEM_PL_PARSER \
-D_BSD_SOURCE
......
......@@ -19,7 +19,7 @@ libvisualizer_la_LIBTOOLFLAGS = --tag=disable-static
libvisualizer_la_LIBADD = \
$(top_builddir)/shell/librhythmbox-core.la \
-lgstinterfaces-0.10 \
-lgstinterfaces-0.11 \
$(CLUTTER_LIBS) \
$(RHYTHMBOX_LIBS)
......
......@@ -8,7 +8,7 @@ plugindir=@libdir@/rhythmbox/plugins
Name: rhythmbox
Description: plugin API for rhythmbox
Version: @VERSION@
Requires: glib-2.0 gobject-2.0 gio-2.0 gtk+-3.0 libsoup-2.4 libsoup-gnome-2.4 totem-plparser gstreamer-0.10
Requires: glib-2.0 gobject-2.0 gio-2.0 gtk+-3.0 libsoup-2.4 libsoup-gnome-2.4 totem-plparser gstreamer-0.11
Requires.private: libxml-2.0
Libs: -L${libdir} -lrhythmbox-core
Cflags: -I${includedir}/rhythmbox
......@@ -112,9 +112,9 @@ librhythmbox_core_la_LIBADD = \
$(GUDEV_LIBS) \
$(WEBKIT_LIBS) \
$(RHYTHMBOX_LIBS) \
-lgstpbutils-0.10 \
-lgstcontroller-0.10 \
-lgsttag-0.10
-lgstpbutils-0.11 \
-lgstcontroller-0.11 \
-lgsttag-0.11
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