mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-14 05:12:09 +00:00
Code Issues 1 Projects Releases Wiki Activity

meson: Fix invalid include flag in uninstalled gl pc file

Browse source 
${libdir}/gstreamer-1.0/include is only valid after installation, but
extra_cflags are added unconditionally, so we can't use that for
include flags.

Instead, let's add the include flag via variables, which are different
for installed and uninstalled pc files.

This is particularly bad for consuming GStreamer via CMake which barfs
on non-existent include paths.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7130>
This commit is contained in:
Nirbheek Chauhan 2024-07-03 18:26:00 +05:30 committed by GStreamer Marge Bot
parent f54320b161
commit 9d719b9937
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
subprojects/gst-plugins-base/gst-libs/gst/gl/meson.build
View file

@ -1113,15 +1113,18 @@ if build_gstgl
'gl_winsys=' + ' '.join(enabled_gl_winsys), 'gl_winsys=' + ' '.join(enabled_gl_winsys),
'gl_apis=' + ' '.join(enabled_gl_apis), 'gl_apis=' + ' '.join(enabled_gl_apis),
] ]
pkgconfig_installed_variables = [
'libinc=-I${libdir}/gstreamer-1.0/include',
]
library_def = {'lib': gstgl} library_def = {'lib': gstgl}
pkg_name = 'gstreamer-gl-1.0' pkg_name = 'gstreamer-gl-1.0'
pkgconfig.generate(gstgl, pkgconfig.generate(gstgl,
libraries : [gstvideo, gst_base_dep, gst_dep], libraries : [gstvideo, gst_base_dep, gst_dep],
variables : pkgconfig_variables + pkgconfig_gl_variables, variables : pkgconfig_variables + pkgconfig_gl_variables + pkgconfig_installed_variables,
uninstalled_variables : pkgconfig_gl_variables, uninstalled_variables : pkgconfig_gl_variables,
subdirs : pkgconfig_subdirs, subdirs : pkgconfig_subdirs,
extra_cflags : ['-I${libdir}/gstreamer-1.0/include'], extra_cflags : ['${libinc}'],
name : pkg_name, name : pkg_name,
description : 'Streaming media framework, OpenGL plugins libraries', description : 'Streaming media framework, OpenGL plugins libraries',
) )