diff options
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | PKGBUILD | 10 | ||||
| -rw-r--r-- | TreeSupport.cpp.patch | 16 |
3 files changed, 29 insertions, 7 deletions
@@ -1,6 +1,6 @@ pkgbase = bambustudio pkgdesc = PC Software for BambuLab's 3D printers - pkgver = 1.3.1.1 + pkgver = 01.04.00.17 pkgrel = 1 url = https://github.com/bambulab/BambuStudio arch = x86_64 @@ -24,13 +24,15 @@ pkgbase = bambustudio depends = harmonyos-sans-git provides = BambuStudio conflicts = BambuStudio - source = https://github.com/bambulab/BambuStudio/archive/refs/tags/v1.3.1.1.tar.gz + source = https://github.com/bambulab/BambuStudio/archive/refs/tags/v01.04.00.17.tar.gz source = BambuStudio.cpp.patch + source = TreeSupport.cpp.patch source = CMakeLists.txt.patch source = bambu-studio.sh - sha512sums = fba5296d637621e3488f3839367c2c251015c0ebbd11a19f088123c0368be92c4b548852567904411dff320dec97a960714bb279621712a33aa0852c8140a704 + sha512sums = f4ef1212163e11373eca317eafafcc324a5fdb41a8cba3da17fb166bbea1a27a55a8aa1f3810648131c1235b681f8b1e8c8cf784bccf144620a67fe467f77689 sha512sums = 419e7ffb8044531a1c78cd191a96c11f719b439afce674f7e31d1d2e0dc57ecc03cea27ab4ad5ee6522606630fd59ac1745b9a1b787db14893561a4495806117 - sha512sums = d9161e40ceee4d9600ed5c1b76db0080b5e70425877adcf13603f7bcdea17f2149d9444b458e023db93f758d078b47cca91af6878d104c690ffe389ec01e84a7 + sha512sums = 674fc00a73b2e5997e5f3dcf74299a2ab5dfac5114247f8b6b0c87bf14f289413ec668a39063ef10a557cc2c45ca08e52a7b1714a1f9f69763edf3a7faa1d01c + sha512sums = 8682e3b11271ae09587298f4737b987a589db05e049c3f4699951d710c6263e6016ee2287b050143336b9b24d70d206a1d7c5396bf74a5ccf092af6e1491ff54 sha512sums = e3cb1b072754ae6443fa136fffa263761b5e4e3da5dca1e91b7c4d577daaf01afa0affde04f1355fc404fcd336852db4ce8dc57938833f864346a0b17c12d6d6 pkgname = bambustudio @@ -1,7 +1,7 @@ # Maintainer: Alexander Jacocks <alexander@redhat.com> pkgname="bambustudio" -pkgver=1.3.1.1 +pkgver=01.04.00.17 pkgrel=1 pkgdesc="PC Software for BambuLab's 3D printers" arch=('x86_64') @@ -14,12 +14,14 @@ conflicts=("BambuStudio") source=( "https://github.com/bambulab/BambuStudio/archive/refs/tags/v${pkgver}.tar.gz" 'BambuStudio.cpp.patch' + 'TreeSupport.cpp.patch' 'CMakeLists.txt.patch' 'bambu-studio.sh' ) -sha512sums=('fba5296d637621e3488f3839367c2c251015c0ebbd11a19f088123c0368be92c4b548852567904411dff320dec97a960714bb279621712a33aa0852c8140a704' +sha512sums=('f4ef1212163e11373eca317eafafcc324a5fdb41a8cba3da17fb166bbea1a27a55a8aa1f3810648131c1235b681f8b1e8c8cf784bccf144620a67fe467f77689' '419e7ffb8044531a1c78cd191a96c11f719b439afce674f7e31d1d2e0dc57ecc03cea27ab4ad5ee6522606630fd59ac1745b9a1b787db14893561a4495806117' - 'd9161e40ceee4d9600ed5c1b76db0080b5e70425877adcf13603f7bcdea17f2149d9444b458e023db93f758d078b47cca91af6878d104c690ffe389ec01e84a7' + '674fc00a73b2e5997e5f3dcf74299a2ab5dfac5114247f8b6b0c87bf14f289413ec668a39063ef10a557cc2c45ca08e52a7b1714a1f9f69763edf3a7faa1d01c' + '8682e3b11271ae09587298f4737b987a589db05e049c3f4699951d710c6263e6016ee2287b050143336b9b24d70d206a1d7c5396bf74a5ccf092af6e1491ff54' 'e3cb1b072754ae6443fa136fffa263761b5e4e3da5dca1e91b7c4d577daaf01afa0affde04f1355fc404fcd336852db4ce8dc57938833f864346a0b17c12d6d6') prepare() { @@ -27,6 +29,8 @@ prepare() { ln -sf BambuStudio-${pkgver} BambuStudio # fix broken udev install reference patch -p0 < "$srcdir/CMakeLists.txt.patch" + # remove invalid UTF-8 chars + patch -p0 < "$srcdir/TreeSupport.cpp.patch" } build() { diff --git a/TreeSupport.cpp.patch b/TreeSupport.cpp.patch new file mode 100644 index 000000000000..5951fbc990c1 --- /dev/null +++ b/TreeSupport.cpp.patch @@ -0,0 +1,16 @@ +--- BambuStudio/src/libslic3r/TreeSupport.cpp.orig 2022-12-15 10:33:19.000000000 -0500 ++++ BambuStudio/src/libslic3r/TreeSupport.cpp 2022-12-16 16:16:11.261961293 -0500 +@@ -2057,10 +2057,10 @@ + + const Node& node = *p_node; + ExPolygon area; +- // 直接从overhang多边形生成，如果? ++ // 直接从overhang多边形生成，如果? + // 1) 是混合支撑里的普通部分， +- // 2) 启用了顶部接触层? +- // 3) 是顶部空? ++ // 2) 启用了顶部接触层? ++ // 3) 是顶部空? + if (node.type == ePolygon || (top_interface_layers>0 &&node.support_roof_layers_below > 0) || node.distance_to_top<0) { + if (node.overhang->contour.size() > 100 || node.overhang->holes.size()>1) + area = *node.overhang; |