summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2020-06-04 19:45:31 +0000
committerDaniel Bermond2020-06-04 19:45:31 +0000
commitb8ff88dc6ae532d589d1b0c12874f170a90067e4 (patch)
tree4aa2bd9a1cfc8d59ca187a57ca974251bdca920e
parent0f09146ec06c03ad07501314138c8866d589e03e (diff)
downloadaur-b8ff88dc6ae532d589d1b0c12874f170a90067e4.tar.gz
Fix svt-av1 build
Some function declarations were moved to packet_internal.h[1]. This fixes the following build error: libavcodec/libsvt_av1.c: In function ‘eb_receive_packet’: libavcodec/libsvt_av1.c:396:5: error: implicit declaration of function ‘ff_side_data_set_encoder_stats’ [-Werror=implicit-function-declaration] 396 | ff_side_data_set_encoder_stats(pkt, headerPtr->qp * FF_QP2LAMBDA, NULL, 0, pict_type); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ References ---------- https://github.com/FFmpeg/FFmpeg/commit/6e1903938befc0bce2f64e01770af2f65d625cfc
-rw-r--r--.SRCINFO4
-rw-r--r--050-ffmpeg-fix-svt-av1.patch10
-rw-r--r--PKGBUILD15
3 files changed, 22 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 245d8310610..3d1c34ead5d 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.3.r98015.ga886785018
+ pkgver = 4.3.r98041.ge34686d7ac
pkgrel = 1
url = https://www.ffmpeg.org/
arch = x86_64
@@ -134,12 +134,14 @@ pkgbase = ffmpeg-full-git
source = 020-ffmpeg-add-svt-hevc-1.4.3.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/v1.4.3/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch
source = 030-ffmpeg-add-svt-hevc-docs-1.4.3.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/v1.4.3/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch
source = 040-ffmpeg-add-svt-av1-0.8.3.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-AV1/v0.8.3/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch
+ source = 050-ffmpeg-fix-svt-av1.patch
source = LICENSE
sha256sums = SKIP
sha256sums = b6fcef2f4cbb1daa47d17245702fbd67ab3289b6b16f090ab99b9c2669453a02
sha256sums = 878757eb6d7072521caaeb71f1453ec3fc0f91a12936ef302e1625184787c6a6
sha256sums = 1499e419dda72b1604dc5e3959668f3843292ff56bfba78734e31510ba576de0
sha256sums = d371366ceda9233c1b9a60c680878f567861b675605a8dae5c275d633c51ba9f
+ sha256sums = 462a5f6bf588c199fb0a162fc00a4de22b5a2506dc811cfd6e989f54166b0ad8
sha256sums = 04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36
pkgname = ffmpeg-full-git
diff --git a/050-ffmpeg-fix-svt-av1.patch b/050-ffmpeg-fix-svt-av1.patch
new file mode 100644
index 00000000000..c7db58f5cd0
--- /dev/null
+++ b/050-ffmpeg-fix-svt-av1.patch
@@ -0,0 +1,10 @@
+--- a/libavcodec/libsvt_av1.c
++++ b/libavcodec/libsvt_av1.c
+@@ -31,6 +31,7 @@
+ #include "libavutil/avassert.h"
+
+ #include "internal.h"
++#include "packet_internal.h"
+ #include "avcodec.h"
+
+ typedef enum eos_status {
diff --git a/PKGBUILD b/PKGBUILD
index 5d623f2d45f..d0748c267fe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ _svt_hevc_ver='1.4.3'
_svt_av1_ver='0.8.3'
pkgname=ffmpeg-full-git
-pkgver=4.3.r98015.ga886785018
+pkgver=4.3.r98041.ge34686d7ac
pkgrel=1
pkgdesc='Complete solution to record, convert and stream audio and video (all possible features including libfdk-aac; git version)'
arch=('x86_64')
@@ -26,9 +26,9 @@ depends=(
'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' 'vo-amrwbenc' 'xavs' 'xavs2'
- 'pocketsphinx' 'rockchip-mpp'
+ 'chromaprint-fftw' 'davs2' 'flite1-patched' 'libklvanc-git' 'openh264'
+ 'libopenmpt-svn' 'shine' 'vo-amrwbenc' 'xavs' 'xavs2' 'pocketsphinx'
+ 'rockchip-mpp'
)
makedepends=(
# official repositories:
@@ -45,12 +45,14 @@ source=('git+https://git.ffmpeg.org/ffmpeg.git'
"020-ffmpeg-add-svt-hevc-${_svt_hevc_ver}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/v${_svt_hevc_ver}/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch"
"030-ffmpeg-add-svt-hevc-docs-${_svt_hevc_ver}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/v${_svt_hevc_ver}/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch"
"040-ffmpeg-add-svt-av1-${_svt_av1_ver}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-AV1/v${_svt_av1_ver}/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch"
+ '050-ffmpeg-fix-svt-av1.patch'
'LICENSE')
sha256sums=('SKIP'
'b6fcef2f4cbb1daa47d17245702fbd67ab3289b6b16f090ab99b9c2669453a02'
'878757eb6d7072521caaeb71f1453ec3fc0f91a12936ef302e1625184787c6a6'
'1499e419dda72b1604dc5e3959668f3843292ff56bfba78734e31510ba576de0'
'd371366ceda9233c1b9a60c680878f567861b675605a8dae5c275d633c51ba9f'
+ '462a5f6bf588c199fb0a162fc00a4de22b5a2506dc811cfd6e989f54166b0ad8'
'04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36')
prepare() {
@@ -59,14 +61,15 @@ prepare() {
patch -d ffmpeg -Np1 -i "${srcdir}/020-ffmpeg-add-svt-hevc-${_svt_hevc_ver}.patch"
patch -d ffmpeg -Np1 -i "${srcdir}/030-ffmpeg-add-svt-hevc-docs-${_svt_hevc_ver}.patch"
patch -d ffmpeg -Np1 -i "${srcdir}/040-ffmpeg-add-svt-av1-${_svt_av1_ver}.patch"
+ patch -d ffmpeg -Np1 -i "${srcdir}/050-ffmpeg-fix-svt-av1.patch"
}
pkgver() {
local _version
local _revision
local _shorthash
- _version="$(git -C ffmpeg describe --tags --long | awk -F'-' '{ sub(/^n/, "", $1); print $1 }')"
- _revision="$(git -C ffmpeg describe --tags --match 'N' | awk -F'-' '{ print $2 }')"
+ _version="$(git -C ffmpeg describe --tags --long | awk -F'-' '{ sub(/^n/, "", $1); print $1 }')"
+ _revision="$(git -C ffmpeg describe --tags --match 'N' | awk -F'-' '{ print $2 }')"
_shorthash="$(git -C ffmpeg rev-parse --short HEAD)"
printf '%s.r%s.g%s' "$_version" "$_revision" "$_shorthash"
}