diff --git a/.SRCINFO b/.SRCINFO index cde3c85..596c8ab 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = superslicer-prerelease pkgdesc = G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.) pkgver = 2.7.61.0 - pkgrel = 1 + pkgrel = 2 epoch = 1 url = https://github.com/supermerill/SuperSlicer arch = x86_64 @@ -21,6 +21,7 @@ pkgbase = superslicer-prerelease depends = libspnav depends = nanosvg depends = nlopt + depends = opencascade depends = openvdb depends = qhull>=2020.2-4 depends = slicer-udev @@ -40,6 +41,7 @@ pkgbase = superslicer-prerelease source = 0003-openexr3.patch source = 0004-fix-opencascade-version-check.patch source = 0005-fix-opencascade-libs.patch + source = 0006-cmake3.5.patch source = 0008-boost1.85.patch source = 0009-fix-multiple-choice.patch source = 0010-occtwrapper-install-dir.patch @@ -56,6 +58,7 @@ pkgbase = superslicer-prerelease sha512sums = 840e51b8feb3568ff46d309ece063f7188018fcaa43d19ec50ede408fdf2c237a3b7eaa11ba24409d8c3f7d6f5fb270181508cc56e0b2b0fef68b766130ef1eb sha512sums = 8512ace14c71b04eb98532e71592447475cf7feccf1c85f376487615c8a95f6afa645e4581f577ee26d91532c57f389eac7534a875d5a24e871f3ef593af33c9 sha512sums = a01abf748f82bc423f2c012ac430f78cfd5e56dede1d5999376e780267d0302d9a2a80c3eb15226c2f82102dda4c567c721ff99ab1fdeef504cbf9d9cb63ca53 + sha512sums = 7ff2c1b39d18bd0e2cdf56582281f04509ae92e9c8837c67b99afcebffe293688fc9d93c4a790b231413bf8bafda803db9fc90b312db03c989122e4319bab66b sha512sums = ca9f407d87d8dd0181077bc2da5a8e2f8995eed88a4787b73ee6c62ef6d2380fd1394fe5412cdc34276d4182bce6f272173e9ccb653d1e28978e16f379114002 sha512sums = 6d7ab93042a75f04e1c3c8f294d19dd39abaf22aa75caf996c6a0cf753f6472134a3d4fa443b73924800b2d3a710416a931745c168911c0df3709fb71ec00570 sha512sums = 92929ba1cb6ee104a10f34a649eba3789ca02f1725104a57412279ff68c46614b1812b13e7dcdf0d235618b9f2a868b4798b1404d9e712d9f1efd46e6c71fcb5 diff --git a/0006-cmake3.5.patch b/0006-cmake3.5.patch new file mode 100644 index 0000000..401e379 --- /dev/null +++ b/0006-cmake3.5.patch @@ -0,0 +1,148 @@ +diff --git a/cmake/modules/FindOpenVDB.cmake b/cmake/modules/FindOpenVDB.cmake +index 4fde5fa4a7..5379a1a9e3 100644 +--- a/cmake/modules/FindOpenVDB.cmake ++++ b/cmake/modules/FindOpenVDB.cmake +@@ -123,7 +123,7 @@ if (OPENVDB_FIND_MODULE_PATH) + endif () + # ########################################################################### + +-cmake_minimum_required(VERSION 3.3) ++cmake_minimum_required(VERSION 3.5) + # Monitoring _ROOT variables + if(POLICY CMP0074) + cmake_policy(SET CMP0074 NEW) +diff --git a/sandboxes/opencsg/CMakeLists.txt b/sandboxes/opencsg/CMakeLists.txt +index ace8f4d539..fd1e5601e2 100644 +--- a/sandboxes/opencsg/CMakeLists.txt ++++ b/sandboxes/opencsg/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.0) ++cmake_minimum_required(VERSION 3.5) + + project(OpenCSG-example) + +diff --git a/src/admesh/CMakeLists.txt b/src/admesh/CMakeLists.txt +index 217976318a..645495d9bb 100644 +--- a/src/admesh/CMakeLists.txt ++++ b/src/admesh/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.8.12) ++cmake_minimum_required(VERSION 3.5) + project(admesh) + + add_library(admesh STATIC +diff --git a/src/avrdude/CMakeLists.txt b/src/avrdude/CMakeLists.txt +index 091afc6f98..64ce87f56f 100644 +--- a/src/avrdude/CMakeLists.txt ++++ b/src/avrdude/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.0) ++cmake_minimum_required(VERSION 3.5) + + add_definitions(-D_BSD_SOURCE -D_DEFAULT_SOURCE) # To enable various useful macros and functions on Unices + remove_definitions(-D_UNICODE -DUNICODE) +diff --git a/src/boost/CMakeLists.txt b/src/boost/CMakeLists.txt +index e8c9e11ce6..c8950e1501 100644 +--- a/src/boost/CMakeLists.txt ++++ b/src/boost/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.8.12) ++cmake_minimum_required(VERSION 3.5) + project(nowide) + + add_library(nowide STATIC +diff --git a/src/clipper/CMakeLists.txt b/src/clipper/CMakeLists.txt +index 1c1cfd5a7c..e57218413a 100644 +--- a/src/clipper/CMakeLists.txt ++++ b/src/clipper/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.8.12) ++cmake_minimum_required(VERSION 3.5) + project(clipper) + + add_library(clipper STATIC +diff --git a/src/exif/CMakeLists.txt b/src/exif/CMakeLists.txt +index bdab4df6c4..48a5ecf883 100644 +--- a/src/exif/CMakeLists.txt ++++ b/src/exif/CMakeLists.txt +@@ -1,5 +1,4 @@ +- +-cmake_minimum_required(VERSION 2.5) ++cmake_minimum_required(VERSION 3.5) + + include_directories(include) + +diff --git a/src/glu-libtess/CMakeLists.txt b/src/glu-libtess/CMakeLists.txt +index 8fca992a3e..bfa43d3693 100644 +--- a/src/glu-libtess/CMakeLists.txt ++++ b/src/glu-libtess/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.8.12) ++cmake_minimum_required(VERSION 3.5) + project(glu-libtess) + + add_library(glu-libtess STATIC +diff --git a/src/imgui/CMakeLists.txt b/src/imgui/CMakeLists.txt +index 5239eb3d5c..d71bf3716e 100644 +--- a/src/imgui/CMakeLists.txt ++++ b/src/imgui/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.8.12) ++cmake_minimum_required(VERSION 3.5) + project(imgui) + + add_library(imgui STATIC +diff --git a/src/jpeg-compressor/CMakeLists.txt b/src/jpeg-compressor/CMakeLists.txt +index 7d404dc995..9f717165f2 100644 +--- a/src/jpeg-compressor/CMakeLists.txt ++++ b/src/jpeg-compressor/CMakeLists.txt +@@ -1,6 +1,6 @@ + # PrusaSlicer specific CMake + +-cmake_minimum_required(VERSION 2.8.12) ++cmake_minimum_required(VERSION 3.5) + project(jpeg-compressor) + + add_library(jpeg-compressor STATIC +diff --git a/src/libigl/CMakeLists.txt b/src/libigl/CMakeLists.txt +index f023826a52..f180ea4168 100644 +--- a/src/libigl/CMakeLists.txt ++++ b/src/libigl/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.0) ++cmake_minimum_required(VERSION 3.5) + project(libigl) + + add_library(libigl INTERFACE) +diff --git a/src/miniz/CMakeLists.txt b/src/miniz/CMakeLists.txt +index 04d562b764..3beefa3921 100644 +--- a/src/miniz/CMakeLists.txt ++++ b/src/miniz/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.8.12) ++cmake_minimum_required(VERSION 3.5) + project(miniz) + + add_library(miniz INTERFACE) +diff --git a/src/qoi/CMakeLists.txt b/src/qoi/CMakeLists.txt +index af8bf2e051..acd97ee230 100644 +--- a/src/qoi/CMakeLists.txt ++++ b/src/qoi/CMakeLists.txt +@@ -1,6 +1,6 @@ + # PrusaSlicer specific CMake + +-cmake_minimum_required(VERSION 2.8.12) ++cmake_minimum_required(VERSION 3.5) + project(qoi) + + add_library(qoi STATIC +diff --git a/src/semver/CMakeLists.txt b/src/semver/CMakeLists.txt +index 4b61a7456e..59f12a4ca5 100644 +--- a/src/semver/CMakeLists.txt ++++ b/src/semver/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.8.12) ++cmake_minimum_required(VERSION 3.5) + project(semver) + + add_library(semver STATIC diff --git a/PKGBUILD b/PKGBUILD index f8d0c23..5e4b9bc 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,7 +7,7 @@ pkgver=2.7.61.0 _pkgtag=$pkgver # https://github.com/supermerill/SuperSlicer/blob/2.7.61.0/deps/%2BLibBGCode/LibBGCode.cmake _libbgcode=6f43cb004ef3d3bda37dde49f6235e24d2717629 -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)" arch=("$CARCH") @@ -23,6 +23,7 @@ depends=( 'libspnav' 'nanosvg' 'nlopt' + 'opencascade' 'openvdb' 'qhull>=2020.2-4' 'slicer-udev' @@ -50,6 +51,7 @@ source=("https://github.com/supermerill/SuperSlicer/archive/$_pkgtag.tar.gz" "0003-openexr3.patch" "0004-fix-opencascade-version-check.patch" "0005-fix-opencascade-libs.patch" + "0006-cmake3.5.patch" "0008-boost1.85.patch" "0009-fix-multiple-choice.patch" "0010-occtwrapper-install-dir.patch" @@ -66,6 +68,7 @@ sha512sums=('0d72bf61adcafe8eef2ed860449dc25ca295ba0732d956bff8c0ae50b381387b803 '840e51b8feb3568ff46d309ece063f7188018fcaa43d19ec50ede408fdf2c237a3b7eaa11ba24409d8c3f7d6f5fb270181508cc56e0b2b0fef68b766130ef1eb' '8512ace14c71b04eb98532e71592447475cf7feccf1c85f376487615c8a95f6afa645e4581f577ee26d91532c57f389eac7534a875d5a24e871f3ef593af33c9' 'a01abf748f82bc423f2c012ac430f78cfd5e56dede1d5999376e780267d0302d9a2a80c3eb15226c2f82102dda4c567c721ff99ab1fdeef504cbf9d9cb63ca53' + '7ff2c1b39d18bd0e2cdf56582281f04509ae92e9c8837c67b99afcebffe293688fc9d93c4a790b231413bf8bafda803db9fc90b312db03c989122e4319bab66b' 'ca9f407d87d8dd0181077bc2da5a8e2f8995eed88a4787b73ee6c62ef6d2380fd1394fe5412cdc34276d4182bce6f272173e9ccb653d1e28978e16f379114002' '6d7ab93042a75f04e1c3c8f294d19dd39abaf22aa75caf996c6a0cf753f6472134a3d4fa443b73924800b2d3a710416a931745c168911c0df3709fb71ec00570' '92929ba1cb6ee104a10f34a649eba3789ca02f1725104a57412279ff68c46614b1812b13e7dcdf0d235618b9f2a868b4798b1404d9e712d9f1efd46e6c71fcb5' @@ -105,6 +108,7 @@ prepare() { "$srcdir/0003-openexr3.patch" \ "$srcdir/0004-fix-opencascade-version-check.patch" \ "$srcdir/0005-fix-opencascade-libs.patch" \ + "$srcdir/0006-cmake3.5.patch" \ "$srcdir/0008-boost1.85.patch" \ "$srcdir/0009-fix-multiple-choice.patch" \ "$srcdir/0010-occtwrapper-install-dir.patch" \ @@ -152,7 +156,7 @@ build() { package() { cd "$srcdir/SuperSlicer-$_pkgtag/build" - DESTDIR="$pkgdir" samu install + DESTDIR="$pkgdir" ninja install test ! -h "$pkgdir/usr/share/SuperSlicer/resources" || rm "$pkgdir/usr/share/SuperSlicer/resources" rm -r "$pkgdir/usr/lib/udev" # provided by slicer-udev }