From 09427d6fc6905f67965861a01ed0e20f456aebc5 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Thu, 26 Dec 2019 22:15:15 -0600
Subject: user/jasper: modernise

---
 user/jasper/APKBUILD | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

(limited to 'user/jasper')

diff --git a/user/jasper/APKBUILD b/user/jasper/APKBUILD
index 321969aa3..006a2f7eb 100644
--- a/user/jasper/APKBUILD
+++ b/user/jasper/APKBUILD
@@ -5,8 +5,8 @@ pkgrel=0
 pkgdesc="Library implementing JPEG-2000"
 url="http://www.ece.uvic.ca/~mdadams/jasper/"
 arch="all"
-license="custom:JasPer2.0"
-depends=  #"libjpeg>=8 freeglut libxi libxmu mesa"
+license="JasPer-2.0"
+depends=""
 makedepends="libjpeg-turbo-dev cmake"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
 source="$pkgname-$pkgver.tar.gz::https://github.com/mdadams/jasper/archive/version-$pkgver.tar.gz"
@@ -17,26 +17,22 @@ builddir="$srcdir/$pkgname-version-$pkgver"
 #     - CVE-2017-1000050
 
 build() {
-	mkdir "$builddir"/obj
-	cd "$builddir"/obj
 	# default of 16 causes stack overflow
 	export CFLAGS="${CFLAGS} -DJPC_QMFB_COLGRPSIZE=6"
-	cmake ..  \
-		-DCMAKE_BUILD_TYPE=Release \
+	cmake \
+		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_INSTALL_LIBDIR=/usr/lib
-
-	make
+		-DCMAKE_INSTALL_LIBDIR=/usr/lib \
+		-Bbuild
+	make -C build
 }
 
 check() {
-	cd "$builddir"/obj
-	make test
+	make -C build test
 }
 
 package() {
-	cd "$builddir"/obj
-	make DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" -C build install
 }
 
 libs() {
-- 
cgit v1.2.3-60-g2f50