GNOME.org
 

[rhythmbox/gstreamer-0.11: 1/12] build against GStreamer 0.11

commit 14402c8a4a29e7e03dc43cf9a9754fd6d379b4bd
Author: Jonathan Matthew <jonathan d14n org>
Date:   Mon Feb 27 22:56:27 2012 +1000

    build against GStreamer 0.11

 backends/gstreamer/Makefile.am |    4 ++--
 bindings/gi/Makefile.am        |    4 ++--
 configure.ac                   |   24 ++++++++++--------------
 metadata/Makefile.am           |    4 ++--
 plugins/audiocd/Makefile.am    |    4 +---
 plugins/visualizer/Makefile.am |    2 +-
 rhythmbox.pc.in                |    2 +-
 shell/Makefile.am              |    6 +++---
 8 files changed, 22 insertions(+), 28 deletions(-)
---
diff --git a/backends/gstreamer/Makefile.am b/backends/gstreamer/Makefile.am
index a0efa5b..2d25e0b 100644
--- a/backends/gstreamer/Makefile.am
+++ b/backends/gstreamer/Makefile.am
@@ -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
diff --git a/bindings/gi/Makefile.am b/bindings/gi/Makefile.am
index 32d2f21..314457f 100644
--- a/bindings/gi/Makefile.am
+++ b/bindings/gi/Makefile.am
@@ -143,11 +143,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
diff --git a/configure.ac b/configure.ac
index 0a8f48b..8236a15 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,7 +45,7 @@ AC_CHECK_SIZEOF(long)
 
 GTK_REQS=2.91.4
 
-GST_0_10_REQS=0.10.32
+GST_0_11_REQS=0.11.0
 GDK_PIXBUF_REQS=2.18.0
 GLIB_REQS=2.26.0
 LIBGPOD_REQS=0.6
@@ -253,15 +253,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],
@@ -337,11 +338,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)
-
 dnl check for MusicBrainz
 have_sj_metadata_getter=no
 AC_ARG_ENABLE(musicbrainz, AC_HELP_STRING([--disable-musicbrainz],
diff --git a/metadata/Makefile.am b/metadata/Makefile.am
index ae64fac..0e99b8a 100644
--- a/metadata/Makefile.am
+++ b/metadata/Makefile.am
@@ -59,7 +59,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
@@ -70,6 +70,6 @@ test_metadata_LDADD =					\
 	librbmetadata.la				\
 	$(top_builddir)/lib/librb.la			\
 	$(RHYTHMBOX_LIBS)				\
-	-lgstpbutils-0.10
+	-lgstpbutils-0.11
 
 librbmetadata_la_LDFLAGS = -export-dynamic
diff --git a/plugins/audiocd/Makefile.am b/plugins/audiocd/Makefile.am
index d9475f4..1c717f7 100644
--- a/plugins/audiocd/Makefile.am
+++ b/plugins/audiocd/Makefile.am
@@ -12,8 +12,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"\"        \
@@ -38,7 +37,6 @@ INCLUDES = 						\
 	-DDATADIR=\""$(datadir)"\"			\
 	$(TOTEM_PLPARSER_CFLAGS)			\
 	$(RHYTHMBOX_CFLAGS)				\
-	$(GSTCDDA_CFLAGS)				\
 	-DUSE_TOTEM_PL_PARSER				\
 	-D_BSD_SOURCE
 
diff --git a/plugins/visualizer/Makefile.am b/plugins/visualizer/Makefile.am
index 4d70e8c..14b7c8e 100644
--- a/plugins/visualizer/Makefile.am
+++ b/plugins/visualizer/Makefile.am
@@ -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)
 
diff --git a/rhythmbox.pc.in b/rhythmbox.pc.in
index 985eabc..359d471 100644
--- a/rhythmbox.pc.in
+++ b/rhythmbox.pc.in
@@ -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
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 93bf993..297b477 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.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)	\
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]