mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-29 05:01:23 +00:00
Revert "meson: Fix invalid include flag in uninstalled gl pc file"
This reverts commit 9d719b9937
.
The old pkg-config implementation errors out if a variable specified
in the pkgconfig file is not defined, so this actually broke
uninstalled pc files.
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7606>
This commit is contained in:
parent
1d86761712
commit
279fbb2ca2
1 changed files with 2 additions and 5 deletions
|
@ -1113,18 +1113,15 @@ 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 + pkgconfig_installed_variables,
|
variables : pkgconfig_variables + pkgconfig_gl_variables,
|
||||||
uninstalled_variables : pkgconfig_gl_variables,
|
uninstalled_variables : pkgconfig_gl_variables,
|
||||||
subdirs : pkgconfig_subdirs,
|
subdirs : pkgconfig_subdirs,
|
||||||
extra_cflags : ['${libinc}'],
|
extra_cflags : ['-I${libdir}/gstreamer-1.0/include'],
|
||||||
name : pkg_name,
|
name : pkg_name,
|
||||||
description : 'Streaming media framework, OpenGL plugins libraries',
|
description : 'Streaming media framework, OpenGL plugins libraries',
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in a new issue