ffmpeg: 5.1.2 -> 6.0

This commit is contained in:
Tim Biermann 2023-03-01 07:45:06 +01:00
parent e675cf1198
commit 4bf8970ea6
Signed by: tb
GPG Key ID: 42F8B4E30B673606
4 changed files with 35 additions and 70 deletions

View File

@ -48,6 +48,7 @@ drwxr-xr-x root/root usr/include/libavutil/
-rw-r--r-- root/root usr/include/libavutil/adler32.h
-rw-r--r-- root/root usr/include/libavutil/aes.h
-rw-r--r-- root/root usr/include/libavutil/aes_ctr.h
-rw-r--r-- root/root usr/include/libavutil/ambient_viewing_environment.h
-rw-r--r-- root/root usr/include/libavutil/attributes.h
-rw-r--r-- root/root usr/include/libavutil/audio_fifo.h
-rw-r--r-- root/root usr/include/libavutil/avassert.h
@ -150,37 +151,37 @@ drwxr-xr-x root/root usr/include/libswscale/
-rw-r--r-- root/root usr/include/libswscale/version_major.h
drwxr-xr-x root/root usr/lib/
-rw-r--r-- root/root usr/lib/libavcodec.a
lrwxrwxrwx root/root usr/lib/libavcodec.so -> libavcodec.so.59.37.100
lrwxrwxrwx root/root usr/lib/libavcodec.so.59 -> libavcodec.so.59.37.100
-rwxr-xr-x root/root usr/lib/libavcodec.so.59.37.100
lrwxrwxrwx root/root usr/lib/libavcodec.so -> libavcodec.so.60.3.100
lrwxrwxrwx root/root usr/lib/libavcodec.so.60 -> libavcodec.so.60.3.100
-rwxr-xr-x root/root usr/lib/libavcodec.so.60.3.100
-rw-r--r-- root/root usr/lib/libavdevice.a
lrwxrwxrwx root/root usr/lib/libavdevice.so -> libavdevice.so.59.7.100
lrwxrwxrwx root/root usr/lib/libavdevice.so.59 -> libavdevice.so.59.7.100
-rwxr-xr-x root/root usr/lib/libavdevice.so.59.7.100
lrwxrwxrwx root/root usr/lib/libavdevice.so -> libavdevice.so.60.1.100
lrwxrwxrwx root/root usr/lib/libavdevice.so.60 -> libavdevice.so.60.1.100
-rwxr-xr-x root/root usr/lib/libavdevice.so.60.1.100
-rw-r--r-- root/root usr/lib/libavfilter.a
lrwxrwxrwx root/root usr/lib/libavfilter.so -> libavfilter.so.8.44.100
lrwxrwxrwx root/root usr/lib/libavfilter.so.8 -> libavfilter.so.8.44.100
-rwxr-xr-x root/root usr/lib/libavfilter.so.8.44.100
lrwxrwxrwx root/root usr/lib/libavfilter.so -> libavfilter.so.9.3.100
lrwxrwxrwx root/root usr/lib/libavfilter.so.9 -> libavfilter.so.9.3.100
-rwxr-xr-x root/root usr/lib/libavfilter.so.9.3.100
-rw-r--r-- root/root usr/lib/libavformat.a
lrwxrwxrwx root/root usr/lib/libavformat.so -> libavformat.so.59.27.100
lrwxrwxrwx root/root usr/lib/libavformat.so.59 -> libavformat.so.59.27.100
-rwxr-xr-x root/root usr/lib/libavformat.so.59.27.100
lrwxrwxrwx root/root usr/lib/libavformat.so -> libavformat.so.60.3.100
lrwxrwxrwx root/root usr/lib/libavformat.so.60 -> libavformat.so.60.3.100
-rwxr-xr-x root/root usr/lib/libavformat.so.60.3.100
-rw-r--r-- root/root usr/lib/libavutil.a
lrwxrwxrwx root/root usr/lib/libavutil.so -> libavutil.so.57.28.100
lrwxrwxrwx root/root usr/lib/libavutil.so.57 -> libavutil.so.57.28.100
-rwxr-xr-x root/root usr/lib/libavutil.so.57.28.100
lrwxrwxrwx root/root usr/lib/libavutil.so -> libavutil.so.58.2.100
lrwxrwxrwx root/root usr/lib/libavutil.so.58 -> libavutil.so.58.2.100
-rwxr-xr-x root/root usr/lib/libavutil.so.58.2.100
-rw-r--r-- root/root usr/lib/libpostproc.a
lrwxrwxrwx root/root usr/lib/libpostproc.so -> libpostproc.so.56.6.100
lrwxrwxrwx root/root usr/lib/libpostproc.so.56 -> libpostproc.so.56.6.100
-rwxr-xr-x root/root usr/lib/libpostproc.so.56.6.100
lrwxrwxrwx root/root usr/lib/libpostproc.so -> libpostproc.so.57.1.100
lrwxrwxrwx root/root usr/lib/libpostproc.so.57 -> libpostproc.so.57.1.100
-rwxr-xr-x root/root usr/lib/libpostproc.so.57.1.100
-rw-r--r-- root/root usr/lib/libswresample.a
lrwxrwxrwx root/root usr/lib/libswresample.so -> libswresample.so.4.7.100
lrwxrwxrwx root/root usr/lib/libswresample.so.4 -> libswresample.so.4.7.100
-rwxr-xr-x root/root usr/lib/libswresample.so.4.7.100
lrwxrwxrwx root/root usr/lib/libswresample.so -> libswresample.so.4.10.100
lrwxrwxrwx root/root usr/lib/libswresample.so.4 -> libswresample.so.4.10.100
-rwxr-xr-x root/root usr/lib/libswresample.so.4.10.100
-rw-r--r-- root/root usr/lib/libswscale.a
lrwxrwxrwx root/root usr/lib/libswscale.so -> libswscale.so.6.7.100
lrwxrwxrwx root/root usr/lib/libswscale.so.6 -> libswscale.so.6.7.100
-rwxr-xr-x root/root usr/lib/libswscale.so.6.7.100
lrwxrwxrwx root/root usr/lib/libswscale.so -> libswscale.so.7.1.100
lrwxrwxrwx root/root usr/lib/libswscale.so.7 -> libswscale.so.7.1.100
-rwxr-xr-x root/root usr/lib/libswscale.so.7.1.100
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/libavcodec.pc
-rw-r--r-- root/root usr/lib/pkgconfig/libavdevice.pc

View File

@ -1,8 +1,7 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/a8iIdqWmCoEityk37ZL+VVo1/9DXqrhZQZemn2lkdfcEdqaLFKOii3mCwzILEqtfgCOOEFxnbx/UtZ5PCpWFgs=
SHA256 (Pkgfile) = 1fb9fa08f907abb5822a37520402af16e2c02e518e8d740cf6bc3a74bea84d6d
SHA256 (.footprint) = 93cc038b2af60596e07f1c67e86a45e941602cd888ae555943762c56cfd0a114
SHA256 (ffmpeg-5.1.2.tar.bz2) = 39a0bcc8d98549f16c570624678246a6ac736c066cebdb409f9502e915b22f2b
SHA256 (ffmpeg-5.1.2-vulkan.patch) = e570c823f4a91699e0fd8eea9e07353e76a5e4156f7af8c2b3d5f65aa7f41d5f
RWSE3ohX2g5d/crUTR8P3p9MX3STTqO5EF/dJAANIvJElFi/qcBCUp/ocaDIFQHFdBrECGvh7wjoMUcNx/QevifBSllaucc45wo=
SHA256 (Pkgfile) = d5b445d2a184044821e4d42fa8db955bd65795fc9ef35f8c0230d6116320e052
SHA256 (.footprint) = 0716289bd27e88a5a3ed80b7ecd98b9e1589adc3934bc97ed54b5e413be6b4ef
SHA256 (ffmpeg-6.0.tar.bz2) = 47d062731c9f66a78380e35a19aac77cebceccd1c7cc309b9c82343ffc430c3d
SHA256 (add-av_stream_get_first_dts-for-chromium.patch) = 57e26caced5a1382cb639235f9555fc50e45e7bf8333f7c9ae3d49b3241d3f77
SHA256 (ffmpeg-x264-10bit.sh) = dde9627c41800235fbcfe0f74d2181be96239a82cd2d0d277715dddb57eb9cb3

View File

@ -1,14 +1,13 @@
# Description: Complete solution to record, convert and stream audio and video.
# URL: https://ffmpeg.org/
# Maintainer: Danny Rawlins, crux at romster dot me
# Maintainer: Tim Biermann, tbier at posteo dot de
# Depends on: yasm
# Optional: alsa-lib amf-headers cuda dav1d fdk-aac freetype gnutls gsm jack jack-audio-connection-kit lame libass libsdl2 libtheora libva libvdpau libvorbis libvpx libwebp nv-codec-headers opus pulseaudio x264 x265
# Optional: alsa-lib amf-headers cuda dav1d fdk-aac freetype gnutls gsm jack jack-audio-connection-kit lame libass libsdl2 libtheora libva libvdpau libvorbis libvpx libwebp nv-codec-headers opus pulseaudio svt-av1 x264 x265
name=ffmpeg
version=5.1.2
release=4
version=6.0
release=1
source=(https://ffmpeg.org/releases/$name-$version.tar.bz2
ffmpeg-5.1.2-vulkan.patch
add-av_stream_get_first_dts-for-chromium.patch
ffmpeg-x264-10bit.sh)
@ -20,7 +19,7 @@ build() {
PKGMK_FFMPEG+=' --extra-cflags=-I/opt/cuda/include --extra-ldflags=-L/opt/cuda/lib64' && \
PATH="$PATH:/opt/cuda/bin"
prt-get isinst amf-headers && PKGMK_FFMPEG+=' --enable-amf'
prt-get isinst amf-headers && PKGMK_FFMPEG+=' --enable-amf'
prt-get isinst dav1d && PKGMK_FFMPEG+=' --enable-libdav1d'
prt-get isinst fdk-aac && PKGMK_FFMPEG+=' --enable-libfdk-aac --enable-nonfree'
prt-get isinst freetype && PKGMK_FFMPEG+=' --enable-libfreetype'
@ -37,12 +36,11 @@ build() {
prt-get isinst nv-codec-headers && PKGMK_FFMPEG+=' --enable-nvdec --enable-nvenc'
prt-get isinst opus && PKGMK_FFMPEG+=' --enable-libopus'
prt-get isinst pulseaudio && PKGMK_FFMPEG+=' --enable-libpulse'
prt-get isinst svt-av1 && PKGMK_FFMPEG+=' --enable-libsvtav1'
prt-get isinst x264 && PKGMK_FFMPEG+=' --enable-libx264'
prt-get isinst x265 && PKGMK_FFMPEG+=' --enable-libx265'
patch -Np1 -i $SRC/add-av_stream_get_first_dts-for-chromium.patch
patch -Np1 -i $SRC/ffmpeg-5.1.2-vulkan.patch
sed -i -e '/check_cflags -fdiagnostics-color=auto/d' configure

View File

@ -1,33 +0,0 @@
From eb0455d64690eed0068e5cb202f72ecdf899837c Mon Sep 17 00:00:00 2001
From: Lynne <dev@lynne.ee>
Date: Sun, 25 Dec 2022 01:03:30 +0100
Subject: [PATCH] hwcontext_vulkan: remove optional encode/decode extensions
from the list
They're not currently used, so they don't need to be there.
Vulkan stabilized the decode extensions less than a week ago, and their
name prefixes were changed from EXT to KHR. It's a bit too soon to be
depending on it, so rather than bumping, just remove these for now.
---
libavutil/hwcontext_vulkan.c | 8 --------
1 file changed, 8 deletions(-)
diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c
index f1db1c7291f1..2a9b5f4aac62 100644
--- a/libavutil/hwcontext_vulkan.c
+++ b/libavutil/hwcontext_vulkan.c
@@ -358,14 +358,6 @@ static const VulkanOptExtension optional_device_exts[] = {
{ VK_KHR_EXTERNAL_MEMORY_WIN32_EXTENSION_NAME, FF_VK_EXT_EXTERNAL_WIN32_MEMORY },
{ VK_KHR_EXTERNAL_SEMAPHORE_WIN32_EXTENSION_NAME, FF_VK_EXT_EXTERNAL_WIN32_SEM },
#endif
-
- /* Video encoding/decoding */
- { VK_KHR_VIDEO_QUEUE_EXTENSION_NAME, FF_VK_EXT_NO_FLAG },
- { VK_KHR_VIDEO_DECODE_QUEUE_EXTENSION_NAME, FF_VK_EXT_NO_FLAG },
- { VK_KHR_VIDEO_ENCODE_QUEUE_EXTENSION_NAME, FF_VK_EXT_NO_FLAG },
- { VK_EXT_VIDEO_ENCODE_H264_EXTENSION_NAME, FF_VK_EXT_NO_FLAG },
- { VK_EXT_VIDEO_DECODE_H264_EXTENSION_NAME, FF_VK_EXT_NO_FLAG },
- { VK_EXT_VIDEO_DECODE_H265_EXTENSION_NAME, FF_VK_EXT_NO_FLAG },
};
/* Converts return values to strings */