[banshee] build: default to build just one media backend
- From: Andrés Aragoneses <aaragoneses src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [banshee] build: default to build just one media backend
- Date: Thu, 19 Dec 2013 20:40:02 +0000 (UTC)
commit af0107928dca8dd19872d11079f5f26798a97662
Author: Andrés G. Aragoneses <knocte gmail com>
Date: Sun Dec 15 19:31:04 2013 +0100
build: default to build just one media backend
Unless explicitly required by the user at configure time, the build
should default to only enable one media backend, not two at the same
time.
Banshee can run with more than one media backend, but this feature is
mainly intended for the use case of having two backends with different
capabilities. However, in this case we're talking about selecting the
managed or the unmanaged backend, and both (should) have the same
capabilities.
Before this patch, the user had to explicitly enable the managed
backend and disable the native one if she wanted to run the managed
one without loading the native one. This is now corrected: if the
user doesn't supply any option, only the native backend is built,
and if the user supplies the --enable-gst-sharp option, only the
managed one is built.
build/m4/banshee/gstreamer-sharp.m4 | 13 -------------
build/m4/banshee/gstreamer.m4 | 16 +++++++++++++++-
configure.ac | 5 +----
3 files changed, 16 insertions(+), 18 deletions(-)
---
diff --git a/build/m4/banshee/gstreamer.m4 b/build/m4/banshee/gstreamer.m4
index 3b18fd5..cb90074 100644
--- a/build/m4/banshee/gstreamer.m4
+++ b/build/m4/banshee/gstreamer.m4
@@ -1,6 +1,20 @@
AC_DEFUN([BANSHEE_CHECK_GSTREAMER],
[
- AC_ARG_ENABLE(gst_native, AC_HELP_STRING([--disable-gst-native], [Disable GStreamer native backend]),
, enable_gst_native="yes")
+ AC_ARG_ENABLE(gst_sharp, AC_HELP_STRING([--enable-gst-sharp], [Enable Gst# backend]), ,
enable_gst_sharp="no")
+
+ if test "x$enable_gst_sharp" = "xyes"; then
+ PKG_CHECK_MODULES(GST_SHARP, gstreamer-sharp-0.10)
+ AC_SUBST(GST_SHARP_LIBS)
+ AM_CONDITIONAL(ENABLE_GST_SHARP, true)
+
+ AC_ARG_ENABLE(gst_native, AC_HELP_STRING([--enable-gst-native], [Enable GStreamer native
backend]), , enable_gst_native="no")
+
+ else
+ AM_CONDITIONAL(ENABLE_GST_SHARP, false)
+
+ AC_ARG_ENABLE(gst_native, AC_HELP_STRING([--disable-gst-native], [Disable GStreamer native
backend]), , enable_gst_native="yes")
+ fi
+
if test "x$enable_gst_native" = "xyes"; then
BANSHEE_CHECK_LIBBANSHEE
diff --git a/configure.ac b/configure.ac
index 6c5bc8c..a29c18f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,10 +57,7 @@ dnl Clutter support is not available in Gst# backend and is opt-in in the unmana
dnl so we set a default value here for simplicity
AM_CONDITIONAL(HAVE_CLUTTER, false)
-dnl For the new media backend using gstreamer# (disabled by default for now)
-BANSHEE_CHECK_GSTREAMER_SHARP
-
-dnl Default media backend, libbanshee/native dependencies
+dnl Media backends
BANSHEE_CHECK_GSTREAMER
dnl User help
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]