Fix dependencies, refactor pkgbuild

2 files changed, 59 insertions, 47 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6f0accef3296..387834ffa519 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = prusa-slicer-git
 	pkgdesc = G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)
-	pkgver = 2.0.0.r336.gf617d7472
+	pkgver = 2.1.1
 	pkgrel = 1
 	url = https://github.com/prusa3d/PrusaSlicer
 	arch = i686
@@ -9,22 +9,21 @@ pkgbase = prusa-slicer-git
 	arch = armv6h
 	arch = armv7h
 	license = AGPL3
-	makedepends = boost
 	makedepends = cmake
+	makedepends = boost
+	makedepends = cereal
+	makedepends = eigen3
 	makedepends = gtest
 	depends = boost-libs
+	depends = cgal
 	depends = curl
 	depends = glew
 	depends = intel-tbb
 	depends = nlopt
-	depends = wxgtk2
-	conflicts = slic3r-prusa3d-git
-	conflicts = slic3r-prusa3d
-	conflicts = slic3r
+	depends = wxgtk3
+	depends = qhull
 	conflicts = prusa-slicer
-	replaces = slic3r-prusa3d-git
-	replaces = prusaslicer-git
-	source = git+https://github.com/prusa3d/PrusaSlicer.git
+	source = git+https://github.com/prusa3d/PrusaSlicer
 	source = prusa-slicer.desktop
 	sha256sums = SKIP
 	sha256sums = 26b66701cb2512f0d524add44689e2478c0b875f73103034e74544a9574782c5
diff --git a/PKGBUILD b/PKGBUILD
index 680bbfa70d37..8c8178abad15 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,64 +3,77 @@
 _pkgname=prusa-slicer
 
 pkgname=${_pkgname}-git
-pkgver=2.0.0.r336.gf617d7472
+pkgver=2.1.1
 pkgrel=1
-pkgdesc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
+pkgdesc='G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)'
 arch=('i686' 'x86_64' 'armv6' 'armv6h' 'armv7h')
-url="https://github.com/prusa3d/PrusaSlicer"
+url='https://github.com/prusa3d/PrusaSlicer'
 license=('AGPL3')
-depends=('boost-libs' 'curl' 'glew' 'intel-tbb' 'nlopt' 'wxgtk2')
-makedepends=('boost' 'cmake' 'gtest')
+depends=(
+    'boost-libs'
+    'cgal'
+    'curl'
+    'glew'
+    'intel-tbb'
+    'nlopt'
+    'wxgtk3'
+    'qhull'
+)
+makedepends=(
+    'cmake'
+    'boost'
+    'cereal'
+    'eigen3'
+    'gtest'
+)
 source=(
-  "git+https://github.com/prusa3d/PrusaSlicer.git"
-  'prusa-slicer.desktop'
+    "git+${url}"
+    'prusa-slicer.desktop'
 )
 sha256sums=(
-  'SKIP'
-  '26b66701cb2512f0d524add44689e2478c0b875f73103034e74544a9574782c5'
+    'SKIP'
+    '26b66701cb2512f0d524add44689e2478c0b875f73103034e74544a9574782c5'
 )
-
-conflicts=('slic3r-prusa3d-git' 'slic3r-prusa3d' 'slic3r' 'prusa-slicer')
-replaces=( 'slic3r-prusa3d-git' 'prusaslicer-git')
+conflicts=('prusa-slicer')
 
 pkgver() {
-  cd "${srcdir}/PrusaSlicer"
-  git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^version_//'
+    cd "${srcdir}/PrusaSlicer"
+    git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^version_//'
 }
 
 build() {
-  cd "${srcdir}/PrusaSlicer"
-  mkdir -p build
+    cd "${srcdir}/PrusaSlicer"
+    mkdir -p build
 
-  cd build
-  cmake ..\
-    -DSLIC3R_STATIC=0 \
-    -DSLIC3R_FHS=1 \
-    -DSLIC3R_WX_STABLE=1 \
-    -DSLIC3R_GTK=3 \
-    -DSLIC3R_PCH=0 \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib
+    cd build
+    cmake .. \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_INSTALL_LIBDIR=lib \
+        -DSLIC3R_FHS=ON \
+        -DSLIC3R_PCH=OFF \
+        -DSLIC3R_WX_STABLE=ON \
+        -DSLIC3R_GTK=3 \
+        -DSLIC3R_STATIC=OFF \
 
-  make
+    make
 }
 
 check() {
-  cd "${srcdir}/PrusaSlicer/build"
-  ctest -V
+    cd "${srcdir}/PrusaSlicer/build"
+    ctest -V
 }
 
 package () {
-  cd "${srcdir}/PrusaSlicer/build"
-  make DESTDIR="${pkgdir}" install
+    cd "${srcdir}/PrusaSlicer/build"
+    make DESTDIR="${pkgdir}" install
 
-  # Desktop file
-  install -d "$pkgdir/usr/share/applications"
-  install -m 644 "${srcdir}/prusa-slicer.desktop" "${pkgdir}/usr/share/applications"
+    # Desktop file
+    install -Dm644 "${srcdir}/prusa-slicer.desktop" -t "${pkgdir}/usr/share/applications"
 
-  # Desktop icon
-  install -d "${pkgdir}/usr/share/icons/hicolor/"{32x32,128x128,192x192}"/apps/"
-  ln -s "/usr/share/PrusaSlicer/icons/PrusaSlicer_32px.png"  "${pkgdir}/usr/share/icons/hicolor/32x32/apps/${_pkgname}.png"
-  ln -s "/usr/share/PrusaSlicer/icons/PrusaSlicer_128px.png" "${pkgdir}/usr/share/icons/hicolor/128x128/apps/${_pkgname}.png"
-  ln -s "/usr/share/PrusaSlicer/icons/PrusaSlicer_192px.png" "${pkgdir}/usr/share/icons/hicolor/192x192/apps/${_pkgname}.png"
+    # Desktop icons
+    for i in '32' '128' '192' ; do
+        mkdir -p "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps/"
+        ln -s "/usr/share/PrusaSlicer/icons/PrusaSlicer_${i}px.png" \
+                 "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps/${_pkgname}.png"
+    done
 }