svt-av1 2.0.0 (getsolus#2244)

**Summary** - Updated svt-av1 to v2.0.0 - Rebuilt all revdeps
malfisya · Apr 15, 2024 · a89e257 · a89e257
2 parents 06aa378 + 51c6d11
commit a89e257
Show file tree

Hide file tree

Showing 26 changed files with 325 additions and 180 deletions.
diff --git a/packages/f/ffmpeg-4.4/abi_used_libs b/packages/f/ffmpeg-4.4/abi_used_libs
@@ -1,5 +1,5 @@
 libGL.so.1
-libSvtAv1Enc.so.1
+libSvtAv1Enc.so.2
 libX11.so.6
 libXext.so.6
 libXv.so.1

diff --git a/packages/f/ffmpeg-4.4/abi_used_symbols b/packages/f/ffmpeg-4.4/abi_used_symbols
@@ -15,16 +15,16 @@ libGL.so.1:glTexParameteri
 libGL.so.1:glTexSubImage2D
 libGL.so.1:glViewport
 libGL.so.1:glXGetProcAddress
-libSvtAv1Enc.so.1:svt_av1_enc_deinit
-libSvtAv1Enc.so.1:svt_av1_enc_deinit_handle
-libSvtAv1Enc.so.1:svt_av1_enc_get_packet
-libSvtAv1Enc.so.1:svt_av1_enc_init
-libSvtAv1Enc.so.1:svt_av1_enc_init_handle
-libSvtAv1Enc.so.1:svt_av1_enc_release_out_buffer
-libSvtAv1Enc.so.1:svt_av1_enc_send_picture
-libSvtAv1Enc.so.1:svt_av1_enc_set_parameter
-libSvtAv1Enc.so.1:svt_av1_enc_stream_header
-libSvtAv1Enc.so.1:svt_av1_enc_stream_header_release
+libSvtAv1Enc.so.2:svt_av1_enc_deinit
+libSvtAv1Enc.so.2:svt_av1_enc_deinit_handle
+libSvtAv1Enc.so.2:svt_av1_enc_get_packet
+libSvtAv1Enc.so.2:svt_av1_enc_init
+libSvtAv1Enc.so.2:svt_av1_enc_init_handle
+libSvtAv1Enc.so.2:svt_av1_enc_release_out_buffer
+libSvtAv1Enc.so.2:svt_av1_enc_send_picture
+libSvtAv1Enc.so.2:svt_av1_enc_set_parameter
+libSvtAv1Enc.so.2:svt_av1_enc_stream_header
+libSvtAv1Enc.so.2:svt_av1_enc_stream_header_release
 libX11.so.6:XAllocColor
 libX11.so.6:XCloseDisplay
 libX11.so.6:XCreateGC

diff --git a/packages/f/ffmpeg-4.4/package.yml b/packages/f/ffmpeg-4.4/package.yml
@@ -1,6 +1,6 @@
 name       : ffmpeg-4.4
 version    : 4.4.4
-release    : 2
+release    : 3
 source     :
     - https://ffmpeg.org/releases/ffmpeg-4.4.4.tar.xz : e80b380d595c809060f66f96a5d849511ef4a76a26b76eacf5778b94c3570309
 license    :

diff --git a/packages/f/ffmpeg-4.4/pspec_x86_64.xml b/packages/f/ffmpeg-4.4/pspec_x86_64.xml
@@ -46,7 +46,7 @@
 </Description>
         <PartOf>programming.devel</PartOf>
         <RuntimeDependencies>
-            <Dependency release="2">ffmpeg-4.4</Dependency>
+            <Dependency release="3">ffmpeg-4.4</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include/ffmpeg-4.4/libavcodec/ac3_parser.h</Path>
@@ -194,8 +194,8 @@
         </Files>
     </Package>
     <History>
-        <Update release="2">
-            <Date>2024-03-01</Date>
+        <Update release="3">
+            <Date>2024-04-14</Date>
             <Version>4.4.4</Version>
             <Comment>Packaging update</Comment>
             <Name>Reilly Brogan</Name>

diff --git a/packages/f/ffmpeg/abi_used_libs b/packages/f/ffmpeg/abi_used_libs
@@ -1,7 +1,7 @@
 UNKNOWN
 libGL.so.1
 libSDL2-2.0.so.0
-libSvtAv1Enc.so.1
+libSvtAv1Enc.so.2
 libX11.so.6
 libXv.so.1
 libaom.so.3

diff --git a/packages/f/ffmpeg/abi_used_symbols b/packages/f/ffmpeg/abi_used_symbols
@@ -292,17 +292,17 @@ libSDL2-2.0.so.0:SDL_WaitThread
 libSDL2-2.0.so.0:SDL_WasInit
 libSDL2-2.0.so.0:SDL_getenv
 libSDL2-2.0.so.0:SDL_setenv
-libSvtAv1Enc.so.1:svt_av1_enc_deinit
-libSvtAv1Enc.so.1:svt_av1_enc_deinit_handle
-libSvtAv1Enc.so.1:svt_av1_enc_get_packet
-libSvtAv1Enc.so.1:svt_av1_enc_init
-libSvtAv1Enc.so.1:svt_av1_enc_init_handle
-libSvtAv1Enc.so.1:svt_av1_enc_parse_parameter
-libSvtAv1Enc.so.1:svt_av1_enc_release_out_buffer
-libSvtAv1Enc.so.1:svt_av1_enc_send_picture
-libSvtAv1Enc.so.1:svt_av1_enc_set_parameter
-libSvtAv1Enc.so.1:svt_av1_enc_stream_header
-libSvtAv1Enc.so.1:svt_av1_enc_stream_header_release
+libSvtAv1Enc.so.2:svt_av1_enc_deinit
+libSvtAv1Enc.so.2:svt_av1_enc_deinit_handle
+libSvtAv1Enc.so.2:svt_av1_enc_get_packet
+libSvtAv1Enc.so.2:svt_av1_enc_init
+libSvtAv1Enc.so.2:svt_av1_enc_init_handle
+libSvtAv1Enc.so.2:svt_av1_enc_parse_parameter
+libSvtAv1Enc.so.2:svt_av1_enc_release_out_buffer
+libSvtAv1Enc.so.2:svt_av1_enc_send_picture
+libSvtAv1Enc.so.2:svt_av1_enc_set_parameter
+libSvtAv1Enc.so.2:svt_av1_enc_stream_header
+libSvtAv1Enc.so.2:svt_av1_enc_stream_header_release
 libX11.so.6:XAllocColor
 libX11.so.6:XCloseDisplay
 libX11.so.6:XCreateGC

diff --git a/packages/f/ffmpeg/files/ftbfs-vulkan-headers.patch b/packages/f/ffmpeg/files/ftbfs-vulkan-headers.patch
@@ -0,0 +1,121 @@
+From fef22c87ada4517441701e6e61e062c9f4399c8e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Ekstr=C3=B6m?= <[email protected]>
+Date: Wed, 14 Feb 2024 22:40:54 +0200
+Subject: [PATCH] {avcodec,tests}: rename the bundled Mesa AV1 vulkan video
+ headers
+
+This together with adjusting the inclusion define allows for the
+build to not fail with latest Vulkan-Headers that contain the
+stabilized Vulkan AV1 decoding definitions.
+
+Compilation fails currently as the AV1 header is getting included
+via hwcontext_vulkan.h -> <vulkan/vulkan.h> -> vulkan_core.h, which
+finally includes vk_video/vulkan_video_codec_av1std.h and the decode
+header, leading to the bundled header to never defining anything
+due to the inclusion define being the same.
+
+This fix is imperfect, as it leads to additional re-definition
+warnings for things such as
+VK_STD_VULKAN_VIDEO_CODEC_AV1_DECODE_SPEC_VERSION. , but it is
+not clear how to otherwise have the bundled version trump the
+actually standardized one for a short-term compilation fix.
+
+(cherry picked from commit e06ce6d2b45edac4a2df04f304e18d4727417d24)
+---
+ libavcodec/Makefile                                           | 4 ++--
+ libavcodec/vulkan_video.h                                     | 4 ++--
+ ...v1std_decode.h => vulkan_video_codec_av1std_decode_mesa.h} | 4 ++--
+ ..._video_codec_av1std.h => vulkan_video_codec_av1std_mesa.h} | 4 ++--
+ tests/ref/fate/source                                         | 4 ++--
+ 5 files changed, 10 insertions(+), 10 deletions(-)
+ rename libavcodec/{vulkan_video_codec_av1std_decode.h => vulkan_video_codec_av1std_decode_mesa.h} (89%)
+ rename libavcodec/{vulkan_video_codec_av1std.h => vulkan_video_codec_av1std_mesa.h} (99%)
+
+diff --git a/libavcodec/Makefile b/libavcodec/Makefile
+index ec57e53e300f9..eb25707ef5db9 100644
+--- a/libavcodec/Makefile
++++ b/libavcodec/Makefile
+@@ -1284,7 +1284,7 @@ SKIPHEADERS                            += %_tablegen.h                  \
+                                           aacenc_quantization.h         \
+                                           aacenc_quantization_misc.h    \
+                                           bitstream_template.h          \
+-                                          vulkan_video_codec_av1std.h   \
++                                          vulkan_video_codec_av1std_mesa.h \
+                                           $(ARCH)/vpx_arith.h          \
+
+ SKIPHEADERS-$(CONFIG_AMF)              += amfenc.h
+@@ -1306,7 +1306,7 @@ SKIPHEADERS-$(CONFIG_XVMC)             += xvmc.h
+ SKIPHEADERS-$(CONFIG_VAAPI)            += vaapi_decode.h vaapi_hevc.h vaapi_encode.h
+ SKIPHEADERS-$(CONFIG_VDPAU)            += vdpau.h vdpau_internal.h
+ SKIPHEADERS-$(CONFIG_VIDEOTOOLBOX)     += videotoolbox.h vt_internal.h
+-SKIPHEADERS-$(CONFIG_VULKAN)           += vulkan.h vulkan_video.h vulkan_decode.h vulkan_video_codec_av1std_decode.h
++SKIPHEADERS-$(CONFIG_VULKAN)           += vulkan.h vulkan_video.h vulkan_decode.h vulkan_video_codec_av1std_decode_mesa.h
+ SKIPHEADERS-$(CONFIG_V4L2_M2M)         += v4l2_buffers.h v4l2_context.h v4l2_m2m.h
+ SKIPHEADERS-$(CONFIG_ZLIB)             += zlib_wrapper.h
+
+diff --git a/libavcodec/vulkan_video.h b/libavcodec/vulkan_video.h
+index b28e3fe0bde85..51f44dd54314d 100644
+--- a/libavcodec/vulkan_video.h
++++ b/libavcodec/vulkan_video.h
+@@ -23,8 +23,8 @@
+ #include "vulkan.h"
+
+ #include <vk_video/vulkan_video_codecs_common.h>
+-#include "vulkan_video_codec_av1std.h"
+-#include "vulkan_video_codec_av1std_decode.h"
++#include "vulkan_video_codec_av1std_mesa.h"
++#include "vulkan_video_codec_av1std_decode_mesa.h"
+
+ #define CODEC_VER_MAJ(ver) (ver >> 22)
+ #define CODEC_VER_MIN(ver) ((ver >> 12) & ((1 << 10) - 1))
+diff --git a/libavcodec/vulkan_video_codec_av1std_decode.h b/libavcodec/vulkan_video_codec_av1std_decode_mesa.h
+similarity index 89%
+rename from libavcodec/vulkan_video_codec_av1std_decode.h
+rename to libavcodec/vulkan_video_codec_av1std_decode_mesa.h
+index a697c00593c63..e2f37b4e6e0dc 100644
+--- a/libavcodec/vulkan_video_codec_av1std_decode.h
++++ b/libavcodec/vulkan_video_codec_av1std_decode_mesa.h
+@@ -14,8 +14,8 @@
+  * limitations under the License.
+  */
+
+-#ifndef VULKAN_VIDEO_CODEC_AV1STD_DECODE_H_
+-#define VULKAN_VIDEO_CODEC_AV1STD_DECODE_H_ 1
++#ifndef VULKAN_VIDEO_CODEC_AV1STD_DECODE_MESA_H_
++#define VULKAN_VIDEO_CODEC_AV1STD_DECODE_MESA_H_ 1
+
+ /*
+ ** This header is NOT YET generated from the Khronos Vulkan XML API Registry.
+diff --git a/libavcodec/vulkan_video_codec_av1std.h b/libavcodec/vulkan_video_codec_av1std_mesa.h
+similarity index 99%
+rename from libavcodec/vulkan_video_codec_av1std.h
+rename to libavcodec/vulkan_video_codec_av1std_mesa.h
+index c46236c457238..c91589eee2bfe 100644
+--- a/libavcodec/vulkan_video_codec_av1std.h
++++ b/libavcodec/vulkan_video_codec_av1std_mesa.h
+@@ -14,8 +14,8 @@
+  * limitations under the License.
+  */
+
+-#ifndef VULKAN_VIDEO_CODEC_AV1STD_H_
+-#define VULKAN_VIDEO_CODEC_AV1STD_H_ 1
++#ifndef VULKAN_VIDEO_CODEC_AV1STD_MESA_H_
++#define VULKAN_VIDEO_CODEC_AV1STD_MESA_H_ 1
+
+ /*
+ ** This header is NOT YET generated from the Khronos Vulkan XML API Registry.
+diff --git a/tests/ref/fate/source b/tests/ref/fate/source
+index c575789dd55e7..8bb58b61f144e 100644
+--- a/tests/ref/fate/source
++++ b/tests/ref/fate/source
+@@ -23,8 +23,8 @@ compat/djgpp/math.h
+ compat/float/float.h
+ compat/float/limits.h
+ libavcodec/bitstream_template.h
+-libavcodec/vulkan_video_codec_av1std.h
+-libavcodec/vulkan_video_codec_av1std_decode.h
++libavcodec/vulkan_video_codec_av1std_decode_mesa.h
++libavcodec/vulkan_video_codec_av1std_mesa.h
+ tools/decode_simple.h
+ Use of av_clip() where av_clip_uintp2() could be used:
+ Use of av_clip() where av_clip_intp2() could be used:
diff --git a/packages/f/ffmpeg/package.yml b/packages/f/ffmpeg/package.yml
@@ -1,6 +1,6 @@
 name       : ffmpeg
 version    : 6.1.1
-release    : 149
+release    : 150
 source     :
     - https://ffmpeg.org/releases/ffmpeg-6.1.1.tar.gz : b0aee531e4a91fed6bc031445dfc3ad8eb36de1fcb0fa2acdb589ecc9f8dc9cb
 homepage   : https://www.ffmpeg.org/
@@ -62,6 +62,7 @@ builddeps  :
     - xvidcore-devel
 setup      : |
     %patch -p1 -i $pkgfiles/add-av_stream_get_first_dts-for-chromium.patch
+    %patch -p1 -i $pkgfiles/ftbfs-vulkan-headers.patch
 
     ./configure \
         --enable-gcrypt \

diff --git a/packages/f/ffmpeg/pspec_x86_64.xml b/packages/f/ffmpeg/pspec_x86_64.xml
@@ -78,7 +78,7 @@
 </Description>
         <PartOf>programming.devel</PartOf>
         <RuntimeDependencies>
-            <Dependency release="149">ffmpeg</Dependency>
+            <Dependency release="150">ffmpeg</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include/libavcodec/ac3_parser.h</Path>
@@ -308,8 +308,8 @@
         </Files>
     </Package>
     <History>
-        <Update release="149">
-            <Date>2024-03-03</Date>
+        <Update release="150">
+            <Date>2024-04-14</Date>
             <Version>6.1.1</Version>
             <Comment>Packaging update</Comment>
             <Name>Reilly Brogan</Name>

diff --git a/packages/g/gstreamer-1.0-plugins-bad/abi_used_libs b/packages/g/gstreamer-1.0-plugins-bad/abi_used_libs
@@ -1,6 +1,6 @@
 ld-linux-x86-64.so.2
 libSoundTouch.so.1
-libSvtAv1Enc.so.1
+libSvtAv1Enc.so.2
 libX11.so.6
 libaom.so.3
 libass.so.9

diff --git a/packages/g/gstreamer-1.0-plugins-bad/abi_used_symbols b/packages/g/gstreamer-1.0-plugins-bad/abi_used_symbols
@@ -9,15 +9,15 @@ libSoundTouch.so.1:_ZN10soundtouch10SoundTouchC1Ev
 libSoundTouch.so.1:_ZN10soundtouch9BPMDetect12inputSamplesEPKfi
 libSoundTouch.so.1:_ZN10soundtouch9BPMDetect6getBpmEv
 libSoundTouch.so.1:_ZN10soundtouch9BPMDetectC1Eii
-libSvtAv1Enc.so.1:svt_av1_enc_deinit
-libSvtAv1Enc.so.1:svt_av1_enc_deinit_handle
-libSvtAv1Enc.so.1:svt_av1_enc_get_packet
-libSvtAv1Enc.so.1:svt_av1_enc_init
-libSvtAv1Enc.so.1:svt_av1_enc_init_handle
-libSvtAv1Enc.so.1:svt_av1_enc_parse_parameter
-libSvtAv1Enc.so.1:svt_av1_enc_release_out_buffer
-libSvtAv1Enc.so.1:svt_av1_enc_send_picture
-libSvtAv1Enc.so.1:svt_av1_enc_set_parameter
+libSvtAv1Enc.so.2:svt_av1_enc_deinit
+libSvtAv1Enc.so.2:svt_av1_enc_deinit_handle
+libSvtAv1Enc.so.2:svt_av1_enc_get_packet
+libSvtAv1Enc.so.2:svt_av1_enc_init
+libSvtAv1Enc.so.2:svt_av1_enc_init_handle
+libSvtAv1Enc.so.2:svt_av1_enc_parse_parameter
+libSvtAv1Enc.so.2:svt_av1_enc_release_out_buffer
+libSvtAv1Enc.so.2:svt_av1_enc_send_picture
+libSvtAv1Enc.so.2:svt_av1_enc_set_parameter
 libX11.so.6:XStringToKeysym
 libaom.so.3:aom_codec_av1_cx_algo
 libaom.so.3:aom_codec_av1_dx_algo

diff --git a/packages/g/gstreamer-1.0-plugins-bad/package.yml b/packages/g/gstreamer-1.0-plugins-bad/package.yml
@@ -1,6 +1,6 @@
 name       : gstreamer-1.0-plugins-bad
 version    : 1.24.2
-release    : 100
+release    : 101
 source     :
     - https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.24.2.tar.xz : 448e32787bc82b586c6cb2f81c9a8ef404fea4f77f25566fe06e597a3f59136b
 homepage   : https://gstreamer.freedesktop.org

diff --git a/packages/g/gstreamer-1.0-plugins-bad/pspec_x86_64.xml b/packages/g/gstreamer-1.0-plugins-bad/pspec_x86_64.xml
@@ -307,7 +307,7 @@
         <Description xml:lang="en">Development files for gstreamer-1.0-plugins-opencv</Description>
         <PartOf>programming.devel</PartOf>
         <RuntimeDependencies>
-            <Dependency releaseFrom="100">gstreamer-1.0-plugins-opencv</Dependency>
+            <Dependency releaseFrom="101">gstreamer-1.0-plugins-opencv</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include/gstreamer-1.0/gst/opencv/gstopencvutils.h</Path>
@@ -322,7 +322,7 @@
         <Description xml:lang="en">GStreamer is a streaming media framework, based on graphs of elements which operate on media data. This package contains plug-ins that aren&apos;t tested well enough, or the code is not of good enough quality.</Description>
         <PartOf>programming.devel</PartOf>
         <RuntimeDependencies>
-            <Dependency release="100">gstreamer-1.0-plugins-bad</Dependency>
+            <Dependency release="101">gstreamer-1.0-plugins-bad</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include/gstreamer-1.0/gst/analytics/analytics-meta-prelude.h</Path>
@@ -546,8 +546,8 @@
         </Replaces>
     </Package>
     <History>
-        <Update release="100">
-            <Date>2024-04-10</Date>
+        <Update release="101">
+            <Date>2024-04-14</Date>
             <Version>1.24.2</Version>
             <Comment>Packaging update</Comment>
             <Name>Reilly Brogan</Name>

diff --git a/packages/l/libavif/abi_used_libs b/packages/l/libavif/abi_used_libs
@@ -1,4 +1,4 @@
-libSvtAv1Enc.so.1
+libSvtAv1Enc.so.2
 libaom.so.3
 libc.so.6
 libdav1d.so.7

diff --git a/packages/l/libavif/abi_used_symbols b/packages/l/libavif/abi_used_symbols
@@ -1,12 +1,12 @@
-libSvtAv1Enc.so.1:svt_av1_enc_deinit
-libSvtAv1Enc.so.1:svt_av1_enc_deinit_handle
-libSvtAv1Enc.so.1:svt_av1_enc_get_packet
-libSvtAv1Enc.so.1:svt_av1_enc_init
-libSvtAv1Enc.so.1:svt_av1_enc_init_handle
-libSvtAv1Enc.so.1:svt_av1_enc_release_out_buffer
-libSvtAv1Enc.so.1:svt_av1_enc_send_picture
-libSvtAv1Enc.so.1:svt_av1_enc_set_parameter
-libSvtAv1Enc.so.1:svt_av1_get_version
+libSvtAv1Enc.so.2:svt_av1_enc_deinit
+libSvtAv1Enc.so.2:svt_av1_enc_deinit_handle
+libSvtAv1Enc.so.2:svt_av1_enc_get_packet
+libSvtAv1Enc.so.2:svt_av1_enc_init
+libSvtAv1Enc.so.2:svt_av1_enc_init_handle
+libSvtAv1Enc.so.2:svt_av1_enc_release_out_buffer
+libSvtAv1Enc.so.2:svt_av1_enc_send_picture
+libSvtAv1Enc.so.2:svt_av1_enc_set_parameter
+libSvtAv1Enc.so.2:svt_av1_get_version
 libaom.so.3:aom_codec_av1_cx
 libaom.so.3:aom_codec_av1_dx
 libaom.so.3:aom_codec_control

diff --git a/packages/l/libavif/package.yml b/packages/l/libavif/package.yml
@@ -1,6 +1,6 @@
 name       : libavif
 version    : 1.0.4
-release    : 17
+release    : 18
 source     :
     - https://github.com/AOMediaCodec/libavif/archive/refs/tags/v1.0.4.tar.gz : dc56708c83a4b934a8af2b78f67f866ba2fb568605c7cf94312acf51ee57d146
 license    : BSD-2-Clause