summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorArley Henostroza2020-10-19 23:35:16 -0500
committerArley Henostroza2020-10-19 23:35:16 -0500
commit1aaffed1df18cf89371f621296d50ab5739e0e8b (patch)
tree39dc2e9134dc991c047de1f8cf4d0aa6eacbb0de
parentdb7b627378df8ee53756328dcacf0e0077eef5ef (diff)
downloadaur-1aaffed1df18cf89371f621296d50ab5739e0e8b.tar.gz
Update to last changes, now the package is up to date.
-rw-r--r--.SRCINFO11
-rw-r--r--010-ffmpeg-fix-vmaf-model-path.patch2
-rw-r--r--PKGBUILD32
3 files changed, 21 insertions, 24 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 80efc083dbbe..a9db149873e6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = ffmpeg-intel-full-git
pkgdesc = Complete solution to record, convert and stream audio and video (all possible features for intel; git version) (based on dbermond package)
- pkgver = 4.4.r99339.ge71d73b096
+ pkgver = 4.4.r99647.g2134667227
pkgrel = 1
url = https://www.ffmpeg.org/
arch = x86_64
@@ -57,12 +57,13 @@ pkgbase = ffmpeg-intel-full-git
depends = libssh
depends = tesseract
depends = libtheora
+ depends = uavs3d-git
depends = twolame
+ depends = smbclient
depends = v4l-utils
depends = vid.stab
depends = libvorbis
depends = libvpx
- depends = wavpack
depends = libwebp
depends = x264
depends = x265
@@ -131,13 +132,13 @@ pkgbase = ffmpeg-intel-full-git
source = 010-ffmpeg-fix-vmaf-model-path.patch
source = 020-ffmpeg-add-svt-hevc-gead6fdf.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/ead6fdf7c9ff84511b42fc1658c1654b84d83e4b/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch
source = 030-ffmpeg-add-svt-hevc-docs-gead6fdf.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/ead6fdf7c9ff84511b42fc1658c1654b84d83e4b/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch
- source = 040-ffmpeg-add-svt-vp9-0.2.2.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/v0.2.2/ffmpeg_plugin/master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch
+ source = 040-ffmpeg-add-svt-vp9-g7951c3c.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/7951c3cf6773c5e0ede00e4ce3e3ad2f7e090cfb/ffmpeg_plugin/master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch
source = LICENSE
sha256sums = SKIP
- sha256sums = 34863abb44db5eb1ad103f11124e05b69de5c15324e3d4568541a7b8485cc091
+ sha256sums = 52778c70d9fe6e3a10941b99b96ac7749cec325dc1b9ee11ab75332b5ff68e50
sha256sums = 05ec4d3323dc80ef6c1d4d6d50d339accd51d22b12a735b7a6605f10feb09cec
sha256sums = 1499e419dda72b1604dc5e3959668f3843292ff56bfba78734e31510ba576de0
- sha256sums = b74be6d805672210e226e7c0b403f88b0ee8a53c732c9bdc873c4b44aeb75c96
+ sha256sums = 34e78efe063abc10707e47b4a3ba9d22955bfaf26d5670abb963d8f11f6b22b1
sha256sums = 04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36
pkgname = ffmpeg-intel-full-git
diff --git a/010-ffmpeg-fix-vmaf-model-path.patch b/010-ffmpeg-fix-vmaf-model-path.patch
index bcd1f2ad3cb1..547b3fe8c0d3 100644
--- a/010-ffmpeg-fix-vmaf-model-path.patch
+++ b/010-ffmpeg-fix-vmaf-model-path.patch
@@ -1,4 +1,4 @@
-/libavfilter/vf_libvmaf.c
+--- a/libavfilter/vf_libvmaf.c
+++ b/libavfilter/vf_libvmaf.c
@@ -72,7 +72,7 @@ typedef struct LIBVMAFContext {
#define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM
diff --git a/PKGBUILD b/PKGBUILD
index a00c5df952fb..564ab673beaf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,11 @@
-# Maintainer: Arley Henostroza < arllk at gmail dot com >
+# Maintainer: Arley Henostroza <arllk10@gmail.com>
# Contributor: Daniel Bermond <dbermond@archlinux.org>
_svt_hevc_ver='ead6fdf7c9ff84511b42fc1658c1654b84d83e4b'
-_svt_vp9_ver='0.2.2'
+_svt_vp9_ver='7951c3cf6773c5e0ede00e4ce3e3ad2f7e090cfb'
pkgname=ffmpeg-intel-full-git
-pkgver=4.4.r99339.ge71d73b096
+pkgver=4.4.r99647.g2134667227
pkgrel=1
pkgdesc='Complete solution to record, convert and stream audio and video (all possible features for intel; git version) (based on dbermond package)'
arch=('x86_64')
@@ -19,8 +19,8 @@ depends=(
'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' 'tesseract' 'libtheora'
- 'twolame' 'v4l-utils' 'vid.stab' 'libvorbis' 'libvpx' 'wavpack' 'libwebp'
+ 'snappy' 'libsoxr' 'speex' 'srt' 'libssh' 'tesseract' 'libtheora' 'uavs3d-git'
+ 'twolame' 'smbclient' 'v4l-utils' 'vid.stab' 'libvorbis' 'libvpx' 'libwebp'
'x264' 'x265' 'libxcb' 'xvidcore' 'libxml2' 'zimg' 'zeromq' 'zvbi' 'lv2'
'lilv' 'xz' 'libmysofa' 'openal' 'ocl-icd' 'libgl' 'sndio' 'sdl2' 'vapoursynth'
'libxv' 'libx11' 'libxext' 'zlib' 'libomxil-bellagio' 'libdrm' 'vmaf'
@@ -45,14 +45,14 @@ 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-g${_svt_vp9_ver:0:7}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/${_svt_vp9_ver}/ffmpeg_plugin/master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch"
'LICENSE')
sha256sums=('SKIP'
- '34863abb44db5eb1ad103f11124e05b69de5c15324e3d4568541a7b8485cc091'
+ '52778c70d9fe6e3a10941b99b96ac7749cec325dc1b9ee11ab75332b5ff68e50'
'05ec4d3323dc80ef6c1d4d6d50d339accd51d22b12a735b7a6605f10feb09cec'
'1499e419dda72b1604dc5e3959668f3843292ff56bfba78734e31510ba576de0'
- 'b74be6d805672210e226e7c0b403f88b0ee8a53c732c9bdc873c4b44aeb75c96'
+ '34e78efe063abc10707e47b4a3ba9d22955bfaf26d5670abb963d8f11f6b22b1'
'04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36')
prepare() {
@@ -61,17 +61,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-g${_svt_vp9_ver:0:7}.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() {
@@ -146,7 +142,7 @@ build() {
--enable-librubberband \
--enable-librtmp \
--enable-libshine \
- --disable-libsmbclient \
+ --enable-libsmbclient \
--enable-libsnappy \
--enable-libsoxr \
--enable-libspeex \
@@ -159,6 +155,7 @@ build() {
--enable-libtheora \
--disable-libtls \
--enable-libtwolame \
+ --enable-libuavs3d \
--enable-libv4l2 \
--enable-libvidstab \
--enable-libvmaf \
@@ -166,7 +163,6 @@ build() {
--enable-libvorbis \
--enable-libvpx \
--enable-libsvtvp9 \
- --enable-libwavpack \
--enable-libwebp \
--enable-libx264 \
--enable-libx265 \