From 3f3e794d9a50de70f6a0eaa129e3aa6e854dcb96 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 4 Jan 2021 13:37:56 +0100
Subject: [PATCH] openjpeg: bump version

disable static lib
---
 ...{openjpeg-2.3.1.recipe => openjpeg-2.4.0.recipe} | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)
 rename media-libs/openjpeg/{openjpeg-2.3.1.recipe => openjpeg-2.4.0.recipe} (89%)

diff --git a/media-libs/openjpeg/openjpeg-2.3.1.recipe b/media-libs/openjpeg/openjpeg-2.4.0.recipe
similarity index 89%
rename from media-libs/openjpeg/openjpeg-2.3.1.recipe
rename to media-libs/openjpeg/openjpeg-2.4.0.recipe
index bb001f5ee..4df31e8c9 100644
--- a/media-libs/openjpeg/openjpeg-2.3.1.recipe
+++ b/media-libs/openjpeg/openjpeg-2.4.0.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="2"
+REVISION="1"
 SOURCE_URI="https://github.com/uclouvain/openjpeg/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="63f5a4713ecafc86de51bfad89cc07bb788e9bba24ebbf0c4ca637621aadb6a9"
+CHECKSUM_SHA256="8702ba68b442657f11aaeb2b338443ca8d5fb95b0d845757968a7be31ef7f16d"
 SOURCE_FILENAME="openjpeg-$portVersion.tar.gz"
 
 ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
@@ -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.3 compat >= 7
+	lib:libopenjp2$secondaryArchSuffix = 7.0.4 compat >= 7
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -44,7 +44,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	openjpeg${secondaryArchSuffix}_devel = $portVersion
-	devel:libopenjp2$secondaryArchSuffix = 7.0.3 compat >= 7
+	devel:libopenjp2$secondaryArchSuffix = 7.0.4 compat >= 7
 	"
 REQUIRES_devel="
 	openjpeg$secondaryArchSuffix == $portVersion
@@ -68,10 +68,13 @@ BUILD()
 	mkdir -p build
 	cd build
 	cmake .. -DCMAKE_INSTALL_PREFIX=$prefix \
+		-DCMAKE_BUILD_TYPE=Release \
 		-DOPENJPEG_INSTALL_BIN_DIR=$relativeBinDir \
 		-DOPENJPEG_INSTALL_LIB_DIR=$relativeDevelopLibDir \
 		-DOPENJPEG_INSTALL_INCLUDE_DIR=$relativeIncludeDir \
 		-DOPENJPEG_INSTALL_MAN_DIR=$relativeManDir \
+		-DBUILD_SHARED_LIBS=ON \
+		-DBUILD_STATIC_LIBS=OFF \
 		-DBUILD_TESTING:BOOL=ON
 	make $jobArgs
 }
@@ -88,7 +91,7 @@ INSTALL()
 	# 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.3/OpenJPEGTargets.cmake
+		$libDir/openjpeg-2.4/OpenJPEGTargets.cmake
 
 	prepareInstalledDevelLib libopenjp2