From dd0178ed6cba0a1a008087074af723ce6b577046 Mon Sep 17 00:00:00 2001 From: Daniel Bermond Date: Fri, 13 Sep 2019 02:47:06 +0000 Subject: [PATCH] Updated to version 4.2.1 --- .SRCINFO | 24 ++++++++++++------------ PKGBUILD | 32 ++++++++++++++++---------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index f782a31..52cd8f4 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = ffmpeg-full pkgdesc = Complete solution to record, convert and stream audio and video (all possible features including nvenc, qsv and libfdk-aac) - pkgver = 4.2 + pkgver = 4.2.1 pkgrel = 1 url = https://www.ffmpeg.org/ arch = x86_64 @@ -89,6 +89,8 @@ pkgbase = ffmpeg-full depends = libva depends = libdrm depends = libvdpau + depends = svt-hevc + depends = svt-av1 depends = chromaprint-fftw depends = codec2 depends = davs2 @@ -106,8 +108,6 @@ pkgbase = ffmpeg-full depends = pocketsphinx depends = intel-media-sdk depends = rockchip-mpp - depends = intel-svt-hevc - depends = intel-svt-av1 depends = svt-vp9-git provides = libavcodec.so provides = libavdevice.so @@ -120,18 +120,18 @@ pkgbase = ffmpeg-full provides = libswresample.so provides = ffmpeg conflicts = ffmpeg - source = https://ffmpeg.org/releases/ffmpeg-4.2.tar.xz - source = https://ffmpeg.org/releases/ffmpeg-4.2.tar.xz.asc - source = ffmpeg-full-add-intel-svt-hevc-1.4.0.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/v1.4.0/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch - source = ffmpeg-full-add-intel-svt-hevc-docs-1.4.0.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/v1.4.0/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch - source = ffmpeg-full-add-intel-svt-av1-0.6.0.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-AV1/v0.6.0/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch - source = ffmpeg-full-add-intel-svt-vp9-gce24589.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/ce245894c6fc1c5d1439c41a7dda8d6dc61784c4/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9-with-svt-hevc-av1.patch + source = https://ffmpeg.org/releases/ffmpeg-4.2.1.tar.xz + source = https://ffmpeg.org/releases/ffmpeg-4.2.1.tar.xz.asc + source = ffmpeg-full-add-svt-hevc-1.4.1.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/v1.4.1/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch + source = ffmpeg-full-add-svt-hevc-docs-1.4.1.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/v1.4.1/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch + source = ffmpeg-full-add-svt-av1-0.6.0.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-AV1/v0.6.0/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch + source = ffmpeg-full-add-svt-vp9-gce24589.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/ce245894c6fc1c5d1439c41a7dda8d6dc61784c4/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9-with-svt-hevc-av1.patch source = LICENSE validpgpkeys = FCF986EA15E6E293A5644F10B4322F04D67658D8 - sha256sums = 023f10831a97ad93d798f53a3640e55cd564abfeba807ecbe8524dac4fedecd5 + sha256sums = cec7c87e9b60d174509e263ac4011b522385fd0775292e1670ecc1180c9bb6d4 sha256sums = SKIP - sha256sums = d9bd8345ff994c26d5174759d460c723e92012139e29dd015fe83537e29a9554 - sha256sums = 295220f498680d893bec525321e657dc3cdb98080a7117d1f575cd0508996a0e + sha256sums = d2db0acbdb0773f3883746cd25996905ff0a3f539d9b434fe314f883856ad883 + sha256sums = 1499e419dda72b1604dc5e3959668f3843292ff56bfba78734e31510ba576de0 sha256sums = 102a70c5c453875f5806ce02cc83fdc74e53c078cf5be2657f3dd1dd4438868c sha256sums = 7690a4f6bdc4a57e35c7ff5b6e87f2fe6d056d452eff9e767eaccff41832f4d7 sha256sums = 04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36 diff --git a/PKGBUILD b/PKGBUILD index 1a9864d..f4c6b1f 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer : Daniel Bermond < gmail-com: danielbermond > # Contributor: Iacopo Isimbaldi -_svt_hevc_ver='1.4.0' +_svt_hevc_ver='1.4.1' _svt_av1_ver='0.6.0' _svt_vp9_ver='ce245894c6fc1c5d1439c41a7dda8d6dc61784c4' pkgname=ffmpeg-full -pkgver=4.2 +pkgver=4.2.1 pkgrel=1 pkgdesc='Complete solution to record, convert and stream audio and video (all possible features including nvenc, qsv and libfdk-aac)' arch=('x86_64') @@ -25,12 +25,12 @@ depends=( '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' + 'libdrm' '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' - 'intel-svt-hevc' 'intel-svt-av1' 'svt-vp9-git' + 'svt-vp9-git' ) makedepends=( # official repositories: @@ -43,15 +43,15 @@ provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so' 'libswresample.so' 'ffmpeg') conflicts=('ffmpeg') source=("https://ffmpeg.org/releases/ffmpeg-${pkgver}.tar.xz"{,.asc} - "ffmpeg-full-add-intel-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" - "ffmpeg-full-add-intel-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" - "ffmpeg-full-add-intel-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" - "ffmpeg-full-add-intel-svt-vp9-g${_svt_vp9_ver:0:7}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/${_svt_vp9_ver}/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9-with-svt-hevc-av1.patch" + "ffmpeg-full-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" + "ffmpeg-full-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" + "ffmpeg-full-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" + "ffmpeg-full-add-svt-vp9-g${_svt_vp9_ver:0:7}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/${_svt_vp9_ver}/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9-with-svt-hevc-av1.patch" 'LICENSE') -sha256sums=('023f10831a97ad93d798f53a3640e55cd564abfeba807ecbe8524dac4fedecd5' +sha256sums=('cec7c87e9b60d174509e263ac4011b522385fd0775292e1670ecc1180c9bb6d4' 'SKIP' - 'd9bd8345ff994c26d5174759d460c723e92012139e29dd015fe83537e29a9554' - '295220f498680d893bec525321e657dc3cdb98080a7117d1f575cd0508996a0e' + 'd2db0acbdb0773f3883746cd25996905ff0a3f539d9b434fe314f883856ad883' + '1499e419dda72b1604dc5e3959668f3843292ff56bfba78734e31510ba576de0' '102a70c5c453875f5806ce02cc83fdc74e53c078cf5be2657f3dd1dd4438868c' '7690a4f6bdc4a57e35c7ff5b6e87f2fe6d056d452eff9e767eaccff41832f4d7' '04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36') @@ -60,11 +60,11 @@ validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8') prepare() { cd "ffmpeg-${pkgver}" - # add intel-svt support for hevc, av1 and vp9 - patch -Np1 -i "${srcdir}/ffmpeg-full-add-intel-svt-hevc-${_svt_hevc_ver}.patch" - patch -Np1 -i "${srcdir}/ffmpeg-full-add-intel-svt-hevc-docs-${_svt_hevc_ver}.patch" - patch -Np1 -i "${srcdir}/ffmpeg-full-add-intel-svt-av1-${_svt_av1_ver}.patch" - patch -Np1 -i "${srcdir}/ffmpeg-full-add-intel-svt-vp9-g${_svt_vp9_ver:0:7}.patch" + # add svt codec support for hevc, av1 and vp9 + patch -Np1 -i "${srcdir}/ffmpeg-full-add-svt-hevc-${_svt_hevc_ver}.patch" + patch -Np1 -i "${srcdir}/ffmpeg-full-add-svt-hevc-docs-${_svt_hevc_ver}.patch" + patch -Np1 -i "${srcdir}/ffmpeg-full-add-svt-av1-${_svt_av1_ver}.patch" + patch -Np1 -i "${srcdir}/ffmpeg-full-add-svt-vp9-g${_svt_vp9_ver:0:7}.patch" } build() {