Commit 92fee714 authored by Tim-Philipp Müller's avatar Tim-Philipp Müller 🐠 Committed by GStreamer Marge Bot
Browse files

cairo: update to 1.17.4 and build with Meson

Part-of: <!674>
parent 96d52e17
Pipeline #257691 passed with stages
in 68 minutes and 14 seconds
# -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python
from cerbero.tools.libtool import LibtoolLibrary
from cerbero.tools.libtool import get_libtool_versions
class Recipe(recipe.Recipe):
name = 'cairo'
version = '1.14.12'
version = '1.17.4'
stype = SourceType.TARBALL
url = 'https://cairographics.org/releases/cairo-%(version)s.tar.xz'
tarball_checksum = '8c90f00c500b2299c0a323dd9beead2a00353752b2092ead558139bd67f7bf16'
#url = 'https://cairographics.org/releases/cairo-%(version)s.tar.xz'
url = 'https://cairographics.org/snapshots/cairo-%(version)s.tar.xz'
tarball_checksum = '74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705'
# Either LGPL-2.1+ or MPL-1.1
licenses = [License.LGPLv2_1Plus, {License.MPLv1_1: ['COPYING-MPL-1.1']}]
deps = ['glib', 'libpng', 'zlib', 'pixman', 'fontconfig', 'freetype']
btype = BuildType.MESON
meson_options = {'tests': 'disabled', 'xcb': 'disabled', 'xlib': 'disabled'}
patches = [
# From git master, post 1.17.4 snapshot release
'cairo/0001-meson-fix-library-versioning.patch',
'cairo/0001-meson-fix-macOS-build-and-add-macOS-ci.patch',
'cairo/0001-meson-Generate-cairo-script-interpreter.pc-needed-by.patch',
# TODO: This should probably be rewritten along the same lines as in
# https://gitlab.freedesktop.org/cairo/cairo/-/commit/9a19ef185884da1e7d5344b301f48aa2ba0f88b6
# but unclear if it's still a problem with newer Android (api 28 CI works)
'cairo/0001-Fix-compilation-with-Android-s-bionic-libc.patch',
# https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/38
'cairo/0001-win32-Make-font-dc-thread-local.patch',
# https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/110/
'cairo/0001-meson-only-build-cairo-boilerplate-and-cairo-missing.patch',
# FIXME: remove once freetype recipe has been moved to Meson as well
'cairo/0001-cairo-ft-font-fix-build-with-MSVC-if-freetype-was-bu.patch',
]
files_libs = ['libcairo', 'libcairo-gobject', 'libcairo-script-interpreter']
......@@ -35,9 +51,6 @@ class Recipe(recipe.Recipe):
'lib/pkgconfig/cairo-quartz.pc']
}
# Skipping because it requires a display and documented as randomly failing
make_check = None
def prepare(self):
# extra flags needed for gcc 4.9
if self.config.target_distro == Distro.ARCH:
......@@ -45,28 +58,22 @@ class Recipe(recipe.Recipe):
self.append_env('CXXFLAGS', '-fno-lto')
self.append_env('CPPFLAGS', '-fno-lto')
if self.config.platform != Platform.WINDOWS:
self.autoreconf = True
self.autoreconf_sh = 'NOCONFIGURE=1 ./autogen.sh'
self.patches += [
'cairo/0001-Disable-building-of-the-tests.patch',
'cairo/0001-build-disable-failing-compile-link-checks-on-any-std.patch',
]
else:
self.patches += ['cairo/0001-Disable-building-of-the-tests-noautoreconf.patch']
# Unclear if anything actually needs this
# cerbero fedora CI seems misconfigured if x11 variant is enabled but xlib not actually installed
#if self.config.variants.x11:
# self.meson_options['xlib'] = 'enabled'
# self.meson_options['xcb'] = 'auto'
# self.files_devel += ['lib/pkgconfig/cairo-xlib-xrender.pc',
# 'lib/pkgconfig/cairo-xlib.pc']
if self.config.variants.x11:
self.files_devel += ['lib/pkgconfig/cairo-xlib-xrender.pc',
'lib/pkgconfig/cairo-xlib.pc']
else:
self.configure_options += '--without-x '
if self.config.target_platform == Platform.DARWIN:
self.configure_options += ' --enable-quartz-font --enable-quartz-image'
elif self.config.target_platform == Platform.ANDROID:
v = DistroVersion.get_android_api_version(self.config.target_distro_version)
if self.config.target_arch in [Architecture.ARM, Architecture.ARMv7, Architecture.X86] and v < 21:
# FIXME: HACK to make projects using mmap compile with NDK 16
# we fail to compile with -D_FILE_OFFSET_BITS=64
# because we don't use clang and we use a platform < 21 (Lollipop)
# See $NDK_ROOT/sysroot/usr/include/sys/mman.h as one example
self.set_env('ac_cv_func_mmap', 'no')
self.meson_options['quartz'] = 'enabled'
def post_install(self):
# Meson does not generate la files
major, minor, micro = get_libtool_versions(self.version)
libtool_la = LibtoolLibrary('libcairo', None, None, None,
self.config.libdir, self.config.target_platform,
deps=['gobject-2.0', 'pixman-1', 'freetype', 'fontconfig', 'png16', 'z'])
libtool_la.save()
super().post_install()
From b98e122b4d96ccfbefdc1b15807be2dcf3481cf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Tue, 21 Oct 2014 13:46:18 +0200
Subject: [PATCH] Disable building of the tests
We don't run them anyway and there are build system quirks in there.
---
Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.in b/Makefile.in
index fb2a4b2..7d700fe 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -107,7 +107,7 @@ EXTRA_PROGRAMS =
TESTS =
check_PROGRAMS =
# libpng is required for our test programs
-@CAIRO_HAS_PNG_FUNCTIONS_TRUE@am__append_1 = boilerplate test perf
+@CAIRO_HAS_PNG_FUNCTIONS_TRUE@am__append_1 =
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/aclocal.cairo.m4 \
--
2.27.0.windows.1
From 2e60e3972ee8dadfebace50255c9275feae4dc6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Tue, 21 Oct 2014 13:46:18 +0200
Subject: [PATCH] Disable building of the tests
We don't run them anyway and there are build system quirks in there.
---
Makefile.am | 4 ----
1 file changed, 4 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 03fa352..7e11d24 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,10 +18,6 @@ ACLOCAL_AMFLAGS = -I build ${ACLOCAL_FLAGS}
DIST_SUBDIRS = src doc util boilerplate test perf
SUBDIRS = src doc util
-# libpng is required for our test programs
-if CAIRO_HAS_PNG_FUNCTIONS
-SUBDIRS += boilerplate test perf
-endif
configure: cairo-version.h
--
2.1.1
From 4797ee1f567b83c1b3004ce1963f37a4ecdff3f3 Mon Sep 17 00:00:00 2001
From: Matthew Waters <matthew@centricular.com>
Date: Tue, 1 Oct 2019 20:07:12 +1000
Subject: [PATCH] build: disable failing compile/link checks on any stderr
output
ld for ios will output a warning when passing the same min ios platform:
ld: warning: passed two min versions (10.0.0, 10.0) for platform iOS. Using 10.0.
and will cause every link check to fail
---
build/aclocal.cairo.m4 | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/build/aclocal.cairo.m4 b/build/aclocal.cairo.m4
index 44ba5fd..7f91ea4 100644
--- a/build/aclocal.cairo.m4
+++ b/build/aclocal.cairo.m4
@@ -106,9 +106,9 @@ AC_DEFUN([CAIRO_CC_TRY_LINK_WITH_ENV_SILENT],[dnl
[cairo_cc_stderr=`test -f conftest.err && cat conftest.err`
cairo_cc_flag=no])
- if test "x$cairo_cc_stderr" != "x"; then
- cairo_cc_flag=no
- fi
+# if test "x$cairo_cc_stderr" != "x"; then
+# cairo_cc_flag=no
+# fi
if test "x$cairo_cc_flag" = "xyes"; then
ifelse([$3], , :, [$3])
--
2.21.0 (Apple Git-122)
From 99f61f13b5b4b5db014e3a2e9dfb57382c295a1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
Date: Sat, 16 Jan 2021 00:46:52 +0000
Subject: [PATCH] cairo-ft-font: fix build with MSVC if freetype was built with
MingW
Work around bug in freetype headers which define
HAVE_UNISTD_H if freetype was compiled with MingW,
which causes problems when building cairo with MSVC.
---
src/cairo-ft-font.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
index d2221edec..02a85ec72 100644
--- a/src/cairo-ft-font.c
+++ b/src/cairo-ft-font.c
@@ -67,6 +67,12 @@
#include FT_LCD_FILTER_H
#endif
+/* Work around bug in freetype headers which define HAVE_UNISTD_H if freetype
+ * was compiled with MingW, which causes problems when building cairo with MSVC */
+#ifdef _MSC_VER
+#undef HAVE_UNISTD_H
+#endif
+
#if HAVE_UNISTD_H
#include <unistd.h>
#else
--
2.29.2
From ebbaebdec12878836fc84d31c59ee324e67abc05 Mon Sep 17 00:00:00 2001
From: Xavier Claessens <xavier.claessens@collabora.com>
Date: Fri, 16 Oct 2020 19:52:55 -0400
Subject: [PATCH] meson: Generate cairo-script-interpreter.pc needed by GTK+
---
build/configure.ac.features | 4 +++-
util/cairo-script/Makefile.am | 3 +++
.../cairo-script-interpreter-uninstalled.pc.in | 8 ++++++++
util/cairo-script/cairo-script-interpreter.pc.in | 10 ++++++++++
util/cairo-script/meson.build | 11 ++++++++++-
5 files changed, 34 insertions(+), 2 deletions(-)
create mode 100644 util/cairo-script/cairo-script-interpreter-uninstalled.pc.in
create mode 100644 util/cairo-script/cairo-script-interpreter.pc.in
diff --git a/build/configure.ac.features b/build/configure.ac.features
index e0a46069c..3f26c2a6f 100644
--- a/build/configure.ac.features
+++ b/build/configure.ac.features
@@ -136,9 +136,11 @@ dnl
dnl Generate .pc files
dnl
-dnl All .pc files are generated automatically except for this one
+dnl All .pc files are generated automatically except for these
AC_CONFIG_FILES([src/cairo.pc])dnl
AC_CONFIG_FILES([cairo-uninstalled.pc:src/cairo-uninstalled.pc.in])dnl
+AC_CONFIG_FILES([util/cairo-script/cairo-script-interpreter.pc])dnl
+AC_CONFIG_FILES([util/cairo-script/cairo-script-interpreter-uninstalled.pc:util/cairo-script/cairo-script-interpreter-uninstalled.pc.in])dnl
dnl pkg-config requires, non-pkgconfig cflags and libs, and total cflags and libs
CAIRO_FEATURE_VARS_REGISTER([BASE],[cairo])dnl
diff --git a/util/cairo-script/Makefile.am b/util/cairo-script/Makefile.am
index d5c2998ac..82519fb31 100644
--- a/util/cairo-script/Makefile.am
+++ b/util/cairo-script/Makefile.am
@@ -17,6 +17,9 @@ libcairo_script_interpreter_la_CFLAGS = $(CAIRO_CFLAGS)
libcairo_script_interpreter_la_LDFLAGS = -version-info $(CAIRO_LIBTOOL_VERSION_INFO) -no-undefined $(export_symbols)
libcairo_script_interpreter_la_LIBADD = $(top_builddir)/src/libcairo.la $(CAIRO_LIBS) $(lzo_LIBS) -lz
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = cairo-script-interpreter.pc
+
csi_replay_SOURCES = csi-replay.c
csi_replay_CFLAGS = $(CAIRO_CFLAGS)
csi_replay_LDADD = libcairo-script-interpreter.la $(top_builddir)/src/libcairo.la $(CAIRO_LIBS)
diff --git a/util/cairo-script/cairo-script-interpreter-uninstalled.pc.in b/util/cairo-script/cairo-script-interpreter-uninstalled.pc.in
new file mode 100644
index 000000000..b3407bcba
--- /dev/null
+++ b/util/cairo-script/cairo-script-interpreter-uninstalled.pc.in
@@ -0,0 +1,8 @@
+Name: cairo-script-interpreter
+Description: script surface backend for cairo graphics library
+Version: @VERSION@
+
+Requires: cairo
+Libs: ${pc_top_builddir}/${pcfiledir}/util/cairo-script/libcairo-script-interpreter.la
+Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@/util/cairo-script
+
diff --git a/util/cairo-script/cairo-script-interpreter.pc.in b/util/cairo-script/cairo-script-interpreter.pc.in
new file mode 100644
index 000000000..d773b1509
--- /dev/null
+++ b/util/cairo-script/cairo-script-interpreter.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: cairo-script-interpreter
+Description: script surface backend for cairo graphics library
+Version: @VERSION@
+Requires: cairo
+Libs: -L${libdir} -lcairo-script-interpreter
+Cflags: -I${includedir}/cairo
diff --git a/util/cairo-script/meson.build b/util/cairo-script/meson.build
index 8cedc6834..f50a200df 100644
--- a/util/cairo-script/meson.build
+++ b/util/cairo-script/meson.build
@@ -38,7 +38,16 @@ libcairoscript = library('cairo-script-interpreter',
inccairoscript = include_directories('.')
libcairoscript_dep = declare_dependency(link_with: libcairoscript,
- include_directories: [incbase, inccairoscript])
+ include_directories: [inccairoscript],
+ dependencies: libcairo_dep)
+
+pkgmod.generate(libcairoscript,
+ libraries: [libcairo],
+ description: 'script surface backend for cairo graphics library',
+ subdirs: [meson.project_name()],
+)
+
+meson.override_dependency('cairo-script-interpreter', libcairoscript_dep)
csi_replay_exe = executable('csi-replay', csi_replay_sources,
c_args: ['-DHAVE_CONFIG_H'],
--
2.29.2
From e9ccb1d8d095482e4139da658e679d5aad56b184 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
Date: Tue, 15 Dec 2020 00:12:55 +0000
Subject: [PATCH] meson: fix library versioning
Fixes #442
---
meson.build | 23 +++++++++++++++++++++--
src/meson.build | 4 ++--
util/cairo-gobject/meson.build | 4 ++--
util/cairo-script/meson.build | 4 ++--
4 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/meson.build b/meson.build
index b159b4071..53a9af343 100644
--- a/meson.build
+++ b/meson.build
@@ -3,8 +3,6 @@ project('cairo', 'c', 'cpp',
version: run_command(find_program('version.py'), check: true).stdout().strip(),
)
-cc = meson.get_compiler('c')
-
# Keep in sync with configure.ac!
freetype_required_version = '>= 9.7.3'
fontconfig_required_version = '>= 2.2.95'
@@ -16,6 +14,27 @@ libudev_required_version = '>= 136'
libdrm_required_version = '>= 2.4'
glib_required_version = '>= 2.14'
+# library versioning
+version_arr = meson.project_version().split('.')
+cairo_version_major = version_arr[0].to_int()
+cairo_version_minor = version_arr[1].to_int()
+cairo_version_micro = version_arr[2].to_int()
+
+# The libtool shared library version stuff.
+# Try and maintain compatibility with the previous library versioning.
+cairo_version_sonum = cairo_version_major + 1
+cairo_version = cairo_version_major * 10000 + cairo_version_minor * 100 + cairo_version_micro
+
+if cairo_version_minor % 2 == 1
+ # unstable release
+ cairo_libversion = '@0@.@1@.0'.format(cairo_version_sonum, cairo_version)
+else
+ # stable release
+ cairo_libversion = '@0@.@1@.@2@'.format(cairo_version_sonum, cairo_version, cairo_version_micro)
+endif
+
+cc = meson.get_compiler('c')
+
if cc.get_id() == 'msvc'
# Basic usage in the cairo type system that causes spammy and useless warnings
add_project_arguments('/wd4244', '/wd4146',
diff --git a/src/meson.build b/src/meson.build
index 5bd1a57ee..f5d741eae 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -299,8 +299,8 @@ libcairo = library('cairo', cairo_sources,
c_args: cairo_no_warn_c_args + pthread_c_args + ['-DHAVE_CONFIG_H'],
cpp_args: cairo_no_warn_c_args + pthread_c_args + ['-DHAVE_CONFIG_H'],
link_args: extra_link_args,
- soversion: '2',
- version: '2.' + ''.join(meson.project_version().split('.')) + '.0',
+ soversion: cairo_version_sonum,
+ version: cairo_libversion,
install: true,
include_directories: incbase,
)
diff --git a/util/cairo-gobject/meson.build b/util/cairo-gobject/meson.build
index 200fd8705..bf24242a0 100644
--- a/util/cairo-gobject/meson.build
+++ b/util/cairo-gobject/meson.build
@@ -12,8 +12,8 @@ libcairogobject = library('cairo-gobject', cairo_gobject_sources,
include_directories: [incbase, incsrc],
dependencies: [glib_dep, gobject_dep],
link_with: [libcairo],
- soversion: '2',
- version: '2.' + ''.join(meson.project_version().split('.')) + '.0',
+ soversion: cairo_version_sonum,
+ version: cairo_libversion,
install: true,
)
diff --git a/util/cairo-script/meson.build b/util/cairo-script/meson.build
index a782ec63f..8cedc6834 100644
--- a/util/cairo-script/meson.build
+++ b/util/cairo-script/meson.build
@@ -30,8 +30,8 @@ libcairoscript = library('cairo-script-interpreter',
include_directories: [incbase, incsrc],
dependencies: deps,
link_with: [libcairo],
- soversion: '2',
- version: '2.' + ''.join(meson.project_version().split('.')) + '.0',
+ soversion: cairo_version_sonum,
+ version: cairo_libversion,
install: true,
)
--
2.29.2
From d8d16562ec094593eba4446432e918704590ab20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
Date: Sat, 26 Sep 2020 19:25:21 +0100
Subject: [PATCH] meson: fix macOS build and add macOS ci
Fixes #441
---
.gitlab-ci.yml | 26 ++++++++++++++++++++
meson.build | 61 ++++++++++++++++++++++-------------------------
meson_options.txt | 1 +
3 files changed, 56 insertions(+), 32 deletions(-)
diff --git a/meson.build b/meson.build
index 53a9af343..fe7757b1f 100644
--- a/meson.build
+++ b/meson.build
@@ -371,37 +371,34 @@ if qtgui_dep.found() and false
deps += [qtgui_dep]
endif
-# Untested
-if cc.has_header('ApplicationServices/ApplicationServices.h')
- if cc.has_header('CoreGraphics/CoreGraphics.h')
- quartz_extra_libs = ['-Xlinker', '-framework', '-Xlinker', 'CoreGraphics']
- else
- quartz_extra_libs = ['-Xlinker', '-framework', '-Xlinker', 'ApplicationServices']
+if host_machine.system() == 'darwin' and not get_option('quartz').disabled()
+ quartz_deps = dependency('appleframeworks', modules : ['CoreFoundation', 'ApplicationServices'], required: get_option('quartz'))
+
+ if quartz_deps.found()
+ deps += [quartz_deps]
+
+ feature_conf.set('CAIRO_HAS_QUARTZ_SURFACE', 1)
+ feature_conf.set('CAIRO_HAS_QUARTZ_FONT', 1)
+ feature_conf.set('CAIRO_HAS_QUARTZ_IMAGE_SURFACE', 1)
+
+ built_features += [
+ {
+ 'name': 'cairo-quartz',
+ 'description': 'Quartz surface backend',
+ 'deps': quartz_deps,
+ },
+ {
+ 'name': 'cairo-quartz-image',
+ 'description': 'Quartz Image surface backend',
+ 'deps': quartz_deps,
+ },
+ {
+ 'name': 'cairo-quartz-font',
+ 'description': 'Quartz font backend',
+ 'deps': quartz_deps,
+ },
+ ]
endif
-
- extra_link_args += quartz_extra_libs
-
- feature_conf.set('CAIRO_HAS_QUARTZ_SURFACE', 1)
- feature_conf.set('CAIRO_HAS_QUARTZ_FONT', 1)
- feature_conf.set('CAIRO_HAS_QUARTZ_IMAGE_SURFACE', 1)
-
- built_features += [
- {
- 'name': 'cairo-quartz',
- 'description': 'Quartz surface backend',
- 'libs': quartz_extra_libs,
- },
- {
- 'name': 'cairo-quartz-image',
- 'description': 'Quartz Image surface backend',
- 'libs': quartz_extra_libs,
- },
- {
- 'name': 'cairo-quartz-font',
- 'description': 'Quartz font backend',
- 'libs': quartz_extra_libs,
- },
- ]
endif
if host_machine.system() == 'windows'
@@ -887,13 +884,13 @@ foreach feature: built_features
feature_deps = feature.get('deps', [])
feature_libs = feature.get('libs', [])
feature_compile_deps = feature.get('compile-deps', [])
- pkgmod.generate(libraries: [libcairo] + feature_deps + feature_libs,
+ pkgmod.generate(libraries: [libcairo, feature_deps, feature_libs],
name: feature['name'],
description: feature['description'] + ' for cairo graphics library',
)
meson.override_dependency(feature['name'],
declare_dependency(link_with: libcairo,
- dependencies: feature_deps + feature_compile_deps,
+ dependencies: [feature_deps, feature_compile_deps],
link_args: feature_libs,
)
)
diff --git a/meson_options.txt b/meson_options.txt
index ff11fe7ed..5cafe8bda 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -13,6 +13,7 @@ option('glesv3', type : 'feature', value : 'disabled')
option('drm', type : 'feature', value : 'disabled')
option('openvg', type : 'feature', value : 'disabled')
option('png', type : 'feature', value : 'auto') # png and svg surfaces
+option('quartz', type : 'feature', value : 'auto')
option('qt', type : 'feature', value : 'disabled')
option('tee', type : 'feature', value : 'disabled')
option('xcb', type : 'feature', value : 'auto')
--
2.29.2
From 51d50621be80131334d6966d5c08bb5f635882ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
Date: Fri, 15 Jan 2021 18:47:08 +0000
Subject: [PATCH] meson: only build cairo-boilerplate and cairo-missing helper
libs if needed
Used by tests and the sphinx utility, which may or may not be built,
and if they're not built we don't need to build those libs either.
---
boilerplate/meson.build | 2 ++
util/cairo-missing/meson.build | 2 ++
2 files changed, 4 insertions(+)
diff --git a/boilerplate/meson.build b/boilerplate/meson.build
index 325396d6e..79d1eeea4 100644
--- a/boilerplate/meson.build
+++ b/boilerplate/meson.build
@@ -40,4 +40,6 @@ libcairoboilerplate = static_library('cairoboilerplate', cairo_boilerplate_sourc
include_directories: [incbase, incsrc],
dependencies: deps,
link_with: [libcairo],
+ install: false,
+ build_by_default: false,
)
diff --git a/util/cairo-missing/meson.build b/util/cairo-missing/meson.build
index db328fb1c..dd1507b59 100644
--- a/util/cairo-missing/meson.build
+++ b/util/cairo-missing/meson.build
@@ -8,4 +8,6 @@ inccairomissing = include_directories('.')
libcairomissing = static_library('cairo-missing', cairo_missing_sources,
c_args: ['-DHAVE_CONFIG_H'],
include_directories: [incbase, incsrc],
+ install: false,
+ build_by_default: false,
)
--
2.29.2
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment