testing/qhull: upgrade to 2020.1

* install licence file
* make APKBUILD the same as cmake template

1 files changed, 19 insertions, 11 deletions

diff --git a/testing/qhull/APKBUILD b/testing/qhull/APKBUILD
index eac7832b21..4e0750ef7b 100644
--- a/testing/qhull/APKBUILD
+++ b/testing/qhull/APKBUILD
@@ -1,8 +1,7 @@
 # Contributor: Holger Jaekel <holger.jaekel@gmx.de>
 # Maintainer: Holger Jaekel <holger.jaekel@gmx.de>
 pkgname=qhull
-pkgver=2019.1
-_tarver=7.3.2
+pkgver=2020.1
 pkgrel=0
 pkgdesc="Calculate convex hulls and related structures"
 url="https://www.qhull.org/"
@@ -14,23 +13,32 @@ subpackages="
         $pkgname-dev
         $pkgname-doc
         "
-source="http://www.qhull.org/download/qhull-${pkgver%.*}-src-$_tarver.tgz"
-builddir="$srcdir/$pkgname-$pkgver/build"
+source="qhull-$pkgver.tar.gz::https://github.com/qhull/qhull/archive/$pkgver.tar.gz"
 
 build() {
-        cmake .. \
-                -DCMAKE_BUILD_TYPE=None \
+        if [ "$CBUILD" != "$CHOST" ]; then
+                CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+        fi
+        cmake -B build \
                 -DCMAKE_INSTALL_PREFIX=/usr \
-                -DCMAKE_SKIP_INSTALL_RPATH=YES
-        make
+                -DCMAKE_INSTALL_LIBDIR=lib \
+                -DBUILD_SHARED_LIBS=True \
+                -DCMAKE_BUILD_TYPE=None \
+                -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+                -DCMAKE_C_FLAGS="$CFLAGS" \
+                -DCMAKE_SKIP_INSTALL_RPATH=YES \
+                $CMAKE_CROSSOPTS
+        make -C build
 }
 
 check() {
-        ctest
+        cd build && ctest
 }
 
 package() {
-        make DESTDIR="$pkgdir" install
+        make -C build DESTDIR="$pkgdir" install
+
+        install -Dm644 $builddir/COPYING.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }
 
-sha512sums="efcaf2af45f3c401f5f677cac8e3ffc056f870bf62f852982ca880282c428920fad13071017b8d8b7b6fc416380c6f3fe6973aa0b37a2322c234774325b14f1c  qhull-2019-src-7.3.2.tgz"
+sha512sums="aa9d97564290718a0983d252dd88193533264c97987942848d5b78d0dec33e27c71a7e909f520955368f8be2799a00844ffb47c49717aee072b949aace0f37da  qhull-2020.1.tar.gz"