pixman: Branch 'master'

[GitLab Mirror]

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

New commits:
commit 9b49f4e08751885289333fed652bf5e0f45976b4
Author: Dylan Baker <dylan at pnwbakers.com>
Date:   Thu Jun 18 14:21:09 2020 -0700

    meson: remove pixman dependency
    
    AFAICT from the git history, what happened is that the gtk demos rely on
    gtk being built with pixman support. pkg-config isn't really expressive
    enough to have that information, so the solution that was come up with
    was to search for pixman as well as gtk+ and hope that pixman being
    installed was.
    
    This isn't actually used anywhere in the meson build anyway, and it's
    causing problems for projects that want to use pixman as a supproject
    (there's a port of cairo underway that's hitting this), because it
    confuses meson.

diff --git a/meson.build b/meson.build
index 72ad8b9..1276ce4 100644
--- a/meson.build
+++ b/meson.build
@@ -398,8 +398,6 @@ endif
 
 dep_gtk = dependency('gtk+-2.0', version : '>= 2.16', required : get_option('gtk'))
 dep_glib = dependency('glib-2.0', required : get_option('gtk'))
-dep_pixman = dependency('pixman-1', required : get_option('gtk'),
-                        version : '>= ' + meson.project_version())
 
 dep_png = null_dep
 if not get_option('libpng').disabled()