aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorshizhiex2023-03-30 02:50:05 +0800
committershizhiex2023-03-30 02:50:05 +0800
commit222745dcf24868db00f7171d1708b14b17840943 (patch)
treea7f8443522947b72d3052be4851c4a5ee96abaa4
parent201fbd7d0469f7f67d65ba6b6935af8e118db9c4 (diff)
downloadaur-222745dcf24868db00f7171d1708b14b17840943.tar.gz
patch TIFF.cmake
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD6
-rw-r--r--TIFF.cmake.patch11
3 files changed, 19 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 90077c275236..89a53d2287e2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = orca-slicer
pkgdesc = Orca Slicer is a fork of Bambu Studio. It was previously known as BambuStudio-SoftFever
pkgver = 1.5.0
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/SoftFever/OrcaSlicer
arch = x86_64
license = AGPLv3
@@ -29,10 +29,12 @@ pkgbase = orca-slicer
source = CMakeLists.txt.patch
source = OrcaSlicer.desktop.patch
source = orca-slicer.sh
+ source = TIFF.cmake.patch
sha256sums = c0a91e3b99a63234aaad72a534720f6a7976374a925b04937dc6f6d5b41fdcb7
sha256sums = bb2662d0a4c58c43726ec98ef4acf201fcf98719c9bbfd207e2d6cdf695a2093
sha256sums = f2b56d64bc5d80cf726ab0a4931ecf84cdaa938bb6da6134d36e6a05d3a0eee4
sha256sums = 030d32a60c7bbecacaf1f3844ed6157c1eb1d67b7009a8132e91b0a07deb77c0
sha256sums = 30d860958f3fd5fc657daa6addce45e91689d9833b931c9feb646da760d61de8
+ sha256sums = 0ad3d60c5fee231cc94707d23de0b96355afbc2b3a2097ad7f63bfdcdd1c4399
pkgname = orca-slicer
diff --git a/PKGBUILD b/PKGBUILD
index c216136586b5..1e75c30b068b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname="orca-slicer"
pkgver=1.5.0
-pkgrel=1
+pkgrel=2
pkgdesc="Orca Slicer is a fork of Bambu Studio. It was previously known as BambuStudio-SoftFever"
arch=('x86_64')
url="https://github.com/SoftFever/OrcaSlicer"
@@ -17,12 +17,14 @@ source=(
'CMakeLists.txt.patch'
'OrcaSlicer.desktop.patch'
'orca-slicer.sh'
+ 'TIFF.cmake.patch'
)
sha256sums=('c0a91e3b99a63234aaad72a534720f6a7976374a925b04937dc6f6d5b41fdcb7'
'bb2662d0a4c58c43726ec98ef4acf201fcf98719c9bbfd207e2d6cdf695a2093'
'f2b56d64bc5d80cf726ab0a4931ecf84cdaa938bb6da6134d36e6a05d3a0eee4'
'030d32a60c7bbecacaf1f3844ed6157c1eb1d67b7009a8132e91b0a07deb77c0'
'30d860958f3fd5fc657daa6addce45e91689d9833b931c9feb646da760d61de8'
+ '0ad3d60c5fee231cc94707d23de0b96355afbc2b3a2097ad7f63bfdcdd1c4399'
)
prepare() {
@@ -34,6 +36,8 @@ prepare() {
cp 0001-Boost-fix.patch OrcaSlicer/deps/Boost
# icons conflict with BambuStudio
patch -p0 < "$srcdir/OrcaSlicer.desktop.patch"
+ # libtiff chhecksum mismatch
+ patch -p0 < "$srcdir/TIFF.cmake.patch"
}
build() {
diff --git a/TIFF.cmake.patch b/TIFF.cmake.patch
new file mode 100644
index 000000000000..d8dac242544e
--- /dev/null
+++ b/TIFF.cmake.patch
@@ -0,0 +1,11 @@
+--- OrcaSlicer/deps/TIFF/TIFF.cmake.orig 2023-03-30 02:45:39.957686074 +0800
++++ OrcaSlicer/deps/TIFF/TIFF.cmake 2023-03-17 22:30:57.000000000 +0800
+@@ -16,7 +16,7 @@
+ else()
+ bambustudio_add_cmake_project(TIFF
+ URL https://gitlab.com/libtiff/libtiff/-/archive/v4.1.0/libtiff-v4.1.0.zip
+- URL_HASH SHA256=1c100e5a6a25f43961321adb4a1891fc33758556654a7f2f5901d8b587770357
++ URL_HASH SHA256=c56edfacef0a60c0de3e6489194fcb2f24c03dbb550a8a7de5938642d045bd32
+ DEPENDS ${ZLIB_PKG} ${PNG_PKG} dep_JPEG
+ CMAKE_ARGS
+ -Dlzma:BOOL=OFF