diff --git a/.SRCINFO b/.SRCINFO index 0521786..87e5fe4 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = orca-slicer-git pkgdesc = G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc.) - pkgver = 2.3.1.r25349.e44ec1f + pkgver = 2.3.1.r25462.90a6c53 pkgrel = 1 url = https://github.com/SoftFever/OrcaSlicer arch = x86_64 @@ -30,6 +30,7 @@ pkgbase = orca-slicer-git depends = hicolor-icon-theme depends = libglvnd depends = libjpeg-turbo + depends = libpng depends = libspnav depends = libx11 depends = pango @@ -38,6 +39,7 @@ pkgbase = orca-slicer-git depends = wayland depends = webkit2gtk-4.1 depends = zlib + depends = zstd optdepends = mesa: Enables Zink fallback workaround for NVIDIA on Wayland optdepends = mesa-utils: for detecting renderer optdepends = nvidia-utils: for querying driver version diff --git a/PKGBUILD b/PKGBUILD index 35ff22b..dab2be0 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,15 +1,15 @@ # Maintainer: lod pkgname=orca-slicer-git -pkgver=2.3.1.r25349.e44ec1f +pkgver=2.3.1.r25462.90a6c53 pkgrel=1 pkgdesc="G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc.)" arch=('x86_64') url="https://github.com/SoftFever/OrcaSlicer" license=('AGPL-3.0-only') depends=('bash' 'cairo' 'dbus' 'expat' 'fontconfig' 'freetype2' 'gcc-libs' 'gdk-pixbuf2' 'glib2' 'glibc' - 'gst-plugins-base-libs' 'gstreamer' 'gtk3' 'hicolor-icon-theme' 'libglvnd' 'libjpeg-turbo' - 'libspnav' 'libx11' 'pango' 'python' 'ttf-nanum' 'wayland' 'webkit2gtk-4.1' 'zlib') + 'gst-plugins-base-libs' 'gstreamer' 'gtk3' 'hicolor-icon-theme' 'libglvnd' 'libjpeg-turbo' 'libpng' + 'libspnav' 'libx11' 'pango' 'python' 'ttf-nanum' 'wayland' 'webkit2gtk-4.1' 'zlib' 'zstd') makedepends=('cmake' 'extra-cmake-modules' 'git' 'glew' 'libigl' 'm4' 'ninja' 'pkgconf' 'wayland-protocols') optdepends=('mesa: Enables Zink fallback workaround for NVIDIA on Wayland' 'mesa-utils: for detecting renderer' @@ -67,7 +67,7 @@ build() { ninja -C build # add localizations - ./run_gettext.sh --full + ./scripts//run_gettext.sh --full } package() { diff --git a/orca-slicer-wrapper.sh b/orca-slicer-wrapper.sh index db58b5d..eccc49a 100644 --- a/orca-slicer-wrapper.sh +++ b/orca-slicer-wrapper.sh @@ -8,8 +8,9 @@ export LC_ALL=C # Use Zink to run OpenGL on top of Vulkan bypassing the problematic NVIDIA OpenGL stack while retaining hardware acceleration. if [ "$XDG_SESSION_TYPE" = "wayland" ] && [ "$ZINK_DISABLE_OVERRIDE" != "1" ]; then if command -v glxinfo >/dev/null 2>&1; then + VENDOR=$(glxinfo | grep "OpenGL vendor string:" | sed 's/.*: //') RENDERER=$(glxinfo | grep "OpenGL renderer string:" | sed 's/.*: //') - if echo "$RENDERER" | grep -qi "NVIDIA"; then + if echo "$VENDOR $RENDERER" | grep -qi "NVIDIA"; then if command -v nvidia-smi >/dev/null 2>&1; then DRIVER_VERSION=$(nvidia-smi --query-gpu=driver_version --format=csv,noheader | head -n1) DRIVER_MAJOR=$(echo "$DRIVER_VERSION" | cut -d. -f1)