From bb9eddd35ff6cc431dc02ae7cb059eab9b4b184e Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Wed, 27 Sep 2023 13:11:45 +0000
Subject: [PATCH] dav1d, bump version, drop old version (#9527)

---
 ...{dav1d-1.0.0.recipe => dav1d-1.2.1.recipe} |  9 +--
 media-libs/dav1d/dav1d_0.9.2-0.9.2.recipe     | 64 -------------------
 2 files changed, 5 insertions(+), 68 deletions(-)
 rename media-libs/dav1d/{dav1d-1.0.0.recipe => dav1d-1.2.1.recipe} (92%)
 delete mode 100644 media-libs/dav1d/dav1d_0.9.2-0.9.2.recipe

diff --git a/media-libs/dav1d/dav1d-1.0.0.recipe b/media-libs/dav1d/dav1d-1.2.1.recipe
similarity index 92%
rename from media-libs/dav1d/dav1d-1.0.0.recipe
rename to media-libs/dav1d/dav1d-1.2.1.recipe
index b464429da..c538a91a5 100644
--- a/media-libs/dav1d/dav1d-1.0.0.recipe
+++ b/media-libs/dav1d/dav1d-1.2.1.recipe
@@ -7,7 +7,7 @@ COPYRIGHT="2018-2019, VideoLAN and dav1d authors"
 LICENSE="BSD (2-clause)"
 REVISION="1"
 SOURCE_URI="https://code.videolan.org/videolan/dav1d/-/archive/$portVersion/dav1d-$portVersion.tar.bz2"
-CHECKSUM_SHA256="4a4eb6cecbc8c26916ef58886d478243de8bcc46710b369c04d6891b0155ac0f"
+CHECKSUM_SHA256="a4003623cdc0109dec3aac8435520aa3fb12c4d69454fa227f2658cdb6dab5fa"
 
 ARCHITECTURES="all !x86_gcc2 ?x86 ?arm ?ppc"
 SECONDARY_ARCHITECTURES="x86"
@@ -19,7 +19,7 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then
 	commandBinDir=$prefix/bin
 fi
 
-libVersion="6.6.0"
+libVersion="6.9.0"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="
@@ -44,8 +44,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
-	cmd:meson >= 0.49
-	cmd:nasm >= 2.13.02
+	cmd:meson
+	cmd:nasm
 	cmd:ninja
 	"
 
@@ -70,6 +70,7 @@ INSTALL()
 
 	prepareInstalledDevelLib libdav1d
 	fixPkgconfig
+
 	packageEntries devel $developDir
 }
 
diff --git a/media-libs/dav1d/dav1d_0.9.2-0.9.2.recipe b/media-libs/dav1d/dav1d_0.9.2-0.9.2.recipe
deleted file mode 100644
index 767510305..000000000
--- a/media-libs/dav1d/dav1d_0.9.2-0.9.2.recipe
+++ /dev/null
@@ -1,64 +0,0 @@
-SUMMARY="A new AV1 cross-platform decoder"
-DESCRIPTION="dav1d is a new AV1 cross-platform decoder, open-source, \
-and focused on speed and correctness. It supports all features from AV1, \
-including all subsampling and bit-depth parameters."
-HOMEPAGE="https://code.videolan.org/videolan/dav1d"
-COPYRIGHT="2018-2019, VideoLAN and dav1d authors"
-LICENSE="BSD (2-clause)"
-REVISION="2"
-SOURCE_URI="https://code.videolan.org/videolan/dav1d/-/archive/$portVersion/dav1d-$portVersion.tar.bz2"
-CHECKSUM_SHA256="0d198c4fe63fe7f0395b1b17de75b21c8c4508cd3204996229355759efa30ef8"
-SOURCE_DIR="dav1d-$portVersion"
-
-ARCHITECTURES="all !x86_gcc2 ?x86 ?arm ?ppc"
-SECONDARY_ARCHITECTURES="x86"
-
-libVersion="5.1.1"
-libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
-
-PROVIDES="
-	dav1d_0.9.2$secondaryArchSuffix = $portVersion
-	lib:libdav1d$secondaryArchSuffix = $libVersionCompat
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	"
-BUILD_PREREQUIRES="
-	cmd:gcc$secondaryArchSuffix
-	cmd:meson >= 0.49
-	cmd:nasm >= 2.13.02
-	cmd:ninja
-	"
-
-defineDebugInfoPackage dav1d_0.9.2$secondaryArchSuffix \
-	"$libDir"/libdav1d.so.$libVersion
-
-BUILD()
-{
-	unset -f meson
-	meson build \
-		--buildtype debugoptimized \
-		-Denable_tools=false \
-		--prefix $prefix \
-		--libdir $libDir \
-		--includedir $includeDir
-	ninja -C build $jobArgs
-}
-
-INSTALL()
-{
-	ninja -C build install
-
-	prepareInstalledDevelLib libdav1d
-	fixPkgconfig
-	rm -rf $developDir
-}
-
-TEST()
-{
-	ninja -C build test
-}