[cairo-commit] 2 commits - meson.build

[GitLab Mirror]

 meson.build |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 784be5d859b75b58909752d639d4f43b35556b7b
Merge: d85738b39 f7ac4181d
Author: Tim-Philipp Müller <tim at centricular.com>
Date:   Wed Feb 24 14:27:54 2021 +0000

    Merge branch 'alatiera/cairo-header' into 'master'
    
    meson: declare dependancy on libcairo_dep for overrides
    
    See merge request cairo/cairo!130

commit f7ac4181d683b0707c89cfd5a4c3e33b1e313068
Author: Tim-Philipp Müller <tim at centricular.com>
Date:   Wed Feb 24 02:57:37 2021 +0200

    meson: declare dependancy on libcairo_dep for overrides
    
    When declaring a dependency on a feature, say `dependency('cairo-png')`
    the resulting object did not depend on cairo and thus was missing
    basic things like, `cairo.h` from its include dir.
    
    Make it so overrides do in fact include the basic cairo functionality
    needed for them to work.
    
    Related:
    https://gitlab.freedesktop.org/gstreamer/gst-devtools/-/merge_requests/236

diff --git a/meson.build b/meson.build
index 52945db52..96dd1abd4 100644
--- a/meson.build
+++ b/meson.build
@@ -888,8 +888,7 @@ foreach feature: built_features
     description: feature['description'] + ' for cairo graphics library',
   )
   meson.override_dependency(feature['name'],
-    declare_dependency(link_with: libcairo,
-      dependencies: [feature_deps, feature_compile_deps],
+    declare_dependency(dependencies: [libcairo_dep, feature_deps, feature_compile_deps],
       link_args: feature_libs,
     )
   )