Re: [PR PATCH] [Updated] libavif: enable encoding support

[oreo639 <oreo639@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1334 bytes --]

There is an updated pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages rav1e
https://github.com/void-linux/void-packages/pull/42438

libavif: enable encoding support
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

Allows tests to pass for https://github.com/void-linux/void-packages/pull/42426

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/42438.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rav1e-42438.patch --]
[-- Type: text/x-diff, Size: 4881 bytes --]

From 8a421e4b9de3b8212a04822cad2eff7df7842381 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 24 Feb 2023 19:34:16 -0800
Subject: [PATCH 1/3] New package: cargo-c-0.9.14_1

---
 srcpkgs/cargo-c/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/cargo-c/template

diff --git a/srcpkgs/cargo-c/template b/srcpkgs/cargo-c/template
new file mode 100644
index 000000000000..23654f700fa0
--- /dev/null
+++ b/srcpkgs/cargo-c/template
@@ -0,0 +1,16 @@
+# Template file for 'rav1e'
+pkgname=cargo-c
+version=0.9.14
+revision=1
+build_style=cargo
+hostmakedepends="pkg-config"
+makedepends="openssl-devel"
+short_desc="Build and install C-compatible rust libraries"
+maintainer="oreo639 <oreo6391@gmail.com>"
+license="MIT"
+homepage="https://crates.io/crates/cargo-c"
+distfiles="https://github.com/lu-zero/cargo-c/archive/v${version}.tar.gz
+ https://github.com/lu-zero/cargo-c/releases/download/v${version}/Cargo.lock"
+checksum="d79c12eae1460803a1ce8b440ae213dc4df63a6f2bf39ebd49eea1d7a008bec6
+ 4680619247db0fa7068e05e2cbf032dd2ed008bc43867a4078ebdfd21604119a"
+skip_extraction="Cargo.lock"

From 606877b7d84d6864ac53708d6a7bc2cede65dc00 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 24 Feb 2023 19:35:15 -0800
Subject: [PATCH 2/3] New package: rav1e-0.6.3_1

---
 common/shlibs          |  1 +
 srcpkgs/rav1e-devel    |  1 +
 srcpkgs/rav1e/template | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/rav1e-devel
 create mode 100644 srcpkgs/rav1e/template

diff --git a/common/shlibs b/common/shlibs
index 538ff08ce5ff..304ab12ecb0c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3567,6 +3567,7 @@ libcsfml-system.so.2.5 CSFML-2.5_1
 libcsfml-network.so.2.5 CSFML-2.5_1
 libtokyocabinet.so.9 tokyocabinet-1.4.48_1
 libdav1d.so.6 libdav1d6-1.0.0_1
+librav1e.so.0 rav1e-0.6.3_1
 libdqlite.so.0 dqlite-0.2.1_1
 libwoff2common.so.1.0.2 libwoff2common1.0.2-1.0.2_1
 libwoff2enc.so.1.0.2 libwoff2enc1.0.2-1.0.2_1
diff --git a/srcpkgs/rav1e-devel b/srcpkgs/rav1e-devel
new file mode 120000
index 000000000000..c810b6809ce8
--- /dev/null
+++ b/srcpkgs/rav1e-devel
@@ -0,0 +1 @@
+rav1e
\ No newline at end of file
diff --git a/srcpkgs/rav1e/template b/srcpkgs/rav1e/template
new file mode 100644
index 000000000000..feff2e2d5b07
--- /dev/null
+++ b/srcpkgs/rav1e/template
@@ -0,0 +1,32 @@
+# Template file for 'rav1e'
+pkgname=rav1e
+version=0.6.3
+revision=1
+build_style=cargo
+hostmakedepends="nasm cargo-c"
+short_desc="Fastest and safest AV1 encoder"
+maintainer="oreo639 <oreo6391@gmail.com>"
+license="BSD-2-Clause"
+homepage="https://crates.io/crates/rav1e"
+distfiles="https://static.crates.io/crates/rav1e/rav1e-${version}.crate"
+checksum=277898094f0d03c6a609e491324102daf5080e71c06b4b25e5acf8b89d26c945
+
+post_build() {
+	cargo auditable cbuild --release --target ${RUST_TARGET} \
+		--destdir="${DESTDIR}" --prefix="/usr" ${configure_args}
+}
+
+post_install() {
+	cargo auditable cinstall --release --target ${RUST_TARGET} \
+		--destdir="${DESTDIR}" --prefix="/usr" --offline --locked ${configure_args}
+}
+
+rav1e-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+		vmove usr/include
+	}
+}

From c53e608d98291ffe35fdab64d9ef102e5cafed81 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 24 Feb 2023 19:36:06 -0800
Subject: [PATCH 3/3] libavif: enable encoding support

---
 srcpkgs/libavif/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libavif/template b/srcpkgs/libavif/template
index 7a00dba5b3e5..35637693bb9f 100644
--- a/srcpkgs/libavif/template
+++ b/srcpkgs/libavif/template
@@ -1,13 +1,14 @@
 # Template file for 'libavif'
 pkgname=libavif
 version=0.11.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DAVIF_BUILD_APPS=ON -DAVIF_BUILD_GDK_PIXBUF=ON
- -DAVIF_CODEC_DAV1D=ON"
+ -DAVIF_CODEC_DAV1D=ON -DAVIF_CODEC_AOM=ON -DAVIF_CODEC_RAV1E=ON"
 hostmakedepends="gdk-pixbuf-devel pkg-config"
 makedepends="gdk-pixbuf-devel libdav1d-devel
- libjpeg-turbo-devel libpng-devel zlib-devel"
+ libjpeg-turbo-devel libpng-devel zlib-devel
+ libaom-devel rav1e-devel"
 short_desc="Library for encoding and decoding .avif files"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"
@@ -16,6 +17,11 @@ changelog="https://github.com/AOMediaCodec/libavif/blob/main/CHANGELOG.md"
 distfiles="https://github.com/AOMediaCodec/libavif/archive/refs/tags/v${version}.tar.gz"
 checksum=0eb49965562a0e5e5de58389650d434cff32af84c34185b6c9b7b2fccae06d4e
 
+if [ "$XBPS_TARGET_WORDSIZE" != "32" ]; then
+	configure_args+=" -DAVIF_CODEC_SVT=1"
+	makedepends+=" libsvt-av1-devel"
+fi
+
 post_install() {
 	vlicense LICENSE
 }