[evolution] Bug 682955 - Support GStreamer 1.0
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] Bug 682955 - Support GStreamer 1.0
- Date: Fri, 31 Aug 2012 12:07:04 +0000 (UTC)
commit ad2ed55c74bf236ddc5d651b893f617ec3b9ce68
Author: Dominique Leuenberger <dimstar opensuse org>
Date: Fri Aug 31 07:53:56 2012 -0400
Bug 682955 - Support GStreamer 1.0
Check for gstreamer-1.0 first, then fall back to gstreamer-0.10.
No other source code changes required.
configure.ac | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 5d980e8..1945606 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1198,14 +1198,16 @@ AC_ARG_ENABLE([audio-inline],
[enable_audio_inline="$enableval"], [enable_audio_inline=yes])
if test "x$enable_audio_inline" = "xyes"; then
- PKG_CHECK_MODULES(GSTREAMER, gstreamer-0.10, have_gst=yes, have_gst=no)
+ PKG_CHECK_MODULES([GSTREAMER], [gstreamer-1.0], have_gst=yes,
+ [PKG_CHECK_MODULES([GSTREAMER], [gstreamer-0.10], have_gst=yes, have_gst=no)],
+ have_gst=no)
AC_SUBST(GSTREAMER_CFLAGS)
AC_SUBST(GSTREAMER_LIBS)
if test "x$have_gst" = "xyes"; then
AC_DEFINE(ENABLE_AUDIO_INLINE, 1, [Define to add support for inlining audio attachments])
else
- AC_MSG_ERROR([gstreamer-0.10 is required for the audio-inline plugin. Use --disable-audio-inline to exclude the plugin.])
+ AC_MSG_ERROR([gstreamer-1.0 or 0.10 is required for the audio-inline plugin. Use --disable-audio-inline to exclude the plugin.])
fi
fi
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]