diff options
author | Nathaniel Chin | 2020-10-06 00:11:20 +0800 |
---|---|---|
committer | Nathaniel Chin | 2020-10-06 00:11:20 +0800 |
commit | 43944989d910c43a1943d88ab8825c0be60cc488 (patch) | |
tree | 5fe5b220bd3ce417315bf94feaf31247d8dcbe18 /PKGBUILD | |
parent | 0edcbfe6d1aa48900431fa92e8d21d6df2e77a5f (diff) | |
download | aur-43944989d910c43a1943d88ab8825c0be60cc488.tar.gz |
Merge fixes from upstream
Diffstat (limited to 'PKGBUILD')
-rw-r--r-- | PKGBUILD | 25 |
1 files changed, 9 insertions, 16 deletions
@@ -8,7 +8,7 @@ _svt_vp9_ver='0.2.2' pkgname=ffmpeg-amd-full-git _srcname=ffmpeg -pkgver=4.4.r99090.gc748bd77dc +pkgver=4.4.r99472.g0b6541368d pkgrel=1 pkgdesc='Complete solution to record, convert and stream audio and video (all possible features for AMD; git version)' arch=('i686' 'x86_64') @@ -23,7 +23,7 @@ depends=( 'libmodplug' 'lame' 'opencore-amr' 'openjpeg2' 'opus' 'pulseaudio' 'librabbitmq-c' 'rav1e' 'librsvg' 'rubberband' 'rtmpdump' 'snappy' 'libsoxr' 'speex' 'srt' 'libssh' 'svt-hevc' 'svt-av1' 'svt-vp9' 'tensorflow' 'tesseract' 'libtheora' 'twolame' - 'v4l-utils' 'vid.stab' 'vmaf' 'libvorbis' 'libvpx' 'wavpack' 'libwebp' 'x264' + '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' 'libomxil-bellagio' @@ -47,13 +47,13 @@ source=('git+https://git.ffmpeg.org/ffmpeg.git' '010-ffmpeg-fix-vmaf-model-path.patch' "020-ffmpeg-add-svt-hevc-g${_svt_hevc_ver:0:7}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/${_svt_hevc_ver}/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch" "030-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" - "040-ffmpeg-add-svt-vp9-${_svt_vp9_ver}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/v${_svt_vp9_ver}/ffmpeg_plugin/master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch" + "040-ffmpeg-add-svt-vp9.patch" 'LICENSE') sha256sums=('SKIP' '52778c70d9fe6e3a10941b99b96ac7749cec325dc1b9ee11ab75332b5ff68e50' '05ec4d3323dc80ef6c1d4d6d50d339accd51d22b12a735b7a6605f10feb09cec' '1499e419dda72b1604dc5e3959668f3843292ff56bfba78734e31510ba576de0' - 'b74be6d805672210e226e7c0b403f88b0ee8a53c732c9bdc873c4b44aeb75c96' + '9431f9bce14d9140f473d772eca693a1801efbea428de5d9735461d17108fcae' '04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36') prepare() { @@ -63,19 +63,13 @@ prepare() { patch -d ffmpeg -Np1 -i "${srcdir}/010-ffmpeg-fix-vmaf-model-path.patch" patch -d ffmpeg -Np1 -i "${srcdir}/020-ffmpeg-add-svt-hevc-g${_svt_hevc_ver:0:7}.patch" patch -d ffmpeg -Np1 -i "${srcdir}/030-ffmpeg-add-svt-hevc-docs-g${_svt_hevc_ver:0:7}.patch" - patch -d ffmpeg -Np1 -i "${srcdir}/040-ffmpeg-add-svt-vp9-${_svt_vp9_ver}.patch" + patch -d ffmpeg -Np1 -i "${srcdir}/040-ffmpeg-add-svt-vp9.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 }')" - _shorthash="$(git -C ffmpeg rev-parse --short HEAD)" - - printf '%s.r%s.g%s' "$_version" "$_revision" "$_shorthash" + printf '%s.r%s.g%s' "$(git -C ffmpeg describe --tags --long | awk -F'-' '{ sub(/^n/, "", $1); print $1 }')" \ + "$(git -C ffmpeg describe --tags --match 'N' | awk -F'-' '{ print $2 }')" \ + "$(git -C ffmpeg rev-parse --short HEAD)" } build() { @@ -148,7 +142,7 @@ build() { --enable-librubberband \ --enable-librtmp \ --enable-libshine \ - --disable-libsmbclient \ + --enable-libsmbclient \ --enable-libsnappy \ --enable-libsoxr \ --enable-libspeex \ @@ -168,7 +162,6 @@ build() { --enable-libvorbis \ --enable-libvpx \ --enable-libsvtvp9 \ - --enable-libwavpack \ --enable-libwebp \ --enable-libx264 \ --enable-libx265 \ |