[gdk-pixbuf/ebassi/for-master: 1/8] Use 'provide' section in libpng wrap file




commit 437cc45d8f74abbc678b6d5b0ca0fbf08f9f72a3
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Wed Apr 7 17:21:16 2021 +0100

    Use 'provide' section in libpng wrap file
    
    Avoid hard-coding the dependency object into the meson.build file.

 meson.build             | 2 +-
 subprojects/libpng.wrap | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/meson.build b/meson.build
index df1800df3..d0f4a7b62 100644
--- a/meson.build
+++ b/meson.build
@@ -281,7 +281,7 @@ if get_option('png')
     # that will bypass --wrap-mode and cause issues for distro packagers.
     # See: https://mesonbuild.com/Reference-manual.html#dependency
     if not png_dep.found()
-      png_dep = dependency('', required: false, fallback: ['libpng', 'png_dep'])
+      png_dep = dependency('', required: false, fallback: 'libpng')
       if png_dep.found()
         enabled_loaders += 'png'
         loaders_deps += png_dep
diff --git a/subprojects/libpng.wrap b/subprojects/libpng.wrap
index 519b1170a..c4c751217 100644
--- a/subprojects/libpng.wrap
+++ b/subprojects/libpng.wrap
@@ -8,3 +8,6 @@ source_hash = 2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6
 patch_url = https://wrapdb.mesonbuild.com/v1/projects/libpng/1.6.35/4/get_zip
 patch_filename = libpng-1.6.35-4-wrap.zip
 patch_hash = 0cd6ca9e8959b9c720c25d67bbf9315ec115bfc74ea4d34ea569619f4cff986f
+
+[provide]
+libpng = png_dep


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]