[banshee] [build] Fix build failures introduced by subtitle code



commit 6496d7cd5e4220a2b3b5e0e5f358913afc158a0d
Author: Bertrand Lorentz <bertrand lorentz gmail com>
Date:   Fri Dec 3 19:10:46 2010 +0100

    [build] Fix build failures introduced by subtitle code
    
    Add gsttag-0.10 to GST_LIBS to prevent build failure with
    LDFLAGS="-Wl,-z,defs".
    
    Only use gst_tag_get_language_name if GStreamer is recent enough
    (0.10.26 or above). Older versions will just get you the language code
    instead of the language name.

 build/m4/banshee/gstreamer.m4 |    7 ++++++-
 libbanshee/banshee-player.c   |    4 ++++
 2 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/build/m4/banshee/gstreamer.m4 b/build/m4/banshee/gstreamer.m4
index b67deac..3420f0c 100644
--- a/build/m4/banshee/gstreamer.m4
+++ b/build/m4/banshee/gstreamer.m4
@@ -11,11 +11,16 @@ AC_DEFUN([BANSHEE_CHECK_GSTREAMER],
 		gstreamer-dataprotocol-0.10 >= $GSTREAMER_REQUIRED_VERSION
 		gstreamer-fft-0.10 >= $GSTREAMER_REQUIRED_VERSION)
 
-	GST_LIBS="$GST_LIBS -lgstvideo-0.10 -lgstinterfaces-0.10 -lgstcdda-0.10 -lgstpbutils-0.10"
+	GST_LIBS="$GST_LIBS -lgstvideo-0.10 -lgstinterfaces-0.10 -lgstcdda-0.10 -lgstpbutils-0.10 -lgsttag-0.10"
 
 	AC_SUBST(GST_CFLAGS)
 	AC_SUBST(GST_LIBS)
 
+	PKG_CHECK_MODULES(GST_0_10_26,
+		gstreamer-plugins-base-0.10 >= 0.10.26,
+		has_gst_0_10_26=yes, has_gst_0_10_26=no)
+	AM_CONDITIONAL(HAVE_GST_0_10_26, test "x$has_gst_0_10_26" = "xyes")
+
 	dnl Builtin equalizer (optional)
 	AC_ARG_ENABLE(builtin-equalizer,
 		AC_HELP_STRING([--disable-builtin-equalizer],
diff --git a/libbanshee/banshee-player.c b/libbanshee/banshee-player.c
index 03a9d2d..56f8319 100644
--- a/libbanshee/banshee-player.c
+++ b/libbanshee/banshee-player.c
@@ -480,8 +480,12 @@ bp_get_subtitle_description (BansheePlayer *player, int i)
             return NULL;
         }
         bp_debug ("[subtitle]: iso 639-2 subtitle code %s", code);
+#ifdef HAVE_GST_0_10_26
         desc = (gchar *) gst_tag_get_language_name ((const gchar *)&code);
         bp_debug ("[subtitle]: subtitle language: %s", desc);
+#else
+        desc = g_strdup (code);
+#endif
 
         g_free (code);
     }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]