/pidgin/main: fd3ef7036ebb: Split gstreamer-video into a separat...

[Elliott Sales de Andrade]

Changeset: fd3ef7036ebb9c8faa4716bfc179f5cca42e69ff
Author:	 Elliott Sales de Andrade <qulogic at pidgin.im>
Date:	 2012-09-03 03:12 -0400
Branch:	 default
URL: http://hg.pidgin.im/pidgin/main/rev/fd3ef7036ebb

Description:

Split gstreamer-video into a separate check.

Just like gstreamer-interfaces, gstreamer-video is only required
for VV stuff, and not general sound playback.

diffstat:

 configure.ac                           |  24 ++++++++++++++++++++++--
 libpurple/Makefile.am                  |   2 ++
 libpurple/protocols/jabber/Makefile.am |   6 ++----
 3 files changed, 26 insertions(+), 6 deletions(-)

diffs (87 lines):

diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -840,7 +840,7 @@ AC_ARG_ENABLE(gstreamer,
 	[AC_HELP_STRING([--disable-gstreamer], [compile without GStreamer audio support])],
 	enable_gst="$enableval", enable_gst="yes")
 if test "x$enable_gst" != "xno"; then
-	PKG_CHECK_MODULES(GSTREAMER, [gstreamer-1.0 gstreamer-video-1.0], [
+	PKG_CHECK_MODULES(GSTREAMER, [gstreamer-1.0], [
 		AC_DEFINE(USE_GSTREAMER, 1, [Use GStreamer for playing sounds])
 		enable_gst="11"
 		AC_SUBST(GSTREAMER_CFLAGS)
@@ -865,6 +865,26 @@ Use --disable-gstreamer if you do not ne
 fi
 
 dnl #######################################################################
+dnl # Check for GStreamer Video
+dnl #######################################################################
+if test "x$enable_gst" == "x11"; then
+	AC_ARG_ENABLE(gstreamer-video,
+		[AC_HELP_STRING([--disable-gstreamer-video], [compile without GStreamer 0.11 Video Overlay support])],
+			enable_gstvideo="$enableval", enable_gstvideo="yes")
+	if test "x$enable_gstvideo" != "xno"; then
+		PKG_CHECK_MODULES(GSTVIDEO, [gstreamer-video-1.0], [
+			AC_DEFINE(USE_GSTVIDEO, 1, [Use GStreamer Video Overlay support])
+			AC_SUBST(GSTVIDEO_CFLAGS)
+			AC_SUBST(GSTVIDEO_LIBS)
+		], [
+			enable_gstvideo="no"
+		])
+	fi
+else
+	enable_gstvideo="no"
+fi
+
+dnl #######################################################################
 dnl # Check for GStreamer Interfaces
 dnl #######################################################################
 if test "x$enable_gst" == "x10"; then
@@ -922,7 +942,7 @@ AC_ARG_ENABLE(vv,
 	[AC_HELP_STRING([--disable-vv], [compile without voice and video support])],
 	enable_vv="$enableval", enable_vv="yes")
 if test "x$enable_vv" != "xno"; then
-	if test "x$enable_gst" == "x11" -a "x$enable_farstream" != "xno"; then
+	if test "x$enable_gst" == "x11" -a "x$enable_gstvideo" != "xno" -a "x$enable_farstream" != "xno"; then
 		AC_DEFINE(USE_VV, 1, [Use voice and video])
 	elif test "x$enable_gst" == "x10" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farstream" != "xno"; then
 		AC_DEFINE(USE_VV, 1, [Use voice and video])
diff --git a/libpurple/Makefile.am b/libpurple/Makefile.am
--- a/libpurple/Makefile.am
+++ b/libpurple/Makefile.am
@@ -307,6 +307,7 @@ libpurple_la_LIBADD = \
 	$(INTLLIBS) \
 	$(FARSTREAM_LIBS) \
 	$(GSTREAMER_LIBS) \
+	$(GSTVIDEO_LIBS) \
 	$(GSTINTERFACES_LIBS) \
 	$(IDN_LIBS) \
 	ciphers/libpurple-ciphers.la \
@@ -323,6 +324,7 @@ AM_CPPFLAGS = \
 	$(LIBXML_CFLAGS) \
 	$(FARSTREAM_CFLAGS) \
 	$(GSTREAMER_CFLAGS) \
+	$(GSTVIDEO_CFLAGS) \
 	$(GSTINTERFACES_CFLAGS) \
 	$(IDN_CFLAGS) \
 	$(NETWORKMANAGER_CFLAGS)
diff --git a/libpurple/protocols/jabber/Makefile.am b/libpurple/protocols/jabber/Makefile.am
--- a/libpurple/protocols/jabber/Makefile.am
+++ b/libpurple/protocols/jabber/Makefile.am
@@ -113,8 +113,7 @@ pkg_LTLIBRARIES      = libjabber.la libf
 libjabber_la_SOURCES = $(JABBERSOURCES)
 libjabber_la_LIBADD  = $(GLIB_LIBS) $(SASL_LIBS) $(LIBXML_LIBS) $(IDN_LIBS)\
 	$(FARSIGHT_LIBS) \
-	$(GSTREAMER_LIBS) \
-	$(GSTINTERFACES_LIBS)
+	$(GSTREAMER_LIBS)
 
 libfacebook_la_SOURCES = libfacebook.c
 libfacebook_la_LIBADD = libjabber.la
@@ -135,5 +134,4 @@ AM_CPPFLAGS = \
 	$(IDN_CFLAGS) \
 	$(LIBXML_CFLAGS) \
 	$(FARSIGHT_CFLAGS) \
-	$(GSTREAMER_CFLAGS) \
-	$(GSTINTERFACES_CFLAGS)
+	$(GSTREAMER_CFLAGS)