summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Reiter <reiter.christoph@gmail.com>2023-01-27 19:18:50 +0100
committerChristoph Reiter <reiter.christoph@gmail.com>2023-01-27 19:28:40 +0100
commit0f8a2e5428ece351914d25b7fcd91da4ff6c0aa7 (patch)
tree95b8f67ae76ee7a3c3aaacbf77ba6a53b1ce3084
parent02bc8a51c572e0720eb3cb8c0e056287197b02f0 (diff)
downloadpygobject-0f8a2e5428ece351914d25b7fcd91da4ff6c0aa7.tar.gz
meson: bump minimum meson version to 0.53.0 and update subprojects
0.53.0 targets Ubuntu 20.04, also matches what pycairo needs currently. Update the libffi wrap to match what glib uses (the old one no longer works with current glib) And target pycairo main (we target main for everything else too..)
-rw-r--r--meson.build2
-rw-r--r--subprojects/libffi.wrap5
-rw-r--r--subprojects/pycairo.wrap2
3 files changed, 6 insertions, 3 deletions
diff --git a/meson.build b/meson.build
index 85eded48..380d4538 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
project('pygobject', 'c',
version : '3.43.0',
- meson_version : '>= 0.47.0',
+ meson_version : '>= 0.53.0',
default_options : [ 'warning_level=1',
'buildtype=debugoptimized'])
diff --git a/subprojects/libffi.wrap b/subprojects/libffi.wrap
index f92e7363..a8a23bbe 100644
--- a/subprojects/libffi.wrap
+++ b/subprojects/libffi.wrap
@@ -1,5 +1,8 @@
[wrap-git]
directory=libffi
-url=https://github.com/centricular/libffi.git
+url=https://gitlab.freedesktop.org/gstreamer/meson-ports/libffi.git
revision=meson
depth=1
+
+[provide]
+libffi = ffi_dep
diff --git a/subprojects/pycairo.wrap b/subprojects/pycairo.wrap
index 248c2fae..676c4fb1 100644
--- a/subprojects/pycairo.wrap
+++ b/subprojects/pycairo.wrap
@@ -1,5 +1,5 @@
[wrap-git]
directory=pycairo
url=https://github.com/pygobject/pycairo.git
-revision=pycairo-1.18
+revision=main
depth=1