pixman: Branch 'master'

[GitLab Mirror]

 pixman/meson.build |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4851d4e20f66f540cd61fb69851df17671fc90d2
Author: Christoph Reiter <reiter.christoph at gmail.com>
Date:   Sat May 11 11:18:35 2019 +0200

    meson: allow building a static library
    
    So that passing "-Ddefault_library=both" also creates a static lib.
    
    Note that Libs.private in the .pc file will still be wrong because of
    https://github.com/mesonbuild/meson/issues/3934 (it contains things like
    -lpixman-mmx)

diff --git a/pixman/meson.build b/pixman/meson.build
index 6ce87e7..7b66827 100644
--- a/pixman/meson.build
+++ b/pixman/meson.build
@@ -97,7 +97,7 @@ pixman_files = files(
   'pixman-utils.c',
 )
 
-libpixman = shared_library(
+libpixman = library(
   'pixman-1',
   [pixman_files, config_h, version_h],
   link_with : [pixman_simd_libs],