openjpeg: bump version

media-libs/openjpeg/openjpeg-2.5.2.recipe

@@ -19,9 +19,9 @@ Universite catholique de Louvain (UCL), Belgium
 	2011-2012, Centre National d'Etudes Spatiales (CNES), France
 	2012, CS Systemes d'Information, France"
 LICENSE="BSD (2-clause)"
-REVISION="3"
+REVISION="1"
 SOURCE_URI="https://github.com/uclouvain/openjpeg/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="8702ba68b442657f11aaeb2b338443ca8d5fb95b0d845757968a7be31ef7f16d"
+CHECKSUM_SHA256="90e3896fed910c376aaf79cdd98bdfdaf98c6472efd8e1debf0a854938cbda6a"
 SOURCE_FILENAME="openjpeg-$portVersion.tar.gz"
 
 ARCHITECTURES="all !x86_gcc2"
@@ -32,7 +32,7 @@ PROVIDES="
 	cmd:opj_compress$secondaryArchSuffix = $portVersion
 	cmd:opj_decompress$secondaryArchSuffix = $portVersion
 	cmd:opj_dump$secondaryArchSuffix = $portVersion
-	lib:libopenjp2$secondaryArchSuffix = 7.0.4 compat >= 7
+	lib:libopenjp2$secondaryArchSuffix = 7.5.2 compat >= 7
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -44,7 +44,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	openjpeg${secondaryArchSuffix}_devel = $portVersion
-	devel:libopenjp2$secondaryArchSuffix = 7.0.4 compat >= 7
+	devel:libopenjp2$secondaryArchSuffix = 7.5.2 compat >= 7
 	"
 REQUIRES_devel="
 	openjpeg$secondaryArchSuffix == $portVersion
@@ -66,38 +66,25 @@ BUILD_PREREQUIRES="
 BUILD()
 {
 	cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=$prefix \
-		-DOPENJPEG_INSTALL_BIN_DIR=$relativeBinDir \
-		-DOPENJPEG_INSTALL_LIB_DIR=$relativeDevelopLibDir \
-		-DOPENJPEG_INSTALL_INCLUDE_DIR=$relativeIncludeDir \
-		-DOPENJPEG_INSTALL_MAN_DIR=$relativeManDir \
+		$cmakeDirArgs \
 		-DBUILD_SHARED_LIBS=ON \
 		-DBUILD_STATIC_LIBS=OFF \
 		-DBUILD_TESTING:BOOL=ON
-	make -C build $jobArgs
+	cmake --build build $jobArgs
 }
 
 INSTALL()
 {
-	make -C build install
-
-	mkdir -p $(dirname $libDir)
-	mv $developLibDir $libDir
-
-	# CMake uses OPENJPEG_INSTALL_LIB_DIR to generate its config file
-	# the config file ends installed in $libDir instead of $developLibDir
-	# just remove a path level
-	sed -i '0,/get_filename_component(_IMPORT_PREFIX "\${_IMPORT_PREFIX}" PATH)/s///' \
-		$libDir/openjpeg-2.4/OpenJPEGTargets.cmake
+	cmake --install build
 
 	prepareInstalledDevelLib libopenjp2
 
 	fixPkgconfig
 
-	packageEntries devel $developDir $libDir/openjpeg-2.*
+	packageEntries devel $developDir $libDir/cmake
 }
 
 TEST()
 {
-	make -C build test
+	ctest --test-dir build --output-on-failure $jobArgs
 }