Update to version 6.0

This commit is contained in:
Daniel Bermond
2023-03-09 16:35:23 -03:00
parent c960d54825
commit b6d86646ed
4 changed files with 143 additions and 59 deletions
+20 -24
View File
@@ -1,13 +1,13 @@
pkgbase = ffmpeg-full
pkgdesc = Complete solution to record, convert and stream audio and video (all possible features including libfdk-aac)
pkgver = 5.1.2
pkgrel = 4
pkgver = 6.0
pkgrel = 1
url = https://www.ffmpeg.org/
arch = x86_64
license = custom: nonfree and unredistributable
makedepends = clang
makedepends = amf-headers
makedepends = ffnvcodec-headers
makedepends = ffnvcodec-headers-git
makedepends = nasm
makedepends = opencl-headers
makedepends = vulkan-headers
@@ -21,15 +21,15 @@ pkgbase = ffmpeg-full
depends = codec2
depends = cuda
depends = dav1d
depends = flite1
depends = fontconfig
depends = freetype2
depends = frei0r-plugins
depends = fribidi
depends = glslang
depends = frei0r-plugins
depends = gmp
depends = gnutls
depends = gsm
depends = intel-media-sdk
depends = jack
depends = kvazaar
depends = ladspa
@@ -45,21 +45,22 @@ pkgbase = ffmpeg-full
depends = libdc1394
depends = libdrm
depends = libfdk-aac
depends = libgme
depends = libgl
depends = libgcrypt
depends = libgl
depends = libgme
depends = libiec61883
depends = libilbc
depends = libjxl
depends = libmodplug
depends = libmysofa
depends = libomxil-bellagio
depends = libopenmpt
depends = libplacebo
depends = libpulse
depends = librabbitmq-c
depends = librsvg
depends = libssh
depends = libsoxr
depends = libssh
depends = libtheora
depends = libva
depends = libvdpau
@@ -74,15 +75,15 @@ pkgbase = ffmpeg-full
depends = lilv
depends = lv2
depends = ocl-icd
depends = onevpl
depends = openal
depends = opencore-amr
depends = openh264
depends = openjpeg2
depends = libopenmpt
depends = opus
depends = rav1e
depends = rubberband
depends = rtmpdump
depends = rubberband
depends = sdl2
depends = smbclient
depends = snappy
@@ -110,7 +111,6 @@ pkgbase = ffmpeg-full
depends = zvbi
depends = chromaprint-fftw
depends = davs2
depends = flite1
depends = libklvanc-git
depends = librist
depends = rockchip-mpp
@@ -129,24 +129,20 @@ pkgbase = ffmpeg-full
provides = libswresample.so
provides = ffmpeg
conflicts = ffmpeg
source = https://ffmpeg.org/releases/ffmpeg-5.1.2.tar.xz
source = https://ffmpeg.org/releases/ffmpeg-5.1.2.tar.xz.asc
source = 010-ffmpeg-add-svt-hevc-gb62f72e.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/b62f72e752243cee4104cfb41dc7ee409d3ac3e9/ffmpeg_plugin/master-0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch
source = 030-ffmpeg-add-svt-vp9-gd9ef3cc.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/d9ef3cc13159143b9afc776c04f67cdfa6284046/ffmpeg_plugin/master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch
source = https://ffmpeg.org/releases/ffmpeg-6.0.tar.xz
source = https://ffmpeg.org/releases/ffmpeg-6.0.tar.xz.asc
source = 010-ffmpeg-add-svt-hevc-geb24a06.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/eb24a06ba4ee4948f219a3246b88439a8090bd37/ffmpeg_plugin/master-0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch
source = 030-ffmpeg-add-svt-vp9-gaaa8140.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/aaa8140c8cdf6c073eaa6aaa5d003d1535fd0059/ffmpeg_plugin/master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch
source = 040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch
source = 060-ffmpeg-fix-segfault-with-avisynthplus.patch
source = 070-ffmpeg-fix-v4l2-memory-leak.patch::https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/30aa0c3f4873a92c5e3da8ba8cf030de56bf4cf7
source = 080-ffmpeg-vulkan-headers-1.3.240-fix.patch::https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/eb0455d64690eed0068e5cb202f72ecdf899837c
source = LICENSE
validpgpkeys = FCF986EA15E6E293A5644F10B4322F04D67658D8
sha256sums = 619e706d662c8420859832ddc259cd4d4096a48a2ce1eefd052db9e440eef3dc
sha256sums = 57be87c22d9b49c112b6d24bc67d42508660e6b718b3db89c44e47e289137082
sha256sums = SKIP
sha256sums = 4da3826aa370572273ef9fb4c0bf2c93a840595b07a671a0412ad0dc9ed8d689
sha256sums = e310eedb3dc88c8ad6ffcd6cb6bde1f593ded330ea99b0356724c9d22bcfde4c
sha256sums = 2df82046908015bf26bc1303275cf52ba01fa380029a54ea6415373e389e423c
sha256sums = b1d68f626168f2409a4b0987acf5b208e7ced2ddab49b11990a10f458d377e9a
sha256sums = 9e4e290378028cd4474c36d3e3a25f77d4f40424dbd3115632e20c5734b50979
sha256sums = 99369be480f6ccd9ba2964961141869ff362505e605cd9fe6ba78228ca1f788d
sha256sums = e8fdc940474f3819b9a8d30cab8164774584c051322acb6194bcb03d56e8175a
sha256sums = d8b91ea5f07d0208cbe0290567083808708014a1953fda322d13cb619349c9ee
sha256sums = d1ad786df86354d218a70b306a50961736c0a6e2d2716bf8de3db31d79957df9
sha256sums = bf563193f450ece58a93db6840c0db33875df945fa81477b9b02fb209d3bf57a
sha256sums = 04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36
pkgname = ffmpeg-full
@@ -1,8 +1,8 @@
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -1128,6 +1128,10 @@ struct AVCodecParserContext *av_stream_get_parser(const AVStream *s);
*/
@@ -1019,6 +1019,10 @@ attribute_deprecated
int64_t av_stream_get_end_pts(const AVStream *st);
#endif
+// Chromium: We use the internal field first_dts vvv
+int64_t av_stream_get_first_dts(const AVStream *st);
@@ -1,6 +1,6 @@
--- a/libavformat/avisynth.c
+++ b/libavformat/avisynth.c
@@ -127,7 +127,7 @@ static av_cold void avisynth_atexit_handler(void);
@@ -141,7 +141,7 @@ static av_cold void avisynth_atexit_handler(void);
static av_cold int avisynth_load_library(void)
{
+120 -32
View File
@@ -2,52 +2,142 @@
# Contributor: Iacopo Isimbaldi <isiachi@rhye.it>
pkgname=ffmpeg-full
pkgver=5.1.2
pkgrel=4
pkgver=6.0
pkgrel=1
_svt_hevc_ver='eb24a06ba4ee4948f219a3246b88439a8090bd37'
_svt_vp9_ver='aaa8140c8cdf6c073eaa6aaa5d003d1535fd0059'
pkgdesc='Complete solution to record, convert and stream audio and video (all possible features including libfdk-aac)'
arch=('x86_64')
url='https://www.ffmpeg.org/'
license=('custom: nonfree and unredistributable')
depends=('alsa-lib' 'aom' 'aribb24' 'avisynthplus' 'bzip2' 'celt' 'codec2' 'cuda'
'dav1d' 'fontconfig' 'freetype2' 'fribidi' 'glslang' 'frei0r-plugins' 'gmp'
'gnutls' 'gsm' 'intel-media-sdk' 'jack' 'kvazaar' 'ladspa' 'lame' 'libavc1394'
'lcms2' 'lensfun-git' 'libass' 'libbluray' 'libbs2b' 'libcaca' 'libcdio-paranoia'
'libdc1394' 'libdrm' 'libfdk-aac' 'libgme' 'libgl' 'libgcrypt' 'libiec61883'
'libilbc' 'libjxl' 'libmodplug' 'libmysofa' 'libomxil-bellagio' 'libplacebo'
'libpulse' 'librabbitmq-c' 'librsvg' 'libssh' 'libsoxr' 'libtheora' 'libva'
'libvdpau' 'libvorbis' 'libvpx' 'libx11' 'libxcb' 'libxext' 'libxml2' 'libxv'
'libwebp' 'lilv' 'lv2' 'ocl-icd' 'openal' 'opencore-amr' 'openh264' 'openjpeg2'
'libopenmpt' 'opus' 'rav1e' 'rubberband' 'rtmpdump' 'sdl2' 'smbclient' 'snappy'
'sndio' 'speex' 'spirv-tools' 'srt' 'svt-av1' 'svt-hevc' 'svt-vp9' 'tesseract'
'twolame' 'v4l-utils' 'vapoursynth' 'vid.stab' 'vmaf' 'vulkan-icd-loader' 'x264'
'x265' 'xvidcore' 'xz' 'zeromq' 'zimg' 'zlib' 'zvbi'
'chromaprint-fftw' 'davs2' 'flite1' 'libklvanc-git' 'librist'
'rockchip-mpp' 'shine' 'uavs3d-git' 'vo-amrwbenc' 'xavs' 'xavs2')
makedepends=('clang' 'amf-headers' 'ffnvcodec-headers' 'nasm' 'opencl-headers'
depends=(
'alsa-lib'
'aom'
'aribb24'
'avisynthplus'
'bzip2'
'celt'
'codec2'
'cuda'
'dav1d'
'flite1'
'fontconfig'
'freetype2'
'frei0r-plugins'
'fribidi'
'glslang'
'gmp'
'gnutls'
'gsm'
'jack'
'kvazaar'
'ladspa'
'lame'
'libavc1394'
'lcms2'
'lensfun-git'
'libass'
'libbluray'
'libbs2b'
'libcaca'
'libcdio-paranoia'
'libdc1394'
'libdrm'
'libfdk-aac'
'libgcrypt'
'libgl'
'libgme'
'libiec61883'
'libilbc'
'libjxl'
'libmodplug'
'libmysofa'
'libomxil-bellagio'
'libopenmpt'
'libplacebo'
'libpulse'
'librabbitmq-c'
'librsvg'
'libsoxr'
'libssh'
'libtheora'
'libva'
'libvdpau'
'libvorbis'
'libvpx'
'libx11'
'libxcb'
'libxext'
'libxml2'
'libxv'
'libwebp'
'lilv'
'lv2'
'ocl-icd'
'onevpl'
'openal'
'opencore-amr'
'openh264'
'openjpeg2'
'opus'
'rav1e'
'rtmpdump'
'rubberband'
'sdl2'
'smbclient'
'snappy'
'sndio'
'speex'
'spirv-tools'
'srt'
'svt-av1'
'svt-hevc'
'svt-vp9'
'tesseract'
'twolame'
'v4l-utils'
'vapoursynth'
'vid.stab'
'vmaf'
'vulkan-icd-loader'
'x264'
'x265'
'xvidcore'
'xz'
'zeromq'
'zimg'
'zlib'
'zvbi'
'chromaprint-fftw'
'davs2'
'libklvanc-git'
'librist'
'rockchip-mpp'
'shine'
'uavs3d-git'
'vo-amrwbenc'
'xavs'
'xavs2'
)
makedepends=('clang' 'amf-headers' 'ffnvcodec-headers-git' 'nasm' 'opencl-headers'
'vulkan-headers' 'decklink-sdk')
provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
'libavutil.so' 'libpostproc.so' 'libswscale.so' 'libswresample.so'
'ffmpeg')
conflicts=('ffmpeg')
_svt_hevc_ver='b62f72e752243cee4104cfb41dc7ee409d3ac3e9'
_svt_vp9_ver='d9ef3cc13159143b9afc776c04f67cdfa6284046'
source=("https://ffmpeg.org/releases/ffmpeg-${pkgver}.tar.xz"{,.asc}
"010-ffmpeg-add-svt-hevc-g${_svt_hevc_ver:0:7}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/${_svt_hevc_ver}/ffmpeg_plugin/master-0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch"
#"020-ffmpeg-add-svt-hevc-docs-g${_svt_hevc_ver:0:7}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/${_svt_hevc_ver}/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch"
"030-ffmpeg-add-svt-vp9-g${_svt_vp9_ver:0:7}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/${_svt_vp9_ver}/ffmpeg_plugin/master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch"
'040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch'
'060-ffmpeg-fix-segfault-with-avisynthplus.patch'
'070-ffmpeg-fix-v4l2-memory-leak.patch'::'https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/30aa0c3f4873a92c5e3da8ba8cf030de56bf4cf7'
'080-ffmpeg-vulkan-headers-1.3.240-fix.patch'::'https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/eb0455d64690eed0068e5cb202f72ecdf899837c'
'LICENSE')
sha256sums=('619e706d662c8420859832ddc259cd4d4096a48a2ce1eefd052db9e440eef3dc'
sha256sums=('57be87c22d9b49c112b6d24bc67d42508660e6b718b3db89c44e47e289137082'
'SKIP'
'4da3826aa370572273ef9fb4c0bf2c93a840595b07a671a0412ad0dc9ed8d689'
'e310eedb3dc88c8ad6ffcd6cb6bde1f593ded330ea99b0356724c9d22bcfde4c'
'2df82046908015bf26bc1303275cf52ba01fa380029a54ea6415373e389e423c'
'b1d68f626168f2409a4b0987acf5b208e7ced2ddab49b11990a10f458d377e9a'
'9e4e290378028cd4474c36d3e3a25f77d4f40424dbd3115632e20c5734b50979'
'99369be480f6ccd9ba2964961141869ff362505e605cd9fe6ba78228ca1f788d'
'e8fdc940474f3819b9a8d30cab8164774584c051322acb6194bcb03d56e8175a'
'd8b91ea5f07d0208cbe0290567083808708014a1953fda322d13cb619349c9ee'
'd1ad786df86354d218a70b306a50961736c0a6e2d2716bf8de3db31d79957df9'
'bf563193f450ece58a93db6840c0db33875df945fa81477b9b02fb209d3bf57a'
'04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36')
validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8')
@@ -58,8 +148,6 @@ prepare() {
patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/030-ffmpeg-add-svt-vp9-g${_svt_vp9_ver:0:7}.patch"
patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch"
patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/060-ffmpeg-fix-segfault-with-avisynthplus.patch"
patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/070-ffmpeg-fix-v4l2-memory-leak.patch"
patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/080-ffmpeg-vulkan-headers-1.3.240-fix.patch"
}
build() {
@@ -196,7 +284,7 @@ build() {
--enable-cuvid \
--enable-ffnvcodec \
--enable-libdrm \
--enable-libmfx \
--enable-libvpl \
--enable-libnpp \
--enable-nvdec \
--enable-nvenc \