[PATCH] Export GStreamer version in pkgconfig variable

David Woodhouse dwmw2 at infradead.org
Thu Mar 12 10:41:13 EDT 2015


Some plugins like pidgin-sipe want to know which version of GStreamer
we're built against. It currently assumes that libpurple-3 will be using
gstreamer-1.0 and libpurple-2 will be using gstreamer-0.10.

That isn't strictly true since libpurple-3 *can* be built against
gstreamer-0.10. And it gets even less true when we allow libpurple-2 to
be built against gstreamer-1.0 (qv).

This exports the information so that it's available by running
	pkg-config --variable=gstreamer purple-3
and we don't have to guess.
---
 configure.ac                  | 5 +++++
 libpurple/data/purple-3.pc.in | 1 +
 2 files changed, 6 insertions(+)

diff --git a/configure.ac b/configure.ac
index 2b3ae5c..cb7fe6f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1089,6 +1089,11 @@ elif test "x$with_gtk" == "x2" -a "x$with_gstreamer" == "x1.0"; then
 	AC_MSG_ERROR([WebKitGTK+ 2.0 cannot be mixed with GStreamer 1.0.
 Please switch to WebKitGTK+ 3.0 or GStreamer 0.10.])
 fi
+if test "x$with_gstreamer" == "x0.10" -o "x$with_gstreamer" == "x1.0"; then
+	AC_SUBST(GSTREAMER_VER, [$with_gstreamer])
+else
+	AC_SUBST(GSTREAMER_VER, "")
+fi
 
 dnl #######################################################################
 dnl # Check for GStreamer Video
diff --git a/libpurple/data/purple-3.pc.in b/libpurple/data/purple-3.pc.in
index 281a522..03dd292 100644
--- a/libpurple/data/purple-3.pc.in
+++ b/libpurple/data/purple-3.pc.in
@@ -5,6 +5,7 @@ includedir=@includedir@/libpurple
 datarootdir=@datarootdir@
 datadir=@datadir@
 sysconfdir=@sysconfdir@
+gstreamer=@GSTREAMER_VER@
 
 plugindir=${libdir}/purple- at PURPLE_MAJOR_VERSION@
 
-- 
2.1.0


-- 
David Woodhouse                            Open Source Technology Centre
David.Woodhouse at intel.com                              Intel Corporation
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/x-pkcs7-signature
Size: 5745 bytes
Desc: not available
URL: <https://pidgin.im/pipermail/devel/attachments/20150312/ccbc10e8/attachment.bin>


More information about the Devel mailing list