summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO11
-rw-r--r--015-ffmpeg-cuda11-fix.patch2
-rw-r--r--PKGBUILD36
3 files changed, 27 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 96b0b2bc1776..47b302ba5315 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -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 = 4.4.r100994.ga52b9464e4
+ pkgver = 4.4.r101737.g896395bbcf
pkgrel = 1
url = https://www.ffmpeg.org/
arch = x86_64
@@ -37,6 +37,8 @@ pkgbase = ffmpeg-full-git
depends = fontconfig
depends = freetype2
depends = fribidi
+ depends = glslang
+ depends = spirv-tools
depends = libgme
depends = gsm
depends = libiec61883
@@ -108,6 +110,7 @@ pkgbase = ffmpeg-full-git
depends = libklvanc-git
depends = openh264
depends = libopenmpt-svn
+ depends = librist
depends = shine
depends = uavs3d-git
depends = vo-amrwbenc
@@ -134,14 +137,14 @@ pkgbase = ffmpeg-full-git
source = 015-ffmpeg-cuda11-fix.patch
source = 020-ffmpeg-add-svt-hevc-g33ca9aa.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/33ca9aa8a2a2d28022d3fc03704e99ce01828376/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch
source = 030-ffmpeg-add-svt-hevc-docs-g33ca9aa.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/33ca9aa8a2a2d28022d3fc03704e99ce01828376/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch
- source = 040-ffmpeg-add-svt-vp9-ge1bbb77.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/e1bbb77ed315f417002071e93789b366d9ff997e/ffmpeg_plugin/master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch
+ source = 040-ffmpeg-add-svt-vp9-gabd5c59.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/abd5c59c06d686eae57ef4e6f899c601f791d055/ffmpeg_plugin/master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch
source = LICENSE
sha256sums = SKIP
sha256sums = 52778c70d9fe6e3a10941b99b96ac7749cec325dc1b9ee11ab75332b5ff68e50
- sha256sums = de0eeda63c2b0adf185e8c96e15872940cb8cfae5dd7590d593f56ef2c7db09d
+ sha256sums = e096996903d4e19348fabe9c61923678cbadf57299cd03809c9e06065d6ffbe2
sha256sums = 740dc9838aa47daa9f9b107178e53e384344f4c6f90865bd7e3af189257da544
sha256sums = 1499e419dda72b1604dc5e3959668f3843292ff56bfba78734e31510ba576de0
- sha256sums = 34e78efe063abc10707e47b4a3ba9d22955bfaf26d5670abb963d8f11f6b22b1
+ sha256sums = b7d722dfce20b73e9d5c73d55ffe041bbdc92a3c4a5c5d766b6b3040671b4052
sha256sums = 04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36
pkgname = ffmpeg-full-git
diff --git a/015-ffmpeg-cuda11-fix.patch b/015-ffmpeg-cuda11-fix.patch
index 23ec5c0c4126..b1b7ebab499a 100644
--- a/015-ffmpeg-cuda11-fix.patch
+++ b/015-ffmpeg-cuda11-fix.patch
@@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
-@@ -4344,10 +4344,10 @@ fi
+@@ -4351,10 +4351,10 @@ fi
if enabled cuda_nvcc; then
nvcc_default="nvcc"
diff --git a/PKGBUILD b/PKGBUILD
index 47163e8d543f..496b0ee1d02b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,10 @@
# Maintainer: Daniel Bermond <dbermond@archlinux.org>
_svt_hevc_ver='33ca9aa8a2a2d28022d3fc03704e99ce01828376'
-_svt_vp9_ver='e1bbb77ed315f417002071e93789b366d9ff997e'
+_svt_vp9_ver='abd5c59c06d686eae57ef4e6f899c601f791d055'
pkgname=ffmpeg-full-git
-pkgver=4.4.r100994.ga52b9464e4
+pkgver=4.4.r101737.g896395bbcf
pkgrel=1
pkgdesc='Complete solution to record, convert and stream audio and video (all possible features including libfdk-aac; git version)'
arch=('x86_64')
@@ -15,20 +15,20 @@ depends=(
'alsa-lib' 'avisynthplus' 'bzip2' 'frei0r-plugins' 'libgcrypt' 'gmp' 'gnutls'
'ladspa' 'libass' 'aom' 'aribb24' 'libbluray' 'libbs2b' 'libcaca' 'celt'
'libcdio-paranoia' 'codec2' 'dav1d' 'libdc1394' 'libavc1394' 'libfdk-aac'
- 'fontconfig' 'freetype2' 'fribidi' 'libgme' 'gsm' 'libiec61883'
- 'libilbc' 'jack' 'kvazaar' 'libmodplug' 'lame' 'opencore-amr'
- 'openjpeg2' 'opus' 'libpulse' 'librabbitmq-c' 'rav1e' 'librsvg' 'rubberband'
- 'rtmpdump' 'smbclient' 'snappy' 'libsoxr' 'speex' 'srt' 'libssh' 'svt-hevc'
- 'svt-av1' 'svt-vp9' 'tensorflow' 'tesseract' 'libtheora' 'twolame' 'v4l-utils'
- 'vid.stab' 'vmaf' 'libvorbis' 'libvpx' 'libwebp' 'x264' 'x265' 'libxcb'
- 'xvidcore' 'libxml2' 'zimg' 'zeromq' 'zvbi' 'lv2' 'lilv' 'xz' 'libmysofa'
- 'openal' 'ocl-icd' 'libgl' 'sndio' 'sdl2' 'vapoursynth' 'vulkan-icd-loader'
- 'libxv' 'libx11' 'libxext' 'zlib' 'cuda' 'libomxil-bellagio' 'libdrm'
- 'intel-media-sdk' 'libva' 'libvdpau'
+ 'fontconfig' 'freetype2' 'fribidi' 'glslang' 'spirv-tools' 'libgme' 'gsm'
+ 'libiec61883' 'libilbc' 'jack' 'kvazaar' 'libmodplug' 'lame'
+ 'opencore-amr' 'openjpeg2' 'opus' 'libpulse' 'librabbitmq-c' 'rav1e' 'librsvg'
+ 'rubberband' 'rtmpdump' 'smbclient' 'snappy' 'libsoxr' 'speex' 'srt' 'libssh'
+ 'svt-hevc' 'svt-av1' 'svt-vp9' 'tensorflow' 'tesseract' 'libtheora' 'twolame'
+ 'v4l-utils' 'vid.stab' 'vmaf' 'libvorbis' 'libvpx' 'libwebp' 'x264' 'x265'
+ 'libxcb' 'xvidcore' 'libxml2' 'zimg' 'zeromq' 'zvbi' 'lv2' 'lilv' 'xz'
+ 'libmysofa' 'openal' 'ocl-icd' 'libgl' 'sndio' 'sdl2' 'vapoursynth'
+ 'vulkan-icd-loader' 'libxv' 'libx11' 'libxext' 'zlib' 'cuda'
+ 'libomxil-bellagio' 'libdrm' 'intel-media-sdk' 'libva' 'libvdpau'
# AUR:
'chromaprint-fftw' 'davs2' 'flite1-patched' 'libklvanc-git' 'openh264'
- 'libopenmpt-svn' 'shine' 'uavs3d-git' 'vo-amrwbenc' 'xavs' 'xavs2'
- 'pocketsphinx' 'rockchip-mpp' 'lensfun-git'
+ 'libopenmpt-svn' 'librist' 'shine' 'uavs3d-git' 'vo-amrwbenc' 'xavs'
+ 'xavs2' 'pocketsphinx' 'rockchip-mpp' 'lensfun-git'
)
makedepends=(
# official repositories:
@@ -50,10 +50,10 @@ source=('git+https://git.ffmpeg.org/ffmpeg.git'
'LICENSE')
sha256sums=('SKIP'
'52778c70d9fe6e3a10941b99b96ac7749cec325dc1b9ee11ab75332b5ff68e50'
- 'de0eeda63c2b0adf185e8c96e15872940cb8cfae5dd7590d593f56ef2c7db09d'
+ 'e096996903d4e19348fabe9c61923678cbadf57299cd03809c9e06065d6ffbe2'
'740dc9838aa47daa9f9b107178e53e384344f4c6f90865bd7e3af189257da544'
'1499e419dda72b1604dc5e3959668f3843292ff56bfba78734e31510ba576de0'
- '34e78efe063abc10707e47b4a3ba9d22955bfaf26d5670abb963d8f11f6b22b1'
+ 'b7d722dfce20b73e9d5c73d55ffe041bbdc92a3c4a5c5d766b6b3040671b4052'
'04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36')
prepare() {
@@ -80,6 +80,7 @@ build() {
--prefix='/usr' \
--extra-cflags='-I/opt/cuda/include -I/usr/include/tensorflow' \
--extra-ldflags='-L/opt/cuda/lib64' \
+ --enable-lto \
\
--disable-rpath \
--enable-gpl \
@@ -118,7 +119,7 @@ build() {
--enable-fontconfig \
--enable-libfreetype \
--enable-libfribidi \
- --disable-libglslang \
+ --enable-libglslang \
--enable-libgme \
--enable-libgsm \
--enable-libiec61883 \
@@ -140,6 +141,7 @@ build() {
--enable-libpulse \
--enable-librabbitmq \
--enable-librav1e \
+ --enable-librist \
--enable-librsvg \
--enable-librubberband \
--enable-librtmp \