diff options
| -rw-r--r-- | cerbero/bootstrap/build_tools.py | 2 | ||||
| -rw-r--r-- | cerbero/bootstrap/linux.py | 25 | ||||
| -rw-r--r-- | cerbero/build/recipe.py | 2 | ||||
| -rw-r--r-- | recipes/build-tools/meson.recipe | 2 |
4 files changed, 17 insertions, 14 deletions
diff --git a/cerbero/bootstrap/build_tools.py b/cerbero/bootstrap/build_tools.py index 86756f6f..fb3af96b 100644 --- a/cerbero/bootstrap/build_tools.py +++ b/cerbero/bootstrap/build_tools.py @@ -91,6 +91,8 @@ class BuildTools (BootstrapperBase, Fetch): 'cmake': ('3.10.2', None), # dav1d requires nasm >=2.13.02 'nasm': ('2.13.02', '-v'), + # meson requires ninja >=1.8.2 + 'ninja': ('1.8.2', None), } if self.config.platform in (Platform.LINUX, Platform.DARWIN): for tool, (version, arg) in tools.items(): diff --git a/cerbero/bootstrap/linux.py b/cerbero/bootstrap/linux.py index c5b72f05..5c648526 100644 --- a/cerbero/bootstrap/linux.py +++ b/cerbero/bootstrap/linux.py @@ -66,8 +66,8 @@ class DebianBootstrapper (UnixBootstrapper): yes_arg = ['-y'] packages = [ 'autotools-dev', 'automake', 'autoconf', 'libtool', 'g++', 'autopoint', - 'make', 'cmake', 'bison', 'flex', 'nasm', 'pkg-config', 'libxv-dev', - 'libx11-dev', 'libx11-xcb-dev', 'libpulse-dev', 'python3-dev', + 'make', 'cmake', 'ninja-build', 'bison', 'flex', 'nasm', 'pkg-config', + 'libxv-dev', 'libx11-dev', 'libx11-xcb-dev', 'libpulse-dev', 'python3-dev', 'gettext', 'build-essential', 'pkg-config', 'libxext-dev', 'libxi-dev', 'x11proto-record-dev', 'libxrender-dev', 'libgl1-mesa-dev', 'libxfixes-dev', 'libxdamage-dev', 'libxcomposite-dev', @@ -105,8 +105,8 @@ class RedHatBootstrapper (UnixBootstrapper): yes_arg = ['-y'] packages = [ 'gcc', 'gcc-c++', 'automake', 'autoconf', 'libtool', 'gettext-devel', - 'make', 'cmake', 'bison', 'flex', 'nasm', 'pkgconfig', 'curl', - 'intltool', 'rpm-build', 'redhat-rpm-config', 'python3-devel', + 'make', 'cmake', 'ninja-build', 'bison', 'flex', 'nasm', 'pkgconfig', + 'curl', 'intltool', 'rpm-build', 'redhat-rpm-config', 'python3-devel', 'libXrender-devel', 'pulseaudio-libs-devel', 'libXv-devel', 'mesa-libGL-devel', 'libXcomposite-devel', 'perl-ExtUtils-MakeMaker', 'libXi-devel', 'perl-XML-Simple', 'gperf', 'wget', 'libXrandr-devel', @@ -140,7 +140,7 @@ class OpenSuseBootstrapper (UnixBootstrapper): yes_arg = ['-y'] packages = [ 'gcc', 'automake', 'autoconf', 'gcc-c++', 'libtool', 'gettext-tools', - 'make', 'cmake', 'bison', 'flex', 'nasm', 'intltool', + 'make', 'cmake', 'ninja-build', 'bison', 'flex', 'nasm', 'intltool', 'patterns-openSUSE-devel_rpm_build', 'python3-devel', 'xorg-x11-libXrender-devel', 'libpulse-devel', 'xorg-x11-libXv-devel', 'Mesa-libGL-devel', 'libXcomposite-devel', 'libX11-devel', @@ -154,7 +154,7 @@ class ArchBootstrapper (UnixBootstrapper): command = ['-S', '--needed'] yes_arg = ['--noconfirm'] packages = [ - 'intltool', 'cmake', 'libtool', 'bison', 'flex', 'automake', + 'intltool', 'cmake', 'ninja', 'libtool', 'bison', 'flex', 'automake', 'autoconf', 'make', 'gettext', 'nasm', 'gperf', 'libxrender', 'libxv', 'mesa', 'python3', 'wget', 'git', 'xorg-util-macros', 'ccache', 'openssl', 'alsa-lib', @@ -180,12 +180,13 @@ class GentooBootstrapper (UnixBootstrapper): command = ['-u'] yes_arg = [] # Does not seem interactive packages = [ - 'dev-util/intltool', 'dev-util/cmake', 'sys-devel/libtool', - 'sys-devel/bison', 'sys-devel/flex', 'sys-devel/automake', - 'sys-devel/autoconf', 'sys-devel/make', 'sys-devel/gettext', - 'media-sound/pulseaudio', 'dev-lang/nasm', 'dev-util/gperf', - 'x11-libs/libXrender', 'x11-libs/libXv', 'media-libs/mesa', - 'net-misc/wget', 'dev-libs/openssl', 'media-libs/alsa-lib' + 'dev-util/intltool', 'dev-util/cmake', 'dev-util/ninja', + 'sys-devel/libtool', 'sys-devel/bison', 'sys-devel/flex', + 'sys-devel/automake', 'sys-devel/autoconf', 'sys-devel/make', + 'sys-devel/gettext', 'media-sound/pulseaudio', 'dev-lang/nasm', + 'dev-util/gperf', 'x11-libs/libXrender', 'x11-libs/libXv', + 'media-libs/mesa', 'net-misc/wget', 'dev-libs/openssl', + 'media-libs/alsa-lib' ] class NoneBootstrapper (BootstrapperBase): diff --git a/cerbero/build/recipe.py b/cerbero/build/recipe.py index a975daa4..a4c85dff 100644 --- a/cerbero/build/recipe.py +++ b/cerbero/build/recipe.py @@ -283,6 +283,8 @@ SOFTWARE LICENSE COMPLIANCE.\n\n''' if self.config.prefix_is_build_tools(): if self.btype == build.BuildType.MESON: self.deps.append('meson') + if 'ninja' not in self.config.system_build_tools: + self.deps.append('ninja') elif self.btype == build.BuildType.CMAKE: if 'cmake' not in self.config.system_build_tools: self.deps.append('cmake') diff --git a/recipes/build-tools/meson.recipe b/recipes/build-tools/meson.recipe index ae77104b..420b38ee 100644 --- a/recipes/build-tools/meson.recipe +++ b/recipes/build-tools/meson.recipe @@ -12,8 +12,6 @@ class Recipe(recipe.Recipe): url = 'https://github.com/mesonbuild/meson/releases/download/%(version)s/meson-%(version)s.tar.gz' tarball_checksum = 'd04b541f97ca439fb82fab7d0d480988be4bd4e62563a5ca35fadb5400727b1c' - deps = ['ninja'] - files_bin = ['bin/meson'] files_python = [] |