summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2018-03-06 21:33:34 -0300
committerDaniel Bermond2018-03-06 22:30:39 -0300
commit1e39f63c831a5790194f0426aadb5bcc8c3126e7 (patch)
treeed31757ce10ce95ad1621b6306e3ec918591a1f7
parent80181d111a0a7c0045007627dd68d0da610eba48 (diff)
downloadaur-1e39f63c831a5790194f0426aadb5bcc8c3126e7.tar.gz
Correctly disable libvmaf on i686 builds
Previous commit was missing this build options part. References: ----------- https://aur.archlinux.org/cgit/aur.git/commit/?h=ffmpeg-full-git&id=80181d111a0a7c0045007627dd68d0da610eba48
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD5
2 files changed, 4 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index fca5d89d6187..babdf9fd6ace 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = ffmpeg-full-git
pkgdesc = Record, convert and stream audio and video (all possible features including nvenc, qsv and libfdk-aac; git version)
pkgver = 3.5.r90240.g8b0a9f79c8
- pkgrel = 1
+ pkgrel = 2
url = http://www.ffmpeg.org/
arch = i686
arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 315a920e5871..e3874e6eab34 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=ffmpeg-full-git
pkgver=3.5.r90240.g8b0a9f79c8
-pkgrel=1
+pkgrel=2
pkgdesc='Record, convert and stream audio and video (all possible features including nvenc, qsv and libfdk-aac; git version)'
arch=('i686' 'x86_64')
url='http://www.ffmpeg.org/'
@@ -78,6 +78,7 @@ build() {
# set x86_64 specific options
if [ "$CARCH" = 'x86_64' ]
then
+ local _libvmaf='--enable-libvmaf'
local _cudasdk='--enable-cuda-sdk'
local _libnpp='--enable-libnpp'
@@ -164,7 +165,7 @@ build() {
--enable-libtwolame \
--enable-libv4l2 \
--enable-libvidstab \
- --enable-libvmaf \
+ $_libvmaf \
--enable-libvo-amrwbenc \
--enable-libvorbis \
--enable-libvpx \