flif: bump version, cleanup (#8609)

media-libs/flif/flif-0.4.recipe

@@ -17,23 +17,28 @@ COPYRIGHT="2016 Jon Sneyers
 LICENSE="Apache v2
 	GNU GPL v3
 	GNU LGPL v3"
-REVISION="2"
+REVISION="1"
-srcGitRev="74ea92bf1ab2db18ae6d2a521dff946fcc679618"
+SOURCE_URI="https://github.com/FLIF-hub/FLIF/archive/refs/tags/v$portVersion.tar.gz"
-SOURCE_URI="https://github.com/FLIF-hub/FLIF/archive/$srcGitRev.tar.gz"
+CHECKSUM_SHA256="cc98313ef0dbfef65d72bc21f730edf2a97a414f14bd73ad424368ce032fdb7f"
-CHECKSUM_SHA256="aeeb4d24f19204f2b0cecc41ee1ebdda1c1ae730f0c6fa4969f67aab7e5eccac"
+SOURCE_DIR="FLIF-$portVersion"
-SOURCE_FILENAME="flif-$portVersion-$srcGitRev.tar.gz"
-SOURCE_DIR="FLIF-$srcGitRev"
 PATCHES="flif-$portVersion.patchset"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
+commandBinDir=$binDir
+commandSuffix=$secondaryArchSuffix
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
 PROVIDES="
 	flif$secondaryArchSuffix = $portVersion
-	cmd:apng2flif$secondaryArchSuffix = $portVersion
+	cmd:apng2flif$commandSuffix = $portVersion
-	cmd:dflif$secondaryArchSuffix = $portVersion
+	cmd:dflif$commandSuffix = $portVersion
-	cmd:flif$secondaryArchSuffix = $portVersion
+	cmd:flif$commandSuffix = $portVersion
-	cmd:gif2flif$secondaryArchSuffix = $portVersion
+	cmd:gif2flif$commandSuffix = $portVersion
 	lib:libflif$secondaryArchSuffix = 0
 	lib:libflif_dec$secondaryArchSuffix = 0
 	"
@@ -56,7 +61,7 @@ REQUIRES_devel="
 
 PROVIDES_tools="
 	flif${secondaryArchSuffix}_tools
-	cmd:viewflif$secondaryArchSuffix = $portVersion
+	cmd:viewflif$commandSuffix = $portVersion
 	"
 REQUIRES_tools="
 	flif$secondaryArchSuffix == $portVersion base
@@ -76,7 +81,7 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:cmake
-	cmd:convert$secondaryArchSuffix
+	cmd:convert
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
@@ -84,16 +89,16 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	cd src
+	cmake -Bbuild -Ssrc -DCMAKE_BUILD_TYPE=Release \
-	cmake . -DCMAKE_BUILD_TYPE=Release \
 		$cmakeDirArgs \
+		-DCMAKE_INSTALL_BINDIR=$commandBinDir \
 		-DBUILD_STATIC_LIBS=OFF
-	make $jobArgs
+	make -C build $jobArgs
 }
 
 INSTALL()
 {
-	make -C src install
+	make -C build install
 
 	prepareInstalledDevelLibs libflif libflif_dec
 
@@ -115,10 +120,10 @@ EOF
 		$developDir
 
 	packageEntries tools \
-		$binDir/viewflif
+		$commandBinDir/viewflif
 }
 
 TEST()
 {
-	make -C src test
+	make -C build test
 }