[cairo-commit] configure.ac meson.build

[GitLab Mirror]

 configure.ac |    2 +-
 meson.build  |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 47881a965ed23a17a0056e99ccba2f1cc7325c9c
Author: George Matsumura <gmmatsumura01 at bvsd.org>
Date:   Fri Sep 4 07:11:53 2020 -0600

    cogl: Add build version requirement
    
    This ensures that build configuration for the cogl backend will fail
    if an insufficiently new version of cogl is present, making it easier
    to find the root cause of a build failure.
    
    Signed-off-by: George Matsumura <gmmatsumura01 at bvsd.org>

diff --git a/configure.ac b/configure.ac
index 8b2ab18ec..8d23ae0c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -400,7 +400,7 @@ CAIRO_ENABLE_SURFACE_BACKEND(glesv3, OpenGLESv3, no, [
 
 dnl ===========================================================================
 CAIRO_ENABLE_SURFACE_BACKEND(cogl, Cogl, no, [
-  cogl_REQUIRES="cogl-2.0-experimental"
+  cogl_REQUIRES="cogl-2.0-experimental >= 1.17.2"
   PKG_CHECK_MODULES(cogl, $cogl_REQUIRES,, [use_cogl="no"])
 ])
 
diff --git a/meson.build b/meson.build
index ae21ee446..9a78591bc 100644
--- a/meson.build
+++ b/meson.build
@@ -518,7 +518,10 @@ if feature_conf.get('CAIRO_HAS_GL_SURFACE', 0) == 0 and feature_conf.get('CAIRO_
   endif
 endif
 
-cogl_dep = dependency('cogl-2.0-experimental', required: get_option('cogl'))
+cogl_dep = dependency('cogl-2.0-experimental',
+  version: '>= 1.17.2',
+  required: get_option('cogl'),
+)
 if cogl_dep.found()
   deps += [cogl_dep]