pkgconfig: fix meson warnings about GL_CFLAGS in gstreamer-gl .pc files
authorTim-Philipp Müller <tim@centricular.com>
Wed, 8 Jul 2020 08:53:42 +0000 (09:53 +0100)
committerTim-Philipp Müller <tim@centricular.com>
Wed, 8 Jul 2020 08:53:42 +0000 (09:53 +0100)
We added GL_CFLAGS in autotools because we unconditionally included OpenGL
headers. We do not do that anymore for a standard #include <gst/gl/gl.h>.
OpenGL headers are only included for the platform specific files
e.g. #include <gst/gl/x11/gstgldisplay_x11.h> which must always be hidden
behind a #if GST_GL_HAVE_WINDOW_X11, or #include <gst/gl/gstglfuncs.h> to
gain access to the contents of the GstGLFuncs object.

Users of our headers must include the necessary include paths for the
platforms they are intending to support.

We might introduce extra .pc files for what GstGL was built against though.

Fixes https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/issues/735

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/741>

pkgconfig/gstreamer-gl-uninstalled.pc.in
pkgconfig/gstreamer-gl.pc.in

index 69e37e3de9dde09c24bc9615a4f5ad0ce5c1fe91..8beed593f357774b74271c26a676cced3f2c6905 100644 (file)
@@ -14,5 +14,4 @@ Version: @VERSION@
 Requires: gstreamer-video-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@ gstreamer-@GST_API_VERSION@
 
 Libs: -L${libdir} -lgstgl-@GST_API_VERSION@
-Cflags: -I@abs_top_srcdir@/gst-libs -I@abs_top_builddir@/gst-libs @GL_CFLAGS@
-
+Cflags: -I@abs_top_srcdir@/gst-libs -I@abs_top_builddir@/gst-libs
index dc672a97b821458a909015af4bfbd67d194a4a20..8c290bab515febf47801f9bdc887942b12f6da46 100644 (file)
@@ -13,4 +13,4 @@ Version: @VERSION@
 Requires: gstreamer-video-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@ gstreamer-@GST_API_VERSION@
 
 Libs: -L${libdir} -lgstgl-@GST_API_VERSION@
-Cflags: -I${includedir} -I${libdir}/gstreamer-@GST_API_VERSION@/include @GL_CFLAGS@
+Cflags: -I${includedir} -I${libdir}/gstreamer-@GST_API_VERSION@/include