diff options
| author | Félix Piédallu | 2021-07-13 14:09:39 +0200 |
|---|---|---|
| committer | Félix Piédallu | 2021-07-13 15:25:11 +0200 |
| commit | 1b439c0735f9c91640cc331aefe76d32c1c58a90 (patch) | |
| tree | 4268cb423c7a2d3544e0060209ff20d675a8a68c | |
| parent | 091295195f1d3414687394d07573e060da0a78be (diff) | |
| download | aur-1b439c0735f9c91640cc331aefe76d32c1c58a90.tar.gz | |
Remove qhull patch, Add openexr3 patch
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | PKGBUILD | 12 | ||||
| -rw-r--r-- | qhull.patch | 13 |
3 files changed, 11 insertions, 24 deletions
@@ -1,7 +1,7 @@ pkgbase = prusa-slicer-git pkgdesc = G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.) - pkgver = 2.3.0.r24.gd06aa6069 - pkgrel = 2 + pkgver = 2.4.0.alpha0.r725.g47f265f77 + pkgrel = 1 url = https://github.com/prusa3d/PrusaSlicer arch = i686 arch = x86_64 @@ -23,13 +23,13 @@ pkgbase = prusa-slicer-git depends = nlopt depends = openvdb depends = wxgtk3 + depends = qhull>=2020.2-4 conflicts = prusa-slicer source = git+https://github.com/prusa3d/PrusaSlicer source = prusa-slicer.desktop - source = qhull.patch + source = https://raw.githubusercontent.com/archlinux/svntogit-community/1dea61c0b581ff5001d073689f68b0323740be93/trunk/prusa-slicer-openexr3.patch sha256sums = SKIP sha256sums = 26b66701cb2512f0d524add44689e2478c0b875f73103034e74544a9574782c5 - sha256sums = 877a4de66a714e4fae22e507dba8ddf117e6310165128fb0d46dc239a4e1aeb5 + sha256sums = 1ef7c22f641b7c18de212202c21f14f6533834a36d7fe0c2b322bc9a13804c6b pkgname = prusa-slicer-git - @@ -3,8 +3,8 @@ _pkgname=prusa-slicer pkgname=${_pkgname}-git -pkgver=2.3.0.r24.gd06aa6069 -pkgrel=2 +pkgver=2.4.0.alpha0.r725.g47f265f77 +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' @@ -18,7 +18,7 @@ depends=( 'nlopt' 'openvdb' 'wxgtk3' - # 'qhull' + 'qhull>=2020.2-4' ) makedepends=( 'cmake' @@ -31,12 +31,12 @@ makedepends=( source=( "git+${url}" 'prusa-slicer.desktop' - 'qhull.patch' + 'https://raw.githubusercontent.com/archlinux/svntogit-community/1dea61c0b581ff5001d073689f68b0323740be93/trunk/prusa-slicer-openexr3.patch' ) sha256sums=( 'SKIP' '26b66701cb2512f0d524add44689e2478c0b875f73103034e74544a9574782c5' - '877a4de66a714e4fae22e507dba8ddf117e6310165128fb0d46dc239a4e1aeb5' + '1ef7c22f641b7c18de212202c21f14f6533834a36d7fe0c2b322bc9a13804c6b' ) conflicts=('prusa-slicer') @@ -47,7 +47,7 @@ pkgver() { prepare() { cd "PrusaSlicer" - patch --forward --strip=1 --input="${srcdir}/qhull.patch" + patch -p1 < "$srcdir/prusa-slicer-openexr3.patch" # Fix build with openEXR 3 } build() { diff --git a/qhull.patch b/qhull.patch deleted file mode 100644 index 89382c3fbeae..000000000000 --- a/qhull.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/qhull/CMakeLists.txt b/src/qhull/CMakeLists.txt -index ab9aba9af..1db993dcd 100644 ---- a/src/qhull/CMakeLists.txt -+++ b/src/qhull/CMakeLists.txt -@@ -10,7 +10,7 @@ - - # see bug report: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=925540 - --find_package(Qhull 7.2 QUIET) -+# find_package(Qhull 7.2 QUIET) - - add_library(qhull INTERFACE) - |