summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2019-11-11 20:53:12 +0000
committerDaniel Bermond2019-11-11 20:53:12 +0000
commit484fd6e55e5384a7d3320093de9caeb28728a65a (patch)
tree00fec4e6b811c85fb8e55960cf3ce03ed2923726
parent4f77063533d06b194b457f484d77b7f05f8cdf8b (diff)
downloadaur-484fd6e55e5384a7d3320093de9caeb28728a65a.tar.gz
Fix svt-hevc docs patch applying. New upstream option: librav1e.
References ---------- https://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=d8bf24459b694338de4ceb2a2e6d4d2949d6658d
-rw-r--r--.SRCINFO17
-rw-r--r--PKGBUILD43
2 files changed, 29 insertions, 31 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9893fddc236..51d8faa79a1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
pkgbase = ffmpeg-full-git
pkgdesc = Complete solution to record, convert and stream audio and video (all possible features including nvenc, qsv and libfdk-aac; git version)
- pkgver = 4.3.r94961.g1d86e4b3eb
+ pkgver = 4.3.r95713.g0e49560806
pkgrel = 1
url = https://www.ffmpeg.org/
arch = x86_64
license = custom: nonfree and unredistributable
makedepends = git
makedepends = nasm
+ makedepends = vmaf
makedepends = opencl-headers
makedepends = ffnvcodec-headers
- makedepends = vmaf
makedepends = blackmagic-decklink-sdk
makedepends = amf-headers-git
depends = glibc
@@ -30,6 +30,7 @@ pkgbase = ffmpeg-full-git
depends = libcaca
depends = celt
depends = libcdio-paranoia
+ depends = codec2
depends = dav1d
depends = libdc1394
depends = libavc1394
@@ -39,7 +40,9 @@ pkgbase = ffmpeg-full-git
depends = fribidi
depends = libgme
depends = gsm
+ depends = libilbc
depends = libiec61883
+ depends = kvazaar
depends = lensfun
depends = libmodplug
depends = lame
@@ -76,6 +79,7 @@ pkgbase = ffmpeg-full-git
depends = lv2
depends = lilv
depends = xz
+ depends = libmysofa
depends = openal
depends = ocl-icd
depends = libgl
@@ -88,27 +92,24 @@ pkgbase = ffmpeg-full-git
depends = zlib
depends = cuda
depends = libomxil-bellagio
- depends = libva
depends = libdrm
+ depends = intel-media-sdk
+ depends = libva
depends = libvdpau
depends = svt-hevc
depends = svt-av1
depends = chromaprint-fftw
- depends = codec2
depends = davs2
depends = flite1-patched
- depends = libilbc
depends = libklvanc-git
- depends = kvazaar
depends = openh264
depends = libopenmpt-svn
+ depends = rav1e
depends = shine
depends = vo-amrwbenc
depends = xavs
depends = xavs2
- depends = libmysofa
depends = pocketsphinx
- depends = intel-media-sdk
depends = rockchip-mpp
depends = svt-vp9-git
provides = libavcodec.so
diff --git a/PKGBUILD b/PKGBUILD
index 128bddfc71a..e4f03654667 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ _svt_av1_ver='0.6.0'
_svt_vp9_ver='ce245894c6fc1c5d1439c41a7dda8d6dc61784c4'
pkgname=ffmpeg-full-git
-pkgver=4.3.r94961.g1d86e4b3eb
+pkgver=4.3.r95713.g0e49560806
pkgrel=1
pkgdesc='Complete solution to record, convert and stream audio and video (all possible features including nvenc, qsv and libfdk-aac; git version)'
arch=('x86_64')
@@ -15,27 +15,26 @@ depends=(
# official repositories:
'glibc' 'alsa-lib' 'jack' 'libpng'
'bzip2' 'frei0r-plugins' 'libgcrypt' 'gmp' 'gnutls' 'ladspa' 'libass' 'aom'
- 'aribb24' 'libbluray' 'libbs2b' 'libcaca' 'celt' 'libcdio-paranoia' 'dav1d'
- 'libdc1394' 'libavc1394' 'libfdk-aac' 'fontconfig' 'freetype2' 'fribidi'
- 'libgme' 'gsm' 'libiec61883' 'lensfun' 'libmodplug' 'lame' 'opencore-amr'
- 'openjpeg2' 'opus' 'pulseaudio' 'librsvg' 'rubberband' 'rtmpdump' 'snappy'
- 'libsoxr' 'speex' 'srt' 'libssh' 'tensorflow' 'tesseract' 'libtheora'
+ 'aribb24' 'libbluray' 'libbs2b' 'libcaca' 'celt' 'libcdio-paranoia' 'codec2'
+ 'dav1d' 'libdc1394' 'libavc1394' 'libfdk-aac' 'fontconfig' 'freetype2' 'fribidi'
+ 'libgme' 'gsm' 'libilbc' 'libiec61883' 'kvazaar' 'lensfun' 'libmodplug' 'lame'
+ 'opencore-amr' 'openjpeg2' 'opus' 'pulseaudio' 'librsvg' 'rubberband' 'rtmpdump'
+ 'snappy' 'libsoxr' 'speex' 'srt' 'libssh' 'tensorflow' 'tesseract' 'libtheora'
'twolame' 'v4l-utils' 'vid.stab' 'libvorbis' 'libvpx' 'wavpack' 'libwebp'
- 'libx264.so' 'x265' 'libxcb' 'xvidcore' 'libxml2' 'zimg' 'zeromq' 'zvbi'
- 'lv2' 'lilv' 'xz' 'openal' 'ocl-icd' 'libgl' 'sndio' 'sdl2' 'vapoursynth'
- 'libxv' 'libx11' 'libxext' 'zlib' 'cuda' 'libomxil-bellagio' 'libva'
- 'libdrm' 'libvdpau' 'svt-hevc' 'svt-av1'
+ 'libx264.so' 'x265' 'libxcb' 'xvidcore' 'libxml2' 'zimg' 'zeromq' 'zvbi' 'lv2'
+ 'lilv' 'xz' 'libmysofa' 'openal' 'ocl-icd' 'libgl' 'sndio' 'sdl2' 'vapoursynth'
+ 'libxv' 'libx11' 'libxext' 'zlib' 'cuda' 'libomxil-bellagio' 'libdrm'
+ 'intel-media-sdk' 'libva' 'libvdpau' 'svt-hevc' 'svt-av1'
# AUR:
- 'chromaprint-fftw' 'codec2' 'davs2' 'flite1-patched' 'libilbc'
- 'libklvanc-git' 'kvazaar' 'openh264' 'libopenmpt-svn' 'shine' 'vo-amrwbenc'
- 'xavs' 'xavs2' 'libmysofa' 'pocketsphinx' 'intel-media-sdk' 'rockchip-mpp'
- 'svt-vp9-git'
+ 'chromaprint-fftw' 'davs2' 'flite1-patched' 'libklvanc-git' 'openh264'
+ 'libopenmpt-svn' 'rav1e' 'shine' 'vo-amrwbenc' 'xavs' 'xavs2' 'pocketsphinx'
+ 'rockchip-mpp' 'svt-vp9-git'
)
makedepends=(
# official repositories:
- 'git' 'nasm' 'opencl-headers' 'ffnvcodec-headers'
+ 'git' 'nasm' 'vmaf' 'opencl-headers' 'ffnvcodec-headers'
# AUR:
- 'vmaf' 'blackmagic-decklink-sdk' 'amf-headers-git'
+ 'blackmagic-decklink-sdk' 'amf-headers-git'
)
provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
'libavutil.so' 'libpostproc.so' 'libavresample.so' 'libswscale.so'
@@ -59,7 +58,7 @@ prepare() {
# add svt codec support for hevc, av1 and vp9
git apply --index "${srcdir}/ffmpeg-full-git-add-svt-hevc-${_svt_hevc_ver}.patch"
- git apply --index "${srcdir}/ffmpeg-full-git-add-svt-hevc-docs-${_svt_hevc_ver}.patch"
+ patch -Np1 -i "${srcdir}/ffmpeg-full-git-add-svt-hevc-docs-${_svt_hevc_ver}.patch"
git apply --index "${srcdir}/ffmpeg-full-git-add-svt-av1-${_svt_av1_ver}.patch"
git apply --index "${srcdir}/ffmpeg-full-git-add-svt-vp9-g${_svt_vp9_ver:0:7}.patch"
}
@@ -154,6 +153,7 @@ build() {
--enable-libopenmpt \
--enable-libopus \
--enable-libpulse \
+ --enable-librav1e \
--enable-librsvg \
--enable-librubberband \
--enable-librtmp \
@@ -229,10 +229,7 @@ build() {
}
package() {
- cd ffmpeg
-
- make DESTDIR="$pkgdir" install
-
- install -D -m755 tools/qt-faststart -t "${pkgdir}/usr/bin"
- install -D -m644 "${srcdir}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
+ make -C ffmpeg DESTDIR="$pkgdir" install
+ install -D -m755 ffmpeg/tools/qt-faststart -t "${pkgdir}/usr/bin"
+ install -D -m644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
}