From 3f2d8fd766d35f3886bcdb1cfa694eea3763dfdb Mon Sep 17 00:00:00 2001 From: peelz Date: Wed, 25 Sep 2024 18:22:13 -0400 Subject: [PATCH 1/4] fix(dist/arch): don't build package twice --- dist/arch/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/arch/PKGBUILD b/dist/arch/PKGBUILD index a31f22a..c8c7241 100644 --- a/dist/arch/PKGBUILD +++ b/dist/arch/PKGBUILD @@ -60,7 +60,7 @@ build() { package() { - meson install -C build --destdir "${pkgdir}" + meson install -C build --no-rebuild --destdir "${pkgdir}" # We will check for optional packages here: # Check for NVIDIA GPU and if monado-vulkan-layers-git is not already installed From 00fe6130fe1edaee8b491f24447fe97ecd549b63 Mon Sep 17 00:00:00 2001 From: peelz Date: Wed, 25 Sep 2024 18:22:13 -0400 Subject: [PATCH 2/4] fix(dist/arch): remove package suggestion messages lspci may not be present in the build environment (especially if building in a chroot) --- dist/arch/PKGBUILD | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/dist/arch/PKGBUILD b/dist/arch/PKGBUILD index c8c7241..f4f0233 100644 --- a/dist/arch/PKGBUILD +++ b/dist/arch/PKGBUILD @@ -61,25 +61,6 @@ build() { package() { meson install -C build --no-rebuild --destdir "${pkgdir}" - - # We will check for optional packages here: - # Check for NVIDIA GPU and if monado-vulkan-layers-git is not already installed - if lspci | grep -qi nvidia && ! pacman -Qm monado-vulkan-layers-git &>/dev/null; then - printf "\033[0;31m" # red - echo -e "\n" - echo "An NVIDIA GPU has been detected on your system." - echo "For NVIDIA GPU, 'monado-vulkan-layers-git' from the AUR is recommended." - echo "Please install it manually using an AUR helper, e.g., yay -S monado-vulkan-layers-git" - printf "\033[0m" # no color - fi - - # Ask to install libudev0-shim - if ! pacman -Q libudev0-shim &>/dev/null; then - printf "\033[0;31m" # red - echo -e "\n" - echo "The package 'libudev0-shim' is recommended for lighthouse driver support." - printf "\033[0m" # no color - fi } From ddba186ac298bde637de63b8f675f7a2bad21184 Mon Sep 17 00:00:00 2001 From: peelz Date: Wed, 25 Sep 2024 18:22:13 -0400 Subject: [PATCH 3/4] style(dist/arch): formatting --- dist/arch/PKGBUILD | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/dist/arch/PKGBUILD b/dist/arch/PKGBUILD index f4f0233..694a4d6 100644 --- a/dist/arch/PKGBUILD +++ b/dist/arch/PKGBUILD @@ -43,9 +43,10 @@ options=(!lto) pkgver() { cd envision - ( set -o pipefail - git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' || - printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + ( + set -o pipefail + git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' \ + || printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" ) } @@ -54,13 +55,6 @@ build() { meson compile -C build } -# check() { -# meson test -C build --print-errorlogs -# } - - package() { meson install -C build --no-rebuild --destdir "${pkgdir}" } - - From 7d2c4772c2a4b478f2de91e33cc9f3b6b3bcd5fd Mon Sep 17 00:00:00 2001 From: peelz Date: Wed, 25 Sep 2024 18:22:13 -0400 Subject: [PATCH 4/4] chore(dist/arch): bump version --- dist/arch/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/arch/PKGBUILD b/dist/arch/PKGBUILD index 694a4d6..3ff8a64 100644 --- a/dist/arch/PKGBUILD +++ b/dist/arch/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: Gabriele Musco pkgname=envision-xr-git -pkgver=r398.35b0ab9 -pkgrel=3 +pkgver=r633.4fad4f3 +pkgrel=1 pkgdesc='GUI for Monado' arch=(x86_64 aarch64) url='https://gitlab.com/gabmus/envision'