Merge branch 'meson-cmake-png' into 'master'

meson.build: include CMake name of libpng in dependency search

See merge request freetype/freetype!422

.gitlab-ci.yml

@@ -56,7 +56,7 @@ variables:
     - Import-Certificate -CertStoreLocation "Cert:\LocalMachine\Root" "C:\roots.sst"
     # Make sure meson is up to date so we don't need to rebuild the image
     # with each release.
-    - pip3 install -U 'meson==0.59.*'
+    - pip3 install -U 'meson==0.60.*'
     - pip3 install -U ninja
   script:
     # For some reason, options are separated by newlines instead of spaces,

meson.build

@@ -24,7 +24,7 @@
 #
 
 project('freetype2', 'c',
-  meson_version: '>= 0.55.0',
+  meson_version: '>= 0.60.0',
   version: run_command('builds/meson/extract_freetype_version.py',
                        'include/freetype/freetype.h',
                        check: true).stdout().strip(),
@@ -339,7 +339,7 @@ if bzip2_dep.found()
 endif
 
 # PNG support.
-libpng_dep = dependency('libpng',
+libpng_dep = dependency('libpng', 'PNG',
   required: get_option('png'),
   fallback: 'libpng')