From fac0bc78764a368a22623ba5b5a49ed803b0e915 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Wed, 26 May 2021 14:44:58 +0200 Subject: [PATCH] =?UTF-8?q?[meson]=20Drop=20more=20wraps=20we=20don?= =?UTF-8?q?=E2=80=99t=20use=20directly?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile.am | 5 ++--- subprojects/.gitignore | 5 ----- subprojects/libffi.wrap | 5 ----- subprojects/libpng.wrap | 12 ------------ subprojects/pixman.wrap | 6 ------ subprojects/proxy-libintl.wrap | 5 ----- subprojects/zlib.wrap | 12 ------------ 7 files changed, 2 insertions(+), 48 deletions(-) delete mode 100644 subprojects/libffi.wrap delete mode 100644 subprojects/libpng.wrap delete mode 100644 subprojects/pixman.wrap delete mode 100644 subprojects/proxy-libintl.wrap delete mode 100644 subprojects/zlib.wrap diff --git a/Makefile.am b/Makefile.am index 7497c6aab3d..95ef32f0514 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,12 +19,11 @@ EXTRA_DIST = \ replace-enum-strings.cmake \ meson.build \ meson_options.txt \ + subprojects/cairo.wrap \ subprojects/freetype2.wrap \ subprojects/glib.wrap \ - subprojects/libffi.wrap \ - subprojects/proxy-libintl.wrap \ - subprojects/zlib.wrap \ subprojects/google-benchmark.wrap \ + subprojects/ttf-parser.wrap \ perf/meson.build \ perf/perf-draw.hh \ perf/perf-extents.hh \ diff --git a/subprojects/.gitignore b/subprojects/.gitignore index 8f9051b36f7..74c2003f5fb 100644 --- a/subprojects/.gitignore +++ b/subprojects/.gitignore @@ -1,10 +1,5 @@ /freetype2 /glib -/libffi -/proxy-libintl -/zlib /packagecache /benchmark-1.4.1 /cairo -/pixman -/libpng-1.6.35 diff --git a/subprojects/libffi.wrap b/subprojects/libffi.wrap deleted file mode 100644 index 466ca81b6ee..00000000000 --- a/subprojects/libffi.wrap +++ /dev/null @@ -1,5 +0,0 @@ -[wrap-git] -directory=libffi -url=https://gitlab.freedesktop.org/gstreamer/meson-ports/libffi.git -depth=1 -revision=meson diff --git a/subprojects/libpng.wrap b/subprojects/libpng.wrap deleted file mode 100644 index 6503e7b97fd..00000000000 --- a/subprojects/libpng.wrap +++ /dev/null @@ -1,12 +0,0 @@ -[wrap-file] -directory = libpng-1.6.37 -source_url = https://github.com/glennrp/libpng/archive/v1.6.37.tar.gz -source_filename = libpng-1.6.37.tar.gz -source_hash = ca74a0dace179a8422187671aee97dd3892b53e168627145271cad5b5ac81307 -patch_url = https://wrapdb.mesonbuild.com/v1/projects/libpng/1.6.37/3/get_zip -patch_filename = libpng-1.6.37-3-wrap.zip -patch_hash = 6c9f32fd9150b3a96ab89be52af664e32207e10aa9f5fb9aa015989ee2dd7100 - -[provide] -libpng = libpng_dep - diff --git a/subprojects/pixman.wrap b/subprojects/pixman.wrap deleted file mode 100644 index ad18e856b4f..00000000000 --- a/subprojects/pixman.wrap +++ /dev/null @@ -1,6 +0,0 @@ -[wrap-git] -directory=pixman -url=https://gitlab.freedesktop.org/pixman/pixman -push-url=git@gitlab.freedesktop.org:pixman/pixman.git -depth=1 -revision=9b49f4e08751885289333fed652bf5e0f45976b4 diff --git a/subprojects/proxy-libintl.wrap b/subprojects/proxy-libintl.wrap deleted file mode 100644 index 22dd8505cde..00000000000 --- a/subprojects/proxy-libintl.wrap +++ /dev/null @@ -1,5 +0,0 @@ -[wrap-git] -directory=proxy-libintl -url=https://github.com/frida/proxy-libintl.git -depth=1 -revision=50bd2525261d44d80533a523873b9344a6d741c5 diff --git a/subprojects/zlib.wrap b/subprojects/zlib.wrap deleted file mode 100644 index ce20fb05320..00000000000 --- a/subprojects/zlib.wrap +++ /dev/null @@ -1,12 +0,0 @@ -[wrap-file] -directory = zlib-1.2.11 -source_url = http://zlib.net/fossils/zlib-1.2.11.tar.gz -source_filename = zlib-1.2.11.tar.gz -source_hash = c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1 -patch_url = https://wrapdb.mesonbuild.com/v1/projects/zlib/1.2.11/5/get_zip -patch_filename = zlib-1.2.11-5-wrap.zip -patch_hash = 728c8e24acbc2e6682fbd950fec39e2fc77528af361adb87259f8a8511434004 - -[provide] -zlib = zlib_dep -