summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2018-03-06 21:44:54 -0300
committerDaniel Bermond2018-03-06 21:48:13 -0300
commiteabd10e3b2211177587ce0835678756bdfdaa8f2 (patch)
treebf67796e810184c91adfca909d6b003a4902b645
parentf78673d8293310349d603a3043bdea5cd50d7e71 (diff)
downloadaur-eabd10e3b2211177587ce0835678756bdfdaa8f2.tar.gz
libvmaf: move vmaf from makedepends to makedepends_x86_64
It seems that vmaf needs x86_64. As a result, i686 builds will not have libvmaf enabled. References: ----------- https://aur.archlinux.org/cgit/aur.git/commit/?h=vmaf&id=bc0e50657db7c6317135d1e59e02a2b5d041aac8
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD11
2 files changed, 10 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 63181d358ca5..254ebd03e1f0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = ffmpeg-full
pkgdesc = Record, convert and stream audio and video (all possible features including nvenc, qsv and libfdk-aac)
pkgver = 3.4.2
- pkgrel = 2
+ pkgrel = 3
url = http://www.ffmpeg.org/
arch = i686
arch = x86_64
@@ -10,7 +10,6 @@ pkgbase = ffmpeg-full
makedepends = opencl-headers
makedepends = blackmagic-decklink-sdk
makedepends = libmfx
- makedepends = vmaf
depends = glibc
depends = alsa-lib
depends = jack
@@ -128,6 +127,7 @@ pkgbase = ffmpeg-full
depends_x86_64 = cuda
depends_x86_64 = nvidia-utils
optdepends_x86_64 = intel-media-sdk: for Intel QSV support (experimental)
+ makedepends_x86_64 = vmaf
pkgname = ffmpeg-full
diff --git a/PKGBUILD b/PKGBUILD
index f007a70b1744..4748052f4aed 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=ffmpeg-full
_srcname=ffmpeg
pkgver=3.4.2
-pkgrel=2
+pkgrel=3
pkgdesc='Record, convert and stream audio and video (all possible features including nvenc, qsv and libfdk-aac)'
arch=('i686' 'x86_64')
url='http://www.ffmpeg.org/'
@@ -35,7 +35,11 @@ makedepends=(
# official repositories:
'nasm' 'opencl-headers'
# AUR:
- 'blackmagic-decklink-sdk' 'libmfx' 'vmaf'
+ 'blackmagic-decklink-sdk' 'libmfx'
+)
+makedepends_x86_64=(
+ # AUR:
+ 'vmaf'
)
provides=(
'ffmpeg' 'ffmpeg-full-nvenc' 'ffmpeg-nvenc' 'ffmpeg-libfdk_aac' 'ffmpeg-decklink'
@@ -73,6 +77,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'
@@ -157,7 +162,7 @@ build() {
--enable-libtwolame \
--enable-libv4l2 \
--enable-libvidstab \
- --enable-libvmaf \
+ $_libvmaf \
--enable-libvo-amrwbenc \
--enable-libvorbis \
--enable-libvpx \