diff --git a/.github/workflows/arch-package.yml b/.github/workflows/arch-package.yml index 17da027a..b61f8db8 100644 --- a/.github/workflows/arch-package.yml +++ b/.github/workflows/arch-package.yml @@ -20,7 +20,7 @@ jobs: echo "ParallelDownloads = 10" >> /etc/pacman.conf echo "\n" && echo "[multilib]" >> /etc/pacman.conf echo "Include = /etc/pacman.d/mirrorlist" >> /etc/pacman.conf - pacman -Syu base-devel sudo meson python-mako glslang hub --noconfirm + pacman -Syu base-devel sudo meson python-mako glslang hub python-numpy python-matplotlib --noconfirm - name: makepkg run: | echo "nobody ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers @@ -40,4 +40,4 @@ jobs: assets+=("-a" "$pkg") done; tag_name="${GITHUB_REF##*/}" - hub release edit "${assets[@]}" -m "" "$tag_name" \ No newline at end of file + hub release edit "${assets[@]}" -m "" "$tag_name" diff --git a/.github/workflows/build-package.yml b/.github/workflows/build-package.yml index 2c558165..3a6bde4c 100644 --- a/.github/workflows/build-package.yml +++ b/.github/workflows/build-package.yml @@ -17,7 +17,7 @@ jobs: - name: Install build tools run: | sudo apt update - sudo apt install gcc-multilib g++-multilib ninja-build python3-setuptools python3-wheel mesa-common-dev libxnvctrl-dev libdbus-1-dev unzip + sudo apt install gcc-multilib g++-multilib ninja-build python3-setuptools python3-wheel mesa-common-dev libxnvctrl-dev libdbus-1-dev python3-numpy python3-matplotlib unzip sudo pip3 install 'meson>=0.60' mako wget https://github.com/KhronosGroup/glslang/releases/download/SDK-candidate-26-Jul-2020/glslang-master-linux-Release.zip unzip glslang-master-linux-Release.zip bin/glslangValidator diff --git a/build_deps.sh b/build_deps.sh index 2d73246d..7693d864 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,python3-numpy,python3-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,python3-numpy,python3-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/pkgbuild/PKGBUILD b/pkgbuild/PKGBUILD index a7242d7c..ffb536de 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=(