Re: [PR PATCH] [Updated] New package: svt-av1-0.9.0

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

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

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

https://github.com/tibequadorian/void-packages svt-av1
https://github.com/void-linux/void-packages/pull/35551

New package: svt-av1-0.9.0
closes https://github.com/void-linux/void-packages/issues/35541

<!-- Uncomment relevant sections and delete options which are not applicable -->

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

I tested this by encoding a video using `ffmpeg -i in.mp4 -c:v libsvtav1 out.mkv`.

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/35551.patch is attached

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

From 015e6009309b68c757ddba1a40ea85683aaec730 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 12 Feb 2022 12:56:31 +0100
Subject: [PATCH 1/2] New package: svt-av1-0.9.0

---
 common/shlibs            |  2 ++
 srcpkgs/libsvt-av1       |  1 +
 srcpkgs/libsvt-av1-devel |  1 +
 srcpkgs/svt-av1/template | 37 +++++++++++++++++++++++++++++++++++++
 4 files changed, 41 insertions(+)
 create mode 120000 srcpkgs/libsvt-av1
 create mode 120000 srcpkgs/libsvt-av1-devel
 create mode 100644 srcpkgs/svt-av1/template

diff --git a/common/shlibs b/common/shlibs
index 8f171c85d99b..5096ab5dad6b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4115,3 +4115,5 @@ libjvm.so openjdk17-jre-17.0.1+12_1
 librttopo.so.1 librttopo-1.1.0_1
 libspatialite.so.7 libspatialite-5.0.1_1
 mod_spatialite.so.7 libspatialite-5.0.1_1
+libSvtAv1Enc.so.0 libsvt-av1-0.9.0_1
+libSvtAv1Dec.so.0 libsvt-av1-0.9.0_1
diff --git a/srcpkgs/libsvt-av1 b/srcpkgs/libsvt-av1
new file mode 120000
index 000000000000..11a5a05a9045
--- /dev/null
+++ b/srcpkgs/libsvt-av1
@@ -0,0 +1 @@
+svt-av1
\ No newline at end of file
diff --git a/srcpkgs/libsvt-av1-devel b/srcpkgs/libsvt-av1-devel
new file mode 120000
index 000000000000..11a5a05a9045
--- /dev/null
+++ b/srcpkgs/libsvt-av1-devel
@@ -0,0 +1 @@
+svt-av1
\ No newline at end of file
diff --git a/srcpkgs/svt-av1/template b/srcpkgs/svt-av1/template
new file mode 100644
index 000000000000..ab9386d90cb7
--- /dev/null
+++ b/srcpkgs/svt-av1/template
@@ -0,0 +1,37 @@
+# Template file for 'svt-av1'
+pkgname=svt-av1
+version=0.9.1
+revision=1
+wrksrc="SVT-AV1-v${version}"
+build_style=cmake
+hostmakedepends="nasm"
+short_desc="AV1-compliant encoder/decoder library core"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="BSD-3-Clause-Clear"
+homepage="https://gitlab.com/AOMediaCodec/SVT-AV1"
+changelog="https://gitlab.com/AOMediaCodec/SVT-AV1/-/raw/master/CHANGELOG.md"
+distfiles="https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v${version}/SVT-AV1-v${version}.tar.gz"
+checksum=714154c08a90a5eb1f09c4d0d766621132711137af127468dc122c04ca9784ae
+
+if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
+	broken="32-bit is not supported"
+fi
+
+libsvt-av1_package() {
+	short_desc+=" - library files"
+	pkg_install() {
+		vmove "usr/lib/libSvtAv1Dec.so.*"
+		vmove "usr/lib/libSvtAv1Enc.so.*"
+		vlicense LICENSE.md
+	}
+}
+
+libsvt-av1-devel_package() {
+	short_desc+=" - development files"
+	depends="libsvt-av1>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From d2dbc3e8384e1103ba3d1db13918ccfdb56ae49c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 12 Feb 2022 12:57:04 +0100
Subject: [PATCH 2/2] ffmpeg: enable libsvtav1

---
 common/options.description |  1 +
 srcpkgs/ffmpeg/template    | 26 ++++++++++++++------------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/common/options.description b/common/options.description
index ac0f14c0843d..f9e3d0ce1992 100644
--- a/common/options.description
+++ b/common/options.description
@@ -83,6 +83,7 @@ desc_option_ssl="Enable support for SSL"
 desc_option_startup_notification="Enable support for desktop notification"
 desc_option_static="Enable static linking"
 desc_option_svg="Enable support for SVG images"
+desc_option_svtav1="Enable support for the SVT-AV1 Encoder and Decoder"
 desc_option_tcpwrappers="Enable support for tcpwrappers"
 desc_option_tiff="Enable support for TIFF images"
 desc_option_upower="Enable support for UPower"
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index c5929b4582f3..b7dce8fb11f7 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,7 +2,7 @@
 # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
 pkgname=ffmpeg
 version=4.4.1
-revision=1
+revision=2
 short_desc="Decoding, encoding and streaming software"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -25,15 +25,16 @@ makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-deve
  $(vopt_if dav1d libdav1d-devel) $(vopt_if zimg zimg-devel)
  $(vopt_if webp libwebp-devel) $(vopt_if sofa libmysofa-devel)
  $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')
- $(vopt_if drm libdrm-devel)"
+ $(vopt_if drm libdrm-devel) $(vopt_if svtav1 libsvt-av1-devel)"
 depends="ffplay>=${version}_${revision}"
 
 build_options="x265 v4l2 vaapi vdpau vpx faac fdk_aac aom nvenc sndio pulseaudio
- dav1d zimg webp sofa vulkan drm"
+ dav1d zimg webp sofa vulkan drm svtav1"
 build_options_default="x265 v4l2 vpx aom sndio pulseaudio dav1d webp vulkan drm"
 
 case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*) build_options_default+=" vaapi vdpau nvenc";;
+	x86_64*) build_options_default+=" vaapi vdpau nvenc svtav1";;
+	i686*) build_options_default+=" vaapi vdpau nvenc";;
 	ppc64*) build_options_default+=" vaapi vdpau";;
 	mips*) CFLAGS="-mnan=legacy";;
 esac
@@ -102,16 +103,17 @@ do_configure() {
 		--disable-libopencore_amrnb --disable-libopencore_amrwb \
 		--disable-libopenjpeg \
 		--enable-postproc --enable-opencl ${_args} \
-		$(vopt_if x265 '--enable-libx265' '--disable-libx265') \
-		$(vopt_if v4l2 '--enable-libv4l2' '--disable-libv4l2') \
+		$(vopt_enable x265 libx265) \
+		$(vopt_enable v4l2 libv4l2) \
 		$(vopt_enable aom libaom) $(vopt_enable vaapi) $(vopt_enable vdpau) \
 		--enable-libbs2b --enable-avresample --enable-libvidstab \
-		$(vopt_if dav1d '--enable-libdav1d') \
-		$(vopt_if zimg '--enable-libzimg') \
-		$(vopt_if webp '--enable-libwebp') \
-		$(vopt_if sofa '--enable-libmysofa') \
-		$(vopt_if vulkan '--enable-vulkan') \
-		$(vopt_if drm '--enable-libdrm')
+		$(vopt_enable dav1d libdav1d) \
+		$(vopt_enable zimg libzimg) \
+		$(vopt_enable webp libwebp) \
+		$(vopt_enable sofa libmysofa) \
+		$(vopt_enable vulkan) \
+		$(vopt_enable drm libdrm) \
+		$(vopt_enable svtav1 libsvtav1)
 }
 do_build() {
 	make ${makejobs}