diff --git a/.SRCINFO b/.SRCINFO index cba14a1..4729324 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,12 +1,14 @@ pkgbase = orca-slicer-git pkgdesc = G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc.) - pkgver = 2.3.1.r25068.00277ac + pkgver = 2.3.1.r25067.c6b8664 pkgrel = 1 url = https://github.com/SoftFever/OrcaSlicer arch = x86_64 license = AGPL-3.0-only makedepends = cmake makedepends = extra-cmake-modules + makedepends = gcc14 + makedepends = gcc14-libs makedepends = git makedepends = glew makedepends = libigl diff --git a/PKGBUILD b/PKGBUILD index b7aaa64..b87c355 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: lod pkgname=orca-slicer-git -pkgver=2.3.1.r25068.00277ac +pkgver=2.3.1.r25067.c6b8664 pkgrel=1 pkgdesc="G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc.)" arch=('x86_64') @@ -10,7 +10,7 @@ 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' 'wayland' 'webkit2gtk-4.1' 'zlib') -makedepends=('cmake' 'extra-cmake-modules' 'git' 'glew' 'libigl' 'm4' 'ninja' 'pkgconf' 'wayland-protocols') +makedepends=('cmake' 'extra-cmake-modules' 'gcc14' 'gcc14-libs' 'git' 'glew' 'libigl' 'm4' 'ninja' 'pkgconf' 'wayland-protocols') optdepends=('mesa: Enables Zink fallback workaround for NVIDIA on Wayland' 'mesa-utils: for detecting renderer' 'nvidia-utils: for querying driver version') @@ -39,13 +39,14 @@ prepare() { sed -i 's/if(FLATPAK)/if(true)/' $pkgname/deps/CMakeLists.txt # cherry pick an OCCT commit to make it build with system freetype cat 7236e83dcc1e7284e66dc61e612154617ef715d6.patch >> $pkgname/deps/OCCT/0001-OCCT-fix.patch - # OSMesa got removed in mesa 25.1, replace it with gl - sed -i 's/OSMesa/OpenGL::GL/' $pkgname/src/slic3r/CMakeLists.txt } build() { cd $pkgname + export CXXFLAGS="${CXXFLAGS} -flto" export CMAKE_POLICY_VERSION_MINIMUM=3.5 + export CC=/usr/bin/gcc-14 + export CXX=/usr/bin/g++-14 cmake \ -G Ninja \