diff options
author | Kevin MacMartin | 2024-04-30 01:48:44 -0400 |
---|---|---|
committer | Kevin MacMartin | 2024-04-30 01:48:44 -0400 |
commit | 30d7570390c3ad2a67e5c6130161f397a235ad8b (patch) | |
tree | 01c2221aaf0c724d7a3dc56aa355f7f6845e4c84 | |
parent | 592b03965ac0510cedd6c4e05c752b7f71c4e5a1 (diff) | |
download | aur-30d7570390c3ad2a67e5c6130161f397a235ad8b.tar.gz |
Add mesa as an optional dependency and only load the egl vendor stuff if it exists
-rw-r--r-- | .SRCINFO | 5 | ||||
-rw-r--r-- | PKGBUILD | 5 | ||||
-rwxr-xr-x | UltiMaker-Cura | 6 |
3 files changed, 10 insertions, 6 deletions
@@ -1,13 +1,14 @@ pkgbase = cura-bin pkgdesc = State-of-the-art slicer app to prepare your 3D models for your 3D printer pkgver = 5.7.1 - pkgrel = 2 + pkgrel = 3 url = https://ultimaker.com/software/ultimaker-cura arch = x86_64 license = LGPL3 makedepends = util-linux depends = fuse2 depends = xdg-desktop-portal + optdepends = mesa: for use with the closed source nvidia driver under wayland provides = cura conflicts = cura options = !strip @@ -16,6 +17,6 @@ pkgbase = cura-bin source = UltiMaker-Cura sha512sums = 3b148f2401d63f7cce839a945b5db28c6fa5f76a15258a1a50ce75dabf44db7ec5568ffb0dcecda04d685894a9f89c8a0370ead9cc1aae50bdb3f80e7c28b246 sha512sums = 36901c32ba548f0b4b097945ce59efa45f26182f59ecb295af234f8efc939aa456b8e9a36e52b1d0d9188f6fd178f44629dc4df960391a519580a2c7407ebf03 - sha512sums = 600e02452d2be4882aad5fefc6b29dcd4eef3e75218aa8d7016a377735bcd911286f02f3016f40cd4827d1f7c18526f8cfe96636fdce2c5c8b0533f8eb779198 + sha512sums = 9f54c0381e91ec46411089a809d9864d1c87e995bd9ac58569ea439268b53d57cbc69d247abb5dda42584e2fba7e1a8c53addc05959e3b5e7b9e529312705c57 pkgname = cura-bin @@ -6,12 +6,13 @@ _pkgname=cura pkgname=$_pkgname-bin pkgver=5.7.1 -pkgrel=2 +pkgrel=3 pkgdesc='State-of-the-art slicer app to prepare your 3D models for your 3D printer' url='https://ultimaker.com/software/ultimaker-cura' license=('LGPL3') arch=('x86_64') depends=('fuse2' 'xdg-desktop-portal') +optdepends=('mesa: for use with the closed source nvidia driver under wayland') makedepends=('util-linux') provides=($_pkgname) conflicts=($_pkgname) @@ -26,7 +27,7 @@ source=( sha512sums=( '3b148f2401d63f7cce839a945b5db28c6fa5f76a15258a1a50ce75dabf44db7ec5568ffb0dcecda04d685894a9f89c8a0370ead9cc1aae50bdb3f80e7c28b246' '36901c32ba548f0b4b097945ce59efa45f26182f59ecb295af234f8efc939aa456b8e9a36e52b1d0d9188f6fd178f44629dc4df960391a519580a2c7407ebf03' - '600e02452d2be4882aad5fefc6b29dcd4eef3e75218aa8d7016a377735bcd911286f02f3016f40cd4827d1f7c18526f8cfe96636fdce2c5c8b0533f8eb779198' + '9f54c0381e91ec46411089a809d9864d1c87e995bd9ac58569ea439268b53d57cbc69d247abb5dda42584e2fba7e1a8c53addc05959e3b5e7b9e529312705c57' ) prepare() { diff --git a/UltiMaker-Cura b/UltiMaker-Cura index 151ee54c7c31..6e8fd6b823c6 100755 --- a/UltiMaker-Cura +++ b/UltiMaker-Cura @@ -2,8 +2,10 @@ unset QT_STYLE_OVERRIDE -if [[ "$XDG_SESSION_TYPE" = 'wayland' ]]; then - __EGL_VENDOR_LIBRARY_FILENAMES=/usr/share/glvnd/egl_vendor.d/50_mesa.json MESA_LOADER_DRIVER_OVERRIDE=zink /opt/ultimaker-cura/AppRun "$@" +egl_vendor=/usr/share/glvnd/egl_vendor.d/50_mesa.json + +if [[ "$XDG_SESSION_TYPE" = 'wayland' && -f "$egl_vendor" ]]; then + __EGL_VENDOR_LIBRARY_FILENAMES="$egl_vendor" MESA_LOADER_DRIVER_OVERRIDE=zink /opt/ultimaker-cura/AppRun "$@" else /opt/ultimaker-cura/AppRun "$@" fi |