-
-
Save jurriaan/a2ca25f1bca0250c9b1181ffcf75bb6e to your computer and use it in GitHub Desktop.
Makes prusa-slicer-git AUR build on my system.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/PKGBUILD b/PKGBUILD | |
index 81bef7d..eae07d8 100644 | |
--- a/PKGBUILD | |
+++ b/PKGBUILD | |
@@ -3,8 +3,8 @@ | |
_pkgname=prusa-slicer | |
pkgname=${_pkgname}-git | |
-pkgver=2.4.0.beta1.r76.g7520e2f19 | |
-pkgrel=2 | |
+pkgver=2.4.0.beta1.r65.gaff9e1f7e | |
+pkgrel=1 | |
pkgdesc='G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)' | |
arch=('i686' 'x86_64' 'armv6' 'armv6h' 'armv7h') | |
url='https://github.com/prusa3d/PrusaSlicer' | |
@@ -37,7 +37,7 @@ source=( | |
sha256sums=( | |
'SKIP' | |
'26b66701cb2512f0d524add44689e2478c0b875f73103034e74544a9574782c5' | |
- '1ef7c22f641b7c18de212202c21f14f6533834a36d7fe0c2b322bc9a13804c6b' | |
+ '7dff171650db39e85de984fdcfcb9789bb127c4118ef64ed223b6289920b7dc1' | |
'58cae07a418a797222f4cb10950fa2fd7afb7570519785b082cc7d7e7f407c02' | |
) | |
conflicts=('prusa-slicer') | |
diff --git a/prusa-slicer-openexr3.patch b/prusa-slicer-openexr3.patch | |
index 772c77b..8ae71c1 100644 | |
--- a/prusa-slicer-openexr3.patch | |
+++ b/prusa-slicer-openexr3.patch | |
@@ -1,12 +1,12 @@ | |
diff --git a/cmake/modules/FindOpenVDB.cmake b/cmake/modules/FindOpenVDB.cmake | |
-index 02420fed8..4b93111ab 100644 | |
+index 4fde5fa4a..566e73a5e 100644 | |
--- a/cmake/modules/FindOpenVDB.cmake | |
+++ b/cmake/modules/FindOpenVDB.cmake | |
-@@ -326,28 +326,10 @@ macro(just_fail msg) | |
+@@ -347,28 +347,10 @@ macro(just_fail msg) | |
return() | |
endmacro() | |
--find_package(IlmBase QUIET COMPONENTS Half) | |
+-find_package(IlmBase QUIET) | |
-if(NOT IlmBase_FOUND) | |
- pkg_check_modules(IlmBase QUIET IlmBase) | |
-endif() | |
@@ -32,7 +32,7 @@ index 02420fed8..4b93111ab 100644 | |
# Use GetPrerequisites to see which libraries this OpenVDB lib has linked to | |
# which we can query for optional deps. This basically runs ldd/otoll/objdump | |
-@@ -398,7 +380,7 @@ foreach(PREREQUISITE ${_OPENVDB_PREREQUISITE_LIST}) | |
+@@ -419,7 +401,7 @@ foreach(PREREQUISITE ${_OPENVDB_PREREQUISITE_LIST}) | |
set(OpenVDB_USES_LOG4CPLUS ON) | |
endif() | |
@@ -41,7 +41,7 @@ index 02420fed8..4b93111ab 100644 | |
if(NOT ${_HAS_DEP} EQUAL -1) | |
set(OpenVDB_USES_ILM ON) | |
endif() | |
-@@ -429,11 +411,7 @@ if(OpenVDB_USES_LOG4CPLUS) | |
+@@ -450,11 +432,7 @@ if(OpenVDB_USES_LOG4CPLUS) | |
find_package(Log4cplus ${_quiet} ${_required}) | |
endif() | |
@@ -54,7 +54,7 @@ index 02420fed8..4b93111ab 100644 | |
find_package(OpenEXR ${_quiet} ${_required}) | |
endif() | |
-@@ -450,7 +428,7 @@ endif() | |
+@@ -471,7 +449,7 @@ endif() | |
set(_OPENVDB_VISIBLE_DEPENDENCIES | |
Boost::iostreams | |
Boost::system | |
@@ -63,7 +63,7 @@ index 02420fed8..4b93111ab 100644 | |
) | |
set(_OPENVDB_DEFINITIONS) | |
-@@ -460,10 +438,7 @@ endif() | |
+@@ -481,10 +459,7 @@ endif() | |
if(OpenVDB_USES_EXR) | |
list(APPEND _OPENVDB_VISIBLE_DEPENDENCIES |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment