From e1aee06cdf4bffe5d3e292bc2bd8d3187127b375 Mon Sep 17 00:00:00 2001 From: Bill Li Date: Mon, 29 May 2023 04:48:54 +0800 Subject: [PATCH] build: Add dependencies for mangoplot --- build_deps.sh | 10 +++++----- meson.build | 2 +- pkgbuild/PKGBUILD | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build_deps.sh b/build_deps.sh index 2d73246..730b5f9 100644 --- a/build_deps.sh +++ b/build_deps.sh @@ -1,7 +1,7 @@ -DEPS_ARCH="gcc,meson,pkgconf,python-mako,glslang,libglvnd,lib32-libglvnd,libxnvctrl,libdrm" -DEPS_FEDORA="meson,gcc,gcc-c++,libX11-devel,glslang,python3-mako,mesa-libGL-devel,libXNVCtrl-devel,dbus-devel" -DEPS_DEBIAN="gcc,g++,gcc-multilib,g++-multilib,ninja-build,python3-pip,python3-setuptools,python3-wheel,pkg-config,mesa-common-dev,libx11-dev,libxnvctrl-dev,libdbus-1-dev" -DEPS_SOLUS="mesalib-32bit-devel,glslang,libstdc++-32bit,glibc-32bit-devel,mako" +DEPS_ARCH="gcc,meson,pkgconf,python-mako,glslang,libglvnd,lib32-libglvnd,libxnvctrl,libdrm,python-numpy,python-matplotlib" +DEPS_FEDORA="meson,gcc,gcc-c++,libX11-devel,glslang,python3-mako,mesa-libGL-devel,libXNVCtrl-devel,dbus-devel,numpy,python-matplotlib" +DEPS_DEBIAN="gcc,g++,gcc-multilib,g++-multilib,ninja-build,python3-pip,python3-setuptools,python3-wheel,pkg-config,mesa-common-dev,libx11-dev,libxnvctrl-dev,libdbus-1-dev,numpy,matplotlib" +DEPS_SOLUS="mesalib-32bit-devel,glslang,libstdc++-32bit,glibc-32bit-devel,mako,numpy,matplotlib" -DEPS_SUSE="gcc-c++,gcc-c++-32bit,libpkgconf-devel,ninja,python3-pip,python3-Mako,libX11-devel,glslang-devel,glibc-devel,glibc-devel-32bit,libstdc++-devel,libstdc++-devel-32bit,Mesa-libGL-devel,dbus-1-devel" +DEPS_SUSE="gcc-c++,gcc-c++-32bit,libpkgconf-devel,ninja,python3-pip,python3-Mako,libX11-devel,glslang-devel,glibc-devel,glibc-devel-32bit,libstdc++-devel,libstdc++-devel-32bit,Mesa-libGL-devel,dbus-1-devel,python-numpy,python-matplotlib" DEPS_SUSE_EXTRA="libXNVCtrl-devel" diff --git a/meson.build b/meson.build index 199cd11..22ae5a1 100644 --- a/meson.build +++ b/meson.build @@ -9,7 +9,7 @@ project('MangoHud', cc = meson.get_compiler('c') cpp = meson.get_compiler('cpp') -prog_python = import('python').find_installation('python3', modules: ['mako']) +prog_python = import('python').find_installation('python3', modules: ['mako', 'numpy', 'matplotlib']) null_dep = dependency('', required : false) mangohud_version = vcs_tag( diff --git a/pkgbuild/PKGBUILD b/pkgbuild/PKGBUILD index a7242d7..ffb536d 100644 --- a/pkgbuild/PKGBUILD +++ b/pkgbuild/PKGBUILD @@ -6,7 +6,7 @@ pkgrel=1 pkgdesc="Vulkan and OpenGL overlay to display performance information" arch=('x86_64') makedepends=('dbus' 'gcc' 'meson' 'python-mako' 'libx11' 'lib32-libx11' 'git' 'pkgconf' 'vulkan-headers') -depends=('glslang' 'libglvnd' 'lib32-libglvnd' 'glew' 'glfw-x11') +depends=('glslang' 'libglvnd' 'lib32-libglvnd' 'glew' 'glfw-x11' 'python-numpy' 'python-matplotlib') replaces=('vulkan-mesa-layer-mango') license=('MIT') source=(