build-tools: Automatically add a meson dependency

This eliminates the need to copy recipes to -tools.recipe just to add
a meson dependency.

Fixes https://gitlab.freedesktop.org/gstreamer/cerbero/issues/208

4 files changed, 1 insertions, 35 deletions

diff --git a/recipes/build-tools/glib-tools.recipe b/recipes/build-tools/glib-tools.recipe
index 183d6005..e4f0a1b1 100644
--- a/recipes/build-tools/glib-tools.recipe
+++ b/recipes/build-tools/glib-tools.recipe
@@ -11,7 +11,7 @@ class Recipe(recipe.Recipe):
     btype = BuildType.MESON
     meson_options = {'internal_pcre': 'true', 'libmount': 'false',
                      'dtrace': 'false', 'iconv': 'libc', 'selinux' : 'false'}
-    deps = ['libffi-tools', 'zlib-tools', 'pkg-config', 'meson', 'gettext-tools']
+    deps = ['libffi', 'zlib', 'pkg-config', 'meson', 'gettext-tools']
     patches = ['../glib/glib-2.57-meson-backported-fixes.patch',
                '../glib/0001-gengiotypefuncs.py-Read-and-parse-files-in-binary-mo.patch',
                # XXX: Remove when we upgrade our mingw toolchain
diff --git a/recipes/build-tools/libffi-tools.recipe b/recipes/build-tools/libffi-tools.recipe
deleted file mode 100644
index 339bd7e9..00000000
--- a/recipes/build-tools/libffi-tools.recipe
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python
-
-class Recipe(recipe.Recipe):
-    name = 'libffi-tools'
-    version = '3.2.9999'
-    remotes = {'origin': 'https://github.com/libffi/libffi.git'.format(name)}
-    commit = '369ef49f71186fc9d6ab15614488ad466fac3fc1'
-    licenses = [{License.BSD_like: ['LICENSE']}]
-    btype = BuildType.MESON
-    patches = ['../libffi/libffi-port-to-meson-and-msvc.patch']
-    deps = ['meson']
-
-    files_libs = ['libffi']
-    files_devel = ['include/ffi*.h', 'lib/pkgconfig/libffi.pc']
diff --git a/recipes/build-tools/orc-tool.recipe b/recipes/build-tools/orc-tool.recipe
index 8b910dee..d7f47a67 100644
--- a/recipes/build-tools/orc-tool.recipe
+++ b/recipes/build-tools/orc-tool.recipe
@@ -16,7 +16,6 @@ class Recipe(recipe.Recipe):
 
     btype = BuildType.MESON
     licenses = [{License.BSD_like: ['COPYING']}]
-    deps = ['meson']
     meson_options = {'benchmarks': 'disabled', 'tests': 'disabled',
                      'tools': 'enabled', 'orc-test': 'enabled'}
 
diff --git a/recipes/build-tools/zlib-tools.recipe b/recipes/build-tools/zlib-tools.recipe
deleted file mode 100644
index 857cb248..00000000
--- a/recipes/build-tools/zlib-tools.recipe
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python
-
-
-class Recipe(recipe.Recipe):
-    name = 'zlib-tools'
-    version = '1.2.11'
-    stype = SourceType.TARBALL
-    btype = BuildType.MESON
-    url = 'https://zlib.net/fossils/zlib-%(version)s.tar.gz'
-    tarball_checksum = 'c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1'
-    tarball_name = 'zlib-%(version)s.tar.gz'
-    tarball_dirname = 'zlib-%(version)s'
-    licenses = [{License.BSD_like: ['README']}]
-    patches = ['../zlib/0001-win32-fix-dll-name.patch',
-               '../zlib/0001-Fix-test-builds-to-use-the-built-libz-headers-librar.patch',
-               '../zlib/0001-Add-a-meson-port.patch']
-    files_libs = ['libz']
-    files_devel = ['include/zlib.h', 'include/zconf.h', 'lib/pkgconfig/zlib.pc']
-    deps = ['meson']