From 8dbf2df5e0fccc15705dac09db677f9f0589ebf7 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Fri, 7 Apr 2023 17:34:57 +0200
Subject: [PATCH] jasper, cleanup (#8309)

---
 media-libs/jasper/jasper-2.0.16.recipe | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/media-libs/jasper/jasper-2.0.16.recipe b/media-libs/jasper/jasper-2.0.16.recipe
index edd35834b..d2060861d 100644
--- a/media-libs/jasper/jasper-2.0.16.recipe
+++ b/media-libs/jasper/jasper-2.0.16.recipe
@@ -6,7 +6,7 @@ the JasPer Software Reference Manual."
 HOMEPAGE="http://www.ece.uvic.ca/~frodo/jasper/"
 COPYRIGHT="1999-2007 Michael D. Adams"
 LICENSE="JasPer v2"
-REVISION="4"
+REVISION="5"
 SOURCE_URI="https://github.com/mdadams/jasper/archive/version-$portVersion.tar.gz"
 CHECKSUM_SHA256="f1d8b90f231184d99968f361884e2054a1714fdbbd9944ba1ae4ebdcc9bbfdb1"
 SOURCE_DIR="jasper-version-$portVersion"
@@ -14,9 +14,12 @@ SOURCE_DIR="jasper-version-$portVersion"
 ARCHITECTURES="all"
 SECONDARY_ARCHITECTURES="x86"
 
+libVersion="4.0.0"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	jasper$secondaryArchSuffix = $portVersion
-	lib:libjasper$secondaryArchSuffix = 4.0.0 compat >= 4
+	lib:libjasper$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -25,7 +28,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	jasper${secondaryArchSuffix}_devel = $portVersion
-	devel:libjasper$secondaryArchSuffix = 4.0.0 compat >= 4
+	devel:libjasper$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	jasper$secondaryArchSuffix == $portVersion base
@@ -65,20 +68,19 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	mkdir -p build-jasper && cd build-jasper
-	cmake .. $cmakeDirArgs \
+	cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
+		$cmakeDirArgs \
 		-DJAS_ENABLE_AUTOMATIC_DEPENDENCIES=OFF \
-    		-DCMAKE_SKIP_RPATH=ON \
-    		-DJAS_ENABLE_OPENGL=ON
-	make
+    	-DCMAKE_SKIP_RPATH=ON \
+    	-DJAS_ENABLE_OPENGL=ON
+	make -C build
 }
 
 INSTALL()
 {
-	cd build-jasper
-	make install
+	make -C build install
 
-	prepareInstalledDevelLibs libjasper
+	prepareInstalledDevelLib libjasper
 	fixPkgconfig
 
 	# devel package