From 79d3f1a2c102fe0f0ee6a1f1980943528b46c5c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Fri, 29 Jan 2010 09:41:30 +0000 Subject: [PATCH] pkgconfig: don't put -DG_THREADS_MANDATORY into our pkg-config CFLAGS If we force -DG_THREADS_MANDATORY onto apps, then g_thread_supported() will always evaluate to TRUE, so the typical thread initialisation boilerplate code if (!g_thread_supported()) g_thread_init(NULL); will no longer work, and the threading system not be initialised and us printing a warning in gst_init. This may be fine in most cases, since late initialisation is allowed and automatically done in g_type_init() since GLib 2.23.2, but let's be cautious and only use this define when compiling GStreamer itself. See #608398. --- pkgconfig/gstreamer-uninstalled.pc.in | 2 +- pkgconfig/gstreamer.pc.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgconfig/gstreamer-uninstalled.pc.in b/pkgconfig/gstreamer-uninstalled.pc.in index 674b30db55..fa518cd033 100644 --- a/pkgconfig/gstreamer-uninstalled.pc.in +++ b/pkgconfig/gstreamer-uninstalled.pc.in @@ -11,4 +11,4 @@ Description: Streaming media framework, Not Installed Version: @VERSION@ Requires: @GST_PKG_DEPS@@LIBXML_PKG@ Libs: ${libdir}/gst/libgstreamer-@GST_MAJORMINOR@.la -Cflags: -I${includedir} -I@srcdir@/.. -I${includedir}/libs -I@srcdir@/../libs -DG_THREADS_MANDATORY +Cflags: -I${includedir} -I@srcdir@/.. -I${includedir}/libs -I@srcdir@/../libs diff --git a/pkgconfig/gstreamer.pc.in b/pkgconfig/gstreamer.pc.in index 3cbe181f6b..32fd81182d 100644 --- a/pkgconfig/gstreamer.pc.in +++ b/pkgconfig/gstreamer.pc.in @@ -10,4 +10,4 @@ Description: Streaming media framework Requires: @GST_PKG_DEPS@@LIBXML_PKG@ Version: @VERSION@ Libs: -L${libdir} -lgstreamer-@GST_MAJORMINOR@ -Cflags: -I${includedir} -DG_THREADS_MANDATORY +Cflags: -I${includedir}