use wxgtk instead of wxgtk-dev-314-opt

This commit is contained in:
Lukas1818 2022-04-02 17:53:20 +02:00
parent 193fb49752
commit b4286551fd
2 changed files with 6 additions and 7 deletions

View file

@ -13,7 +13,7 @@ pkgbase = superslicer-prerelease
makedepends = libigl makedepends = libigl
makedepends = openvdb makedepends = openvdb
makedepends = samurai makedepends = samurai
makedepends = wxgtk2-dev-314-opt makedepends = wxgtk2
depends = boost-libs>=1.73.0 depends = boost-libs>=1.73.0
depends = cgal depends = cgal
depends = glew depends = glew
@ -22,7 +22,7 @@ pkgbase = superslicer-prerelease
depends = nlopt depends = nlopt
depends = openvdb depends = openvdb
depends = qhull>=2020.2-4 depends = qhull>=2020.2-4
depends = wxgtk3-dev-314-opt depends = wxgtk3
optdepends = superslicer-profiles: Predefined printer profiles optdepends = superslicer-profiles: Predefined printer profiles
provides = superslicer=1:2.4.58.2 provides = superslicer=1:2.4.58.2
conflicts = superslicer conflicts = superslicer

View file

@ -10,8 +10,8 @@ arch=("$CARCH")
url="https://github.com/supermerill/SuperSlicer" url="https://github.com/supermerill/SuperSlicer"
license=('AGPL3') license=('AGPL3')
options=(!emptydirs) options=(!emptydirs)
depends=('boost-libs>=1.73.0' 'cgal' 'glew' 'imath' 'libspnav' 'nlopt' 'openvdb' 'qhull>=2020.2-4' 'wxgtk3-dev-314-opt') depends=('boost-libs>=1.73.0' 'cgal' 'glew' 'imath' 'libspnav' 'nlopt' 'openvdb' 'qhull>=2020.2-4' 'wxgtk3')
makedepends=('boost>=1.73.0' 'cereal>=1.3.0' 'cmake' 'eigen' 'libigl' 'openvdb' 'samurai' 'wxgtk2-dev-314-opt') # cmake doesn't detect wx if not both gtk2 and gtk3 are installed makedepends=('boost>=1.73.0' 'cereal>=1.3.0' 'cmake' 'eigen' 'libigl' 'openvdb' 'samurai' 'wxgtk2') # cmake doesn't detect wx if not both gtk2 and gtk3 are installed
optdepends=('superslicer-profiles: Predefined printer profiles') optdepends=('superslicer-profiles: Predefined printer profiles')
provides=("superslicer=$epoch:$pkgver") provides=("superslicer=$epoch:$pkgver")
conflicts=('superslicer' 'superslicer-git') conflicts=('superslicer' 'superslicer-git')
@ -28,6 +28,7 @@ prepare()
{ {
cd "$srcdir/SuperSlicer-$_pkgtag" cd "$srcdir/SuperSlicer-$_pkgtag"
[ ! -f build/Makefile ] || rm -rf build [ ! -f build/Makefile ] || rm -rf build
rm -rf build # build does fail everytime if it is not clean build ?
mkdir -p build mkdir -p build
# disabling tests is not enough, we need to remove them explicitly # disabling tests is not enough, we need to remove them explicitly
@ -54,9 +55,7 @@ build()
-DSLIC3R_WX_STABLE=ON \ -DSLIC3R_WX_STABLE=ON \
-DSLIC3R_GTK=3 \ -DSLIC3R_GTK=3 \
-DSLIC3R_BUILD_TESTS=OFF \ -DSLIC3R_BUILD_TESTS=OFF \
-DSLIC3R_ALPHA=ON \ -DSLIC3R_ALPHA=ON
-DwxWidgets_CONFIG_EXECUTABLE=/opt/wxgtk-dev-314/bin/wx-config \
-DCMAKE_CXX_FLAGS="-Wno-unused-command-line-argument -Wl,-rpath=/opt/wxgtk-dev-314/lib"
samu samu
} }