superslicer-prerelease 1:2.5.60.0-2
fix conflict with prusa-slicer package
This commit is contained in:
parent
2b9cd5ceb7
commit
5355a535ef
3 changed files with 34 additions and 4 deletions
4
.SRCINFO
4
.SRCINFO
|
@ -1,7 +1,7 @@
|
|||
pkgbase = superslicer-prerelease
|
||||
pkgdesc = G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)
|
||||
pkgver = 2.5.60.0
|
||||
pkgrel = 1
|
||||
pkgrel = 2
|
||||
epoch = 1
|
||||
url = https://github.com/supermerill/SuperSlicer
|
||||
arch = x86_64
|
||||
|
@ -38,6 +38,7 @@ pkgbase = superslicer-prerelease
|
|||
source = 0007-boost1.84.patch
|
||||
source = 0008-boost1.85.patch
|
||||
source = 0009-fix-multiple-choice.patch
|
||||
source = 0010-occtwrapper-install-dir.patch
|
||||
sha512sums = a53f4cc9b5a20f3f60d38553d47bfd19ce8bd739a8a16493bbcf64f75825fa760b8c107d7f927d49d967f7d067fac8c428c8f6e67219e74b0970d9ab7aa5b9e6
|
||||
sha512sums = fc18e8edf516f9479c3b0e201d1c74b42289f15ef8a64ff3a88c2bb14613978a9dcf7be50ff8b79faf054c7721a095a70715b0fb0747be48757f9502ba0eb859
|
||||
sha512sums = 58467732161eb0abe58cfb1e64e080f64f9f2221032b0d6176739fc81a61fe7838fa6479e9aac7fa0ee9805898f9293081c5e35a146df103830199b46354b97e
|
||||
|
@ -48,5 +49,6 @@ pkgbase = superslicer-prerelease
|
|||
sha512sums = a92af974cb62901aab5a5c8c34672e9a7c90ea7246bbd7423421a9b7ee12a7b17073d90a6f36f994328c7dc9c2d0a6e4fd18c980a71863bc530d873ebaa80433
|
||||
sha512sums = ca9f407d87d8dd0181077bc2da5a8e2f8995eed88a4787b73ee6c62ef6d2380fd1394fe5412cdc34276d4182bce6f272173e9ccb653d1e28978e16f379114002
|
||||
sha512sums = 6d7ab93042a75f04e1c3c8f294d19dd39abaf22aa75caf996c6a0cf753f6472134a3d4fa443b73924800b2d3a710416a931745c168911c0df3709fb71ec00570
|
||||
sha512sums = 92929ba1cb6ee104a10f34a649eba3789ca02f1725104a57412279ff68c46614b1812b13e7dcdf0d235618b9f2a868b4798b1404d9e712d9f1efd46e6c71fcb5
|
||||
|
||||
pkgname = superslicer-prerelease
|
||||
|
|
25
0010-occtwrapper-install-dir.patch
Normal file
25
0010-occtwrapper-install-dir.patch
Normal file
|
@ -0,0 +1,25 @@
|
|||
diff --git a/src/libslic3r/Format/STEP.cpp b/src/libslic3r/Format/STEP.cpp
|
||||
index 5165bb7015..9d76c23dca 100644
|
||||
--- a/src/libslic3r/Format/STEP.cpp
|
||||
+++ b/src/libslic3r/Format/STEP.cpp
|
||||
@@ -57,6 +57,9 @@ LoadStepFn get_load_step_fn()
|
||||
#elif __APPLE__
|
||||
load_step_fn = &load_step_internal;
|
||||
#else
|
||||
+ libpath = libpath.parent_path();
|
||||
+ libpath /= "lib";
|
||||
+ libpath /= "superslicer";
|
||||
libpath /= "OCCTWrapper.so";
|
||||
void *plugin_ptr = dlopen(libpath.c_str(), RTLD_NOW | RTLD_GLOBAL);
|
||||
|
||||
diff --git a/src/occt_wrapper/CMakeLists.txt b/src/occt_wrapper/CMakeLists.txt
|
||||
index ed75531a96..6dc45bae9f 100644
|
||||
--- a/src/occt_wrapper/CMakeLists.txt
|
||||
+++ b/src/occt_wrapper/CMakeLists.txt
|
||||
@@ -56,5 +56,5 @@ target_link_libraries(OCCTWrapper ${OCCT_LIBS})
|
||||
|
||||
include(GNUInstallDirs)
|
||||
|
||||
-install(TARGETS OCCTWrapper DESTINATION "${CMAKE_INSTALL_BINDIR}")
|
||||
+install(TARGETS OCCTWrapper DESTINATION "${CMAKE_INSTALL_LIBDIR}/superslicer")
|
||||
|
9
PKGBUILD
9
PKGBUILD
|
@ -5,7 +5,7 @@
|
|||
pkgname=superslicer-prerelease
|
||||
pkgver=2.5.60.0
|
||||
_pkgtag=$pkgver
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
epoch=1
|
||||
pkgdesc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
|
||||
arch=("$CARCH")
|
||||
|
@ -26,7 +26,8 @@ source=("https://github.com/supermerill/SuperSlicer/archive/$_pkgtag.tar.gz"
|
|||
"0006-fix-non-const-lvalue.patch"
|
||||
"0007-boost1.84.patch"
|
||||
"0008-boost1.85.patch"
|
||||
"0009-fix-multiple-choice.patch")
|
||||
"0009-fix-multiple-choice.patch"
|
||||
"0010-occtwrapper-install-dir.patch")
|
||||
sha512sums=('a53f4cc9b5a20f3f60d38553d47bfd19ce8bd739a8a16493bbcf64f75825fa760b8c107d7f927d49d967f7d067fac8c428c8f6e67219e74b0970d9ab7aa5b9e6'
|
||||
'fc18e8edf516f9479c3b0e201d1c74b42289f15ef8a64ff3a88c2bb14613978a9dcf7be50ff8b79faf054c7721a095a70715b0fb0747be48757f9502ba0eb859'
|
||||
'58467732161eb0abe58cfb1e64e080f64f9f2221032b0d6176739fc81a61fe7838fa6479e9aac7fa0ee9805898f9293081c5e35a146df103830199b46354b97e'
|
||||
|
@ -36,7 +37,8 @@ sha512sums=('a53f4cc9b5a20f3f60d38553d47bfd19ce8bd739a8a16493bbcf64f75825fa760b8
|
|||
'aca3a028eaab63baf83dd80d82615394435c97b9b45c99764ca84995d246096e3e5c2b564ed29e194652c8e221a80cf6abdc165cb3009fd20af586b0432b2bc9'
|
||||
'a92af974cb62901aab5a5c8c34672e9a7c90ea7246bbd7423421a9b7ee12a7b17073d90a6f36f994328c7dc9c2d0a6e4fd18c980a71863bc530d873ebaa80433'
|
||||
'ca9f407d87d8dd0181077bc2da5a8e2f8995eed88a4787b73ee6c62ef6d2380fd1394fe5412cdc34276d4182bce6f272173e9ccb653d1e28978e16f379114002'
|
||||
'6d7ab93042a75f04e1c3c8f294d19dd39abaf22aa75caf996c6a0cf753f6472134a3d4fa443b73924800b2d3a710416a931745c168911c0df3709fb71ec00570')
|
||||
'6d7ab93042a75f04e1c3c8f294d19dd39abaf22aa75caf996c6a0cf753f6472134a3d4fa443b73924800b2d3a710416a931745c168911c0df3709fb71ec00570'
|
||||
'92929ba1cb6ee104a10f34a649eba3789ca02f1725104a57412279ff68c46614b1812b13e7dcdf0d235618b9f2a868b4798b1404d9e712d9f1efd46e6c71fcb5')
|
||||
|
||||
prepare()
|
||||
{
|
||||
|
@ -58,6 +60,7 @@ prepare()
|
|||
patch -Np1 -i "$srcdir/0007-boost1.84.patch"
|
||||
patch -Np1 -i "$srcdir/0008-boost1.85.patch"
|
||||
patch -Np1 -i "$srcdir/0009-fix-multiple-choice.patch"
|
||||
patch -Np1 -i "$srcdir/0010-occtwrapper-install-dir.patch"
|
||||
}
|
||||
|
||||
build()
|
||||
|
|
Loading…
Add table
Reference in a new issue