From 2432a88374f5883238299a85da3e4332ec4ee6d9 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Wed, 19 Apr 2023 08:40:56 +0200
Subject: [PATCH] openjpeg, build fix, cleanup (#8435)

---
 media-libs/openjpeg/openjpeg-2.1.2.recipe | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/media-libs/openjpeg/openjpeg-2.1.2.recipe b/media-libs/openjpeg/openjpeg-2.1.2.recipe
index 0b8cf71fc..e877c7c29 100644
--- a/media-libs/openjpeg/openjpeg-2.1.2.recipe
+++ b/media-libs/openjpeg/openjpeg-2.1.2.recipe
@@ -17,7 +17,7 @@ Universite catholique de Louvain (UCL), Belgium
  	2002-2003 Yannick Verschueren
 	2001-2003 David Janssens"
 LICENSE="BSD (2-clause)"
-REVISION="3"
+REVISION="4"
 SOURCE_URI="http://github.com/uclouvain/openjpeg/archive/v$portVersion.tar.gz"
 CHECKSUM_SHA256="4ce77b6ef538ef090d9bde1d5eeff8b3069ab56c4906f083475517c2c023dfa7"
 SOURCE_FILENAME="openjpeg-$portVersion.tar.gz"
@@ -26,12 +26,15 @@ PATCHES="openjpeg-$portVersion.patchset"
 ARCHITECTURES="all"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
+libVersion="7.0.2"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	openjpeg$secondaryArchSuffix = $portVersion
 	cmd:opj_compress$secondaryArchSuffix = $portVersion
 	cmd:opj_decompress$secondaryArchSuffix = $portVersion
 	cmd:opj_dump$secondaryArchSuffix = $portVersion
-	lib:libopenjp2$secondaryArchSuffix = 7.0.2 compat >= 7
+	lib:libopenjp2$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -47,7 +50,7 @@ fi
 
 PROVIDES_devel="
 	openjpeg${secondaryArchSuffix}_devel = $portVersion
-	devel:libopenjp2$secondaryArchSuffix = 7.0.2 compat >= 7
+	devel:libopenjp2$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	openjpeg$secondaryArchSuffix == $portVersion
@@ -72,23 +75,20 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	mkdir -p build
-	cd build
-	cmake .. -DCMAKE_INSTALL_PREFIX=$prefix \
+	cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_PREFIX=$prefix \
 		-DOPENJPEG_INSTALL_BIN_DIR=$relativeBinDir \
 		-DOPENJPEG_INSTALL_LIB_DIR=$relativeLibDir \
 		-DOPENJPEG_INSTALL_INCLUDE_DIR=$relativeIncludeDir \
 		-DOPENJPEG_INSTALL_MAN_DIR=$relativeManDir
-	make $jobArgs
+	make -C build $jobArgs
 }
 
 INSTALL()
 {
-	cd build
-	make install
+	make -C build install
 
 	prepareInstalledDevelLib libopenjp2
-
 	fixPkgconfig
 
 	packageEntries devel $developDir