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

Revert "meson: Fix invalid include flag in uninstalled gl pc file"

Browse source 
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:
Nirbheek Chauhan 2024-07-19 20:14:29 +05:30 committed by Backport Bot
parent 1d86761712
commit 279fbb2ca2
1 changed files with 2 additions and 5 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,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',
) )