diff options
| -rw-r--r-- | .SRCINFO | 28 | ||||
| -rw-r--r-- | 011-ffmpeg-add-svt-hevc-g78bcaa7.patch | 10 | ||||
| -rw-r--r-- | 031-ffmpeg-add-svt-vp9-g3ecdf8f.patch | 10 | ||||
| -rw-r--r-- | 050-ffmpeg-fix-segfault-with-avisynthplus.patch (renamed from 060-ffmpeg-fix-segfault-with-avisynthplus.patch) | 0 | ||||
| -rw-r--r-- | 060-ffmpeg-fix-nvidia-vulkan-decoding-segfault.patch | 12 | ||||
| -rw-r--r-- | 070-ffmpeg-gcc14-fix-flite-callback-pointer-type.patch | 14 | ||||
| -rw-r--r-- | PKGBUILD | 39 |
7 files changed, 60 insertions, 53 deletions
@@ -1,6 +1,6 @@ pkgbase = ffmpeg-full-git pkgdesc = Complete solution to record, convert and stream audio and video (all possible features including libfdk-aac; git version) - pkgver = 6.2.r114545.g199c479b9a + pkgver = 7.1.r115182.g0d9591841b pkgrel = 1 url = https://www.ffmpeg.org/ arch = x86_64 @@ -71,6 +71,7 @@ pkgbase = ffmpeg-full-git depends = libva depends = libvdpau depends = libvorbis + depends = libvpl depends = libvpx depends = libx11 depends = libxcb @@ -81,8 +82,6 @@ pkgbase = ffmpeg-full-git depends = lilv depends = lv2 depends = ocl-icd - depends = onevpl - depends = onevpl-intel-gpu depends = openal depends = opencore-amr depends = opencv2 @@ -91,6 +90,7 @@ pkgbase = ffmpeg-full-git depends = openvino depends = opus depends = qrencode + depends = quirc depends = rav1e depends = rtmpdump depends = rubberband @@ -104,13 +104,13 @@ pkgbase = ffmpeg-full-git depends = svt-av1 depends = svt-hevc depends = svt-vp9 - depends = tensorflow depends = tesseract depends = twolame depends = v4l-utils depends = vapoursynth depends = vid.stab depends = vmaf + depends = vpl-runtime depends = vulkan-icd-loader depends = x264 depends = x265 @@ -145,22 +145,22 @@ pkgbase = ffmpeg-full-git provides = ffmpeg-git conflicts = ffmpeg source = git+https://git.ffmpeg.org/ffmpeg.git - source = 010-ffmpeg-add-svt-hevc-g78bcaa7.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/78bcaa7bdefa0dd593149517ce41842d528d596f/ffmpeg_plugin/master-0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch - source = 011-ffmpeg-add-svt-hevc-g78bcaa7.patch - source = 020-ffmpeg-add-svt-hevc-docs-g78bcaa7.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/78bcaa7bdefa0dd593149517ce41842d528d596f/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch - source = 030-ffmpeg-add-svt-vp9-g3ecdf8f.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/3ecdf8f88037367e175198adda6e43662129af0b/ffmpeg_plugin/master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch - source = 031-ffmpeg-add-svt-vp9-g3ecdf8f.patch + source = 010-ffmpeg-add-svt-hevc-ged80959.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/ed80959ebb5586aa7763c91a397d44be1798587c/ffmpeg_plugin/master-0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch + source = 020-ffmpeg-add-svt-hevc-docs-ged80959.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/ed80959ebb5586aa7763c91a397d44be1798587c/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch + source = 030-ffmpeg-add-svt-vp9-g3b9a3fa.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/3b9a3fa43da4cc5fe60c7d22afe2be15341392ea/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 = 050-ffmpeg-fix-segfault-with-avisynthplus.patch + source = 060-ffmpeg-fix-nvidia-vulkan-decoding-segfault.patch + source = 070-ffmpeg-gcc14-fix-flite-callback-pointer-type.patch source = LICENSE sha256sums = SKIP - sha256sums = 0d02cd40a3e742cae2f1af87025e2a4f68644a86cc1f4b67af125e0bb0c53332 - sha256sums = dccab7d1ad9bc7950b07b4a3f971bd57de922b56448ef702a5cc2b2755b6f965 + sha256sums = 9047e18d34716812d4ea7eafc1d0fd8b376d922a4b6b4dc20237662fcaf0c996 sha256sums = a164ebdc4d281352bf7ad1b179aae4aeb33f1191c444bed96cb8ab333c046f81 - sha256sums = 81daf4d5ecfd505f4492981af5105d2786368be21d29329dd244d6c455c945c7 - sha256sums = e350b586a57706895ce3608c7bc456422a3f9b8e154db25298abe237640aa2c3 + sha256sums = 59da61f2b2c556fbe0cdbf84bcc00977ee3d2447085decb21f6298226559f2aa sha256sums = b54b47f4f3837ddc41227bd2202ea3c62e2ddb06c6cfbd7a9adc304d641d79ba sha256sums = 0e277c0d5e33612ca7a11025958133b17bfbe23168b0aee5bd07f674f6fd7440 + sha256sums = f2f73793a45c9dffb033f23c1b10a612abe6528cbd06c04b06e8189d1ef208be + sha256sums = db46443b5e83b70c89271802742c62aac059ee07f1ff9c7bf45480c0fd57c394 sha256sums = 04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36 pkgname = ffmpeg-full-git diff --git a/011-ffmpeg-add-svt-hevc-g78bcaa7.patch b/011-ffmpeg-add-svt-hevc-g78bcaa7.patch deleted file mode 100644 index 6391fc0bc67d..000000000000 --- a/011-ffmpeg-add-svt-hevc-g78bcaa7.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/libavcodec/libsvt_hevc.c -+++ b/libavcodec/libsvt_hevc.c -@@ -24,6 +24,7 @@ - - #include "libavutil/common.h" - #include "libavutil/frame.h" -+#include "libavutil/mem.h" - #include "libavutil/opt.h" - - #include "codec_internal.h" diff --git a/031-ffmpeg-add-svt-vp9-g3ecdf8f.patch b/031-ffmpeg-add-svt-vp9-g3ecdf8f.patch deleted file mode 100644 index ee3d673be741..000000000000 --- a/031-ffmpeg-add-svt-vp9-g3ecdf8f.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/libavcodec/libsvt_vp9.c -+++ b/libavcodec/libsvt_vp9.c -@@ -26,6 +26,7 @@ - - #include "libavutil/common.h" - #include "libavutil/frame.h" -+#include "libavutil/mem.h" - #include "libavutil/opt.h" - #include "libavcodec/get_bits.h" - diff --git a/060-ffmpeg-fix-segfault-with-avisynthplus.patch b/050-ffmpeg-fix-segfault-with-avisynthplus.patch index 9e2ddb399c9e..9e2ddb399c9e 100644 --- a/060-ffmpeg-fix-segfault-with-avisynthplus.patch +++ b/050-ffmpeg-fix-segfault-with-avisynthplus.patch diff --git a/060-ffmpeg-fix-nvidia-vulkan-decoding-segfault.patch b/060-ffmpeg-fix-nvidia-vulkan-decoding-segfault.patch new file mode 100644 index 000000000000..7caf065eb55a --- /dev/null +++ b/060-ffmpeg-fix-nvidia-vulkan-decoding-segfault.patch @@ -0,0 +1,12 @@ +--- a/libavutil/vulkan.c ++++ b/libavutil/vulkan.c +@@ -607,6 +607,9 @@ int ff_vk_exec_add_dep_frame(FFVulkanContext *s, FFVkExecContext *e, AVFrame *f, + uint32_t *queue_family_dst; + VkAccessFlagBits *access_dst; + ++ if (!f || !f->hw_frames_ctx) ++ return 1; ++ + AVHWFramesContext *hwfc = (AVHWFramesContext *)f->hw_frames_ctx->data; + AVVulkanFramesContext *vkfc = hwfc->hwctx; + AVVkFrame *vkf = (AVVkFrame *)f->data[0]; diff --git a/070-ffmpeg-gcc14-fix-flite-callback-pointer-type.patch b/070-ffmpeg-gcc14-fix-flite-callback-pointer-type.patch new file mode 100644 index 000000000000..b4567e8dfb2b --- /dev/null +++ b/070-ffmpeg-gcc14-fix-flite-callback-pointer-type.patch @@ -0,0 +1,14 @@ +--- a/libavfilter/asrc_flite.c ++++ b/libavfilter/asrc_flite.c +@@ -147,9 +147,9 @@ static int select_voice(struct voice_entry **entry_ret, const char *voice_name, + } + + static int audio_stream_chunk_by_word(const cst_wave *wave, int start, int size, +- int last, cst_audio_streaming_info *asi) ++ int last, void *asi) + { +- FliteContext *flite = asi->userdata; ++ FliteContext *flite = ((cst_audio_streaming_info *)asi)->userdata; + void *const ptr[8] = { &wave->samples[start] }; + + flite->nb_channels = wave->num_channels; @@ -1,10 +1,10 @@ # Maintainer: Daniel Bermond <dbermond@archlinux.org> pkgname=ffmpeg-full-git -pkgver=6.2.r114545.g199c479b9a +pkgver=7.1.r115182.g0d9591841b pkgrel=1 -_svt_hevc_ver='78bcaa7bdefa0dd593149517ce41842d528d596f' -_svt_vp9_ver='3ecdf8f88037367e175198adda6e43662129af0b' +_svt_hevc_ver='ed80959ebb5586aa7763c91a397d44be1798587c' +_svt_vp9_ver='3b9a3fa43da4cc5fe60c7d22afe2be15341392ea' pkgdesc='Complete solution to record, convert and stream audio and video (all possible features including libfdk-aac; git version)' arch=('x86_64') url='https://www.ffmpeg.org/' @@ -68,6 +68,7 @@ depends=( 'libva' 'libvdpau' 'libvorbis' + 'libvpl' 'libvpx' 'libx11' 'libxcb' @@ -78,8 +79,6 @@ depends=( 'lilv' 'lv2' 'ocl-icd' - 'onevpl' - 'onevpl-intel-gpu' 'openal' 'opencore-amr' 'opencv2' @@ -88,6 +87,7 @@ depends=( 'openvino' 'opus' 'qrencode' + 'quirc' 'rav1e' 'rtmpdump' 'rubberband' @@ -101,13 +101,13 @@ depends=( 'svt-av1' 'svt-hevc' 'svt-vp9' - 'tensorflow' 'tesseract' 'twolame' 'v4l-utils' 'vapoursynth' 'vid.stab' 'vmaf' + 'vpl-runtime' 'vulkan-icd-loader' 'x264' 'x265' @@ -140,21 +140,21 @@ source=('git+https://git.ffmpeg.org/ffmpeg.git' #"005-ffmpeg-add-svt-hevc-g${_svt_hevc_ver:0:7}.patch" #"006-ffmpeg-add-svt-vp9-g${_svt_vp9_ver:0:7}.patch" "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" - "011-ffmpeg-add-svt-hevc-g${_svt_hevc_ver:0:7}.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" - "031-ffmpeg-add-svt-vp9-g${_svt_vp9_ver:0:7}.patch" '040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch' - '060-ffmpeg-fix-segfault-with-avisynthplus.patch' + '050-ffmpeg-fix-segfault-with-avisynthplus.patch' + '060-ffmpeg-fix-nvidia-vulkan-decoding-segfault.patch' + '070-ffmpeg-gcc14-fix-flite-callback-pointer-type.patch' 'LICENSE') sha256sums=('SKIP' - '0d02cd40a3e742cae2f1af87025e2a4f68644a86cc1f4b67af125e0bb0c53332' - 'dccab7d1ad9bc7950b07b4a3f971bd57de922b56448ef702a5cc2b2755b6f965' + '9047e18d34716812d4ea7eafc1d0fd8b376d922a4b6b4dc20237662fcaf0c996' 'a164ebdc4d281352bf7ad1b179aae4aeb33f1191c444bed96cb8ab333c046f81' - '81daf4d5ecfd505f4492981af5105d2786368be21d29329dd244d6c455c945c7' - 'e350b586a57706895ce3608c7bc456422a3f9b8e154db25298abe237640aa2c3' + '59da61f2b2c556fbe0cdbf84bcc00977ee3d2447085decb21f6298226559f2aa' 'b54b47f4f3837ddc41227bd2202ea3c62e2ddb06c6cfbd7a9adc304d641d79ba' '0e277c0d5e33612ca7a11025958133b17bfbe23168b0aee5bd07f674f6fd7440' + 'f2f73793a45c9dffb033f23c1b10a612abe6528cbd06c04b06e8189d1ef208be' + 'db46443b5e83b70c89271802742c62aac059ee07f1ff9c7bf45480c0fd57c394' '04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36') prepare() { @@ -166,12 +166,12 @@ prepare() { # "030-ffmpeg-add-svt-vp9-g${_svt_vp9_ver:0:7}.patch" #patch -Np1 -i "006-ffmpeg-add-svt-vp9-g${_svt_vp9_ver:0:7}.patch" patch -d ffmpeg -Np1 -i "${srcdir}/010-ffmpeg-add-svt-hevc-g${_svt_hevc_ver:0:7}.patch" - patch -d ffmpeg -Np1 -i "${srcdir}/011-ffmpeg-add-svt-hevc-g${_svt_hevc_ver:0:7}.patch" patch -d ffmpeg -Np1 -i "${srcdir}/020-ffmpeg-add-svt-hevc-docs-g${_svt_hevc_ver:0:7}.patch" patch -d ffmpeg -Np1 -i "${srcdir}/030-ffmpeg-add-svt-vp9-g${_svt_vp9_ver:0:7}.patch" - patch -d ffmpeg -Np1 -i "${srcdir}/031-ffmpeg-add-svt-vp9-g${_svt_vp9_ver:0:7}.patch" patch -d ffmpeg -Np1 -i "${srcdir}/040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch" - patch -d ffmpeg -Np1 -i "${srcdir}/060-ffmpeg-fix-segfault-with-avisynthplus.patch" + patch -d ffmpeg -Np1 -i "${srcdir}/050-ffmpeg-fix-segfault-with-avisynthplus.patch" + patch -d ffmpeg -Np1 -i "${srcdir}/060-ffmpeg-fix-nvidia-vulkan-decoding-segfault.patch" + patch -d ffmpeg -Np1 -i "${srcdir}/070-ffmpeg-gcc14-fix-flite-callback-pointer-type.patch" } pkgver() { @@ -184,12 +184,12 @@ build() { cd ffmpeg printf '%s\n' ' -> Running ffmpeg configure script...' + export CFLAGS+=' -I/opt/cuda/include' + export LDFLAGS+=' -L/opt/cuda/lib64' export PKG_CONFIG_PATH="/opt/intel/openvino/runtime/lib/intel64/pkgconfig${PKG_CONFIG_PATH:+":${PKG_CONFIG_PATH}"}" ./configure \ --prefix='/usr' \ - --extra-cflags='-I/opt/cuda/include -I/usr/include/tensorflow' \ - --extra-ldflags='-L/opt/cuda/lib64' \ --enable-lto \ \ --disable-rpath \ @@ -255,6 +255,7 @@ build() { --enable-libplacebo \ --enable-libpulse \ --enable-libqrencode \ + --enable-libquirc \ --enable-librabbitmq \ --enable-librav1e \ --enable-librist \ @@ -272,7 +273,7 @@ build() { --enable-libsvtav1 \ --enable-libsvthevc \ --enable-libsvtvp9 \ - --enable-libtensorflow \ + --disable-libtensorflow \ --enable-libtesseract \ --enable-libtheora \ --disable-libtls \ |