kvazaar, bump to version 2.3.1 (#12117)

needed for new crypto++

media-libs/kvazaar/kvazaar-2.3.1.recipe

@@ -5,13 +5,13 @@ COPYRIGHT="2021 Tampere University, ITU/ISO/IEC, project contributors"
 LICENSE="BSD (3-clause)"
 REVISION="1"
 SOURCE_URI="https://github.com/ultravideo/kvazaar/releases/download/v$portVersion/kvazaar-$portVersion.tar.xz"
-CHECKSUM_SHA256="f8fb72184f10b2fac295452bd0d5936d4449ed849754d5d1f3e7035998983573"
-SOURCE_URI_2="https://vcgit.hhi.fraunhofer.de/jct-vc/HM/-/archive/HM-16.24/HM-HM-16.24.tar.bz2"
-CHECKSUM_SHA256_2="560e750cefe2ad0edae0687735ae3a4d8f34d033809775af70efdbfcf85fcba2"
-SOURCE_DIR_2="HM-HM-16.24"
+CHECKSUM_SHA256="ca30575026d2f1a1201af4b94697bb0fcd05913388008631dc3332bae94122bd"
+SOURCE_URI_2="https://vcgit.hhi.fraunhofer.de/jct-vc/HM/-/archive/HM-18.0/HM-HM-18.0.tar.bz2"
+CHECKSUM_SHA256_2="799d5f937cb1df3a3294fe8c04e0628fc7208a636d1afea3b6bb05a9af46a83a"
+SOURCE_DIR_2="HM-HM-18.0"
 PATCHES_2="kvazaar-$portVersion-source2.patchset"
 
-ARCHITECTURES="all !x86_gcc2 ?x86"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="?x86"
 
 commandBinDir=$binDir
@@ -21,12 +21,11 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then
 	commandBinDir=$prefix/bin
 fi
 
-libVersion="7.2.0"
+libVersion="7.4.0"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="
 	kvazaar$secondaryArchSuffix = $portVersion
-	cmd:kvazaar
 	lib:libkvazaar$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
@@ -42,6 +41,15 @@ REQUIRES_devel="
 	kvazaar$secondaryArchSuffix == $portVersion base
 	"
 
+PROVIDES_tools="
+	kvazaar${secondaryArchSuffix}_tools = $portVersion
+	cmd:kvazaar$commandSuffix = $portVersion
+	"
+REQUIRES_tools="
+	kvazaar$secondaryArchSuffix == $portVersion base
+	$REQUIRES
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libcryptopp$secondaryArchSuffix
@@ -56,12 +64,12 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:yasm
 	"
+
 TEST_REQUIRES="
 	cmd:cmake
 	cmd:ffmpeg
 	"
 
-
 defineDebugInfoPackage kvazaar$secondaryArchSuffix \
 	"$libDir"/libkvazaar.so.$libVersion
 
@@ -71,7 +79,8 @@ BUILD()
 	export CPPFLAGS=-DPIC
 	ACLOCAL=: AUTOCONF=: AUTOMAKE=: AUTOHEADER=: \
 		runConfigure --omit-dirs binDir ../configure --bindir="$commandBinDir" \
-		--with-cryptopp
+		--with-cryptopp \
+		--disable-static
 	make $jobArgs
 }
 
@@ -79,21 +88,30 @@ INSTALL()
 {
 	make -C build install
 
-	rm -f $libDir/lib*.la $libDir/lib*.a
-	prepareInstalledDevelLibs libkvazaar
+	# remove libtool file
+	rm -f $libDir/lib*.la
+
+	prepareInstalledDevelLib \
+		libkvazaar
 	fixPkgconfig
-	packageEntries devel $developDir
+
+	packageEntries devel \
+		$developDir
+
+	packageEntries tools \
+		$commandBinDir \
+		$manDir
 }
 
 TEST()
 {
 	cd $sourceDir2
-	cmake -B build -S . -DCMAKE_BUILD_TYPE=Release
+	cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo
 	make -C build VERBOSE=1 $jobArgs
 
-	PATH=$PATH:$sourceDir2/bin/umake/gcc-13.2/x86_64/release/
-	ln -srf	$sourceDir2/bin/umake/gcc-13.2/x86_64/release/TAppDecoder \
-		 $sourceDir2/bin/umake/gcc-13.2/x86_64/release/TAppDecoderStatic
+	PATH=$PATH:$sourceDir2/bin/umake/gcc-13.3/x86_64/relwithdebinfo/
+	ln -srf	$sourceDir2/bin/umake/gcc-13.3/x86_64/relwithdebinfo/TAppDecoder \
+		 $sourceDir2/bin/umake/gcc-13.3/x86_64/relwithdebinfo/TAppDecoderStatic
 	cd $sourceDir
 	make -C build check
 }

media-libs/kvazaar/patches/kvazaar-2.3.1-source2.patchset

@@ -1,11 +1,11 @@
-From 4c12c1501fd0192fdd494f391b3394be0b8c3809 Mon Sep 17 00:00:00 2001
+From e7ad320bf89fff01b8cfd3b6b24fcc78cecb9d58 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Sat, 11 Dec 2021 12:16:32 +0100
 Subject: fix build
 
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 79bf8b6..09e1e4a 100644
+index 0e52aa4..61e78fc 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -41,7 +41,7 @@ set( CMAKE_CXX_STANDARD 11 )
@@ -27,5 +27,5 @@ index 79bf8b6..09e1e4a 100644
  if( XCODE )
    bb_enable_warnings( clang warnings-as-errors
 -- 
-2.30.2
+2.48.1