diff options
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | subprojects/gperf.wrap | 5 | ||||
| -rw-r--r-- | subprojects/libffi.wrap | 4 | ||||
| -rw-r--r-- | subprojects/proxy-libintl.wrap | 4 |
6 files changed, 3 insertions, 19 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b43a1a571..11f45725a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,7 +8,7 @@ include: variables: FDO_UPSTREAM_REPO: 'cairo/cairo' FDO_DISTRIBUTION_VERSION: '34' - FDO_DISTRIBUTION_TAG: '2021-07-31.0' + FDO_DISTRIBUTION_TAG: '2021-08-26.0' # TODO: should probably get its own image at some point instead of reusing the GStreamer one. WINDOWS_IMAGE: "registry.freedesktop.org/gstreamer/gst-ci/amd64/windows:v16-master" @@ -62,7 +62,7 @@ fedora image: gcc g++ zlib-devel - expat + expat-devel libpng-devel fontconfig-devel freetype-devel diff --git a/Makefile.am b/Makefile.am index 1b7c59bf0..12cd9bf25 100644 --- a/Makefile.am +++ b/Makefile.am @@ -82,11 +82,8 @@ EXTRA_DIST += \ subprojects/fontconfig.wrap \ subprojects/freetype2.wrap \ subprojects/glib.wrap \ - subprojects/gperf.wrap \ - subprojects/libffi.wrap \ subprojects/libpng.wrap \ subprojects/pixman.wrap \ - subprojects/proxy-libintl.wrap \ subprojects/zlib.wrap \ $(NULL) diff --git a/meson.build b/meson.build index 7a0506712..2ffd4ea32 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('cairo', 'c', 'cpp', - meson_version: '>= 0.54.0', + meson_version: '>= 0.56.0', version: run_command(find_program('version.py'), check: true).stdout().strip(), default_options: ['warning_level=2'], ) diff --git a/subprojects/gperf.wrap b/subprojects/gperf.wrap deleted file mode 100644 index 748973312..000000000 --- a/subprojects/gperf.wrap +++ /dev/null @@ -1,5 +0,0 @@ -[wrap-git] -directory=gperf -url=https://gitlab.freedesktop.org/tpm/gperf.git -push-url=https://gitlab.freedesktop.org/tpm/gperf.git -revision=meson diff --git a/subprojects/libffi.wrap b/subprojects/libffi.wrap deleted file mode 100644 index 6dea9ebed..000000000 --- a/subprojects/libffi.wrap +++ /dev/null @@ -1,4 +0,0 @@ -[wrap-git] -directory=libffi -url=https://gitlab.freedesktop.org/gstreamer/meson-ports/libffi.git -revision=meson diff --git a/subprojects/proxy-libintl.wrap b/subprojects/proxy-libintl.wrap deleted file mode 100644 index b53c8f7c3..000000000 --- a/subprojects/proxy-libintl.wrap +++ /dev/null @@ -1,4 +0,0 @@ -[wrap-git] -directory=proxy-libintl -url=https://github.com/frida/proxy-libintl.git -revision=0.1 |