diff --git a/.SRCINFO b/.SRCINFO index 779ff08..95a728f 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -10,12 +10,12 @@ pkgbase = superslicer makedepends = eigen makedepends = libigl makedepends = openvdb - makedepends = wxgtk2 + makedepends = wxgtk2-dev-opt depends = cgal depends = glew depends = nlopt depends = openvdb - depends = wxgtk3-dev + depends = wxgtk3-dev-opt depends = boost-libs-171-opt replaces = slic3r++ source = https://github.com/supermerill//SuperSlicer/archive/2.2.54.1.tar.gz @@ -25,7 +25,7 @@ pkgbase = superslicer source = qhull-broken.patch sha512sums = 080403514cff589f8358e8d99fd1568c2db87f28aa8a76d6daa390e21f7c64dd958412c9212df60eee5da4647301f622673a6befa47fdef3609c56aa37fb14a7 sha512sums = a06f4ec1e78f43783c3cf7a2fe38ff8620e51d1c6f149acccccb58f1121a9d4d0e1823abfb711594ab42abcadd23c8cf92996a39906aa8f308c74c11c7a5a4a3 - sha512sums = c1960eab53ffdd62dac6e33e936dd577fa9c93e100dd3bffdf69bbf71ec995d98ffcc46118bf0830f7017a0fafe5fb611a11861a607737a9bd34337f2bc13423 + sha512sums = 3703901d97ae1982a36eb5c491fe0fd6953e81e6bb1d155404acfcac1de1f377931c88b9667688775af5ed16bd46944ca3a285bc4b2739762faa70e546044c43 sha512sums = acf35ebe467e9fb30f1b77d15348f1a7b82dcf45a5b829e375e972b5d6b49968603b3fa090c4d1f56e8b5148e2b820e79afa269da60ace70de1ceadcf6e820c5 sha512sums = db1857418c2fe380a5e82c3c2b67d945ceb81f40df810c9b6b64730fdbcdf0e5b45e5f6ee8d77f40547b8f078b07aa92f2011e2aaa864a69c4b13d60c2a7b912 diff --git a/PKGBUILD b/PKGBUILD index 44883a1..b8394ac 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -8,9 +8,9 @@ pkgdesc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)" arch=('x86_64') url="https://github.com/supermerill/SuperSlicer" license=('AGPL3') -depends=('cgal' 'glew' 'nlopt' 'openvdb' 'wxgtk3-dev' 'boost-libs-171-opt') +depends=('cgal' 'glew' 'nlopt' 'openvdb' 'wxgtk3-dev-opt' 'boost-libs-171-opt') replaces=('slic3r++') -makedepends=('cereal' 'cmake' 'eigen' 'libigl' 'openvdb' 'wxgtk2') # cmake doesn't detect wx if not both gtk2 and gtk3 are installed +makedepends=('cereal' 'cmake' 'eigen' 'libigl' 'openvdb' 'wxgtk2-dev-opt') # cmake doesn't detect wx if not both gtk2 and gtk3 are installed source=("https://github.com/supermerill//SuperSlicer/archive/$_pkgtag.tar.gz" "superslicer.desktop" "start-superslicer.sh" @@ -18,7 +18,7 @@ source=("https://github.com/supermerill//SuperSlicer/archive/$_pkgtag.tar.gz" "qhull-broken.patch") sha512sums=('080403514cff589f8358e8d99fd1568c2db87f28aa8a76d6daa390e21f7c64dd958412c9212df60eee5da4647301f622673a6befa47fdef3609c56aa37fb14a7' 'a06f4ec1e78f43783c3cf7a2fe38ff8620e51d1c6f149acccccb58f1121a9d4d0e1823abfb711594ab42abcadd23c8cf92996a39906aa8f308c74c11c7a5a4a3' - 'c1960eab53ffdd62dac6e33e936dd577fa9c93e100dd3bffdf69bbf71ec995d98ffcc46118bf0830f7017a0fafe5fb611a11861a607737a9bd34337f2bc13423' + '3703901d97ae1982a36eb5c491fe0fd6953e81e6bb1d155404acfcac1de1f377931c88b9667688775af5ed16bd46944ca3a285bc4b2739762faa70e546044c43' 'acf35ebe467e9fb30f1b77d15348f1a7b82dcf45a5b829e375e972b5d6b49968603b3fa090c4d1f56e8b5148e2b820e79afa269da60ace70de1ceadcf6e820c5' 'db1857418c2fe380a5e82c3c2b67d945ceb81f40df810c9b6b64730fdbcdf0e5b45e5f6ee8d77f40547b8f078b07aa92f2011e2aaa864a69c4b13d60c2a7b912') @@ -53,7 +53,8 @@ build() -DBoost_NO_SYSTEM_PATHS=TRUE \ -DBOOST_ROOT:PATHNAME=/opt/usr \ -DBoost_LIBRARY_DIRS:FILEPATH=/opt/usr/lib \ - -DBoost_INCLUDE_DIR:FILEPATH=/opt/usr/include + -DBoost_INCLUDE_DIR:FILEPATH=/opt/usr/include \ + -DwxWidgets_CONFIG_EXECUTABLE=/opt/wxgtk-dev/bin/wx-config make } diff --git a/start-superslicer.sh b/start-superslicer.sh index 3a2da44..d41bb13 100644 --- a/start-superslicer.sh +++ b/start-superslicer.sh @@ -1,2 +1,2 @@ #!/bin/bash -LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/usr/lib" /usr/share/SuperSlicer/superslicer $@ +LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/usr/lib:/opt/wxgtk-dev/lib" /usr/share/SuperSlicer/superslicer $@