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
This commit is contained in:
Daniel Bermond
2018-03-06 21:44:54 -03:00
parent f78673d829
commit eabd10e3b2
2 changed files with 10 additions and 5 deletions
+2 -2
View File
@@ -1,7 +1,7 @@
pkgbase = ffmpeg-full pkgbase = ffmpeg-full
pkgdesc = Record, convert and stream audio and video (all possible features including nvenc, qsv and libfdk-aac) pkgdesc = Record, convert and stream audio and video (all possible features including nvenc, qsv and libfdk-aac)
pkgver = 3.4.2 pkgver = 3.4.2
pkgrel = 2 pkgrel = 3
url = http://www.ffmpeg.org/ url = http://www.ffmpeg.org/
arch = i686 arch = i686
arch = x86_64 arch = x86_64
@@ -10,7 +10,6 @@ pkgbase = ffmpeg-full
makedepends = opencl-headers makedepends = opencl-headers
makedepends = blackmagic-decklink-sdk makedepends = blackmagic-decklink-sdk
makedepends = libmfx makedepends = libmfx
makedepends = vmaf
depends = glibc depends = glibc
depends = alsa-lib depends = alsa-lib
depends = jack depends = jack
@@ -128,6 +127,7 @@ pkgbase = ffmpeg-full
depends_x86_64 = cuda depends_x86_64 = cuda
depends_x86_64 = nvidia-utils depends_x86_64 = nvidia-utils
optdepends_x86_64 = intel-media-sdk: for Intel QSV support (experimental) optdepends_x86_64 = intel-media-sdk: for Intel QSV support (experimental)
makedepends_x86_64 = vmaf
pkgname = ffmpeg-full pkgname = ffmpeg-full
+8 -3
View File
@@ -4,7 +4,7 @@
pkgname=ffmpeg-full pkgname=ffmpeg-full
_srcname=ffmpeg _srcname=ffmpeg
pkgver=3.4.2 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)' pkgdesc='Record, convert and stream audio and video (all possible features including nvenc, qsv and libfdk-aac)'
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
url='http://www.ffmpeg.org/' url='http://www.ffmpeg.org/'
@@ -35,7 +35,11 @@ makedepends=(
# official repositories: # official repositories:
'nasm' 'opencl-headers' 'nasm' 'opencl-headers'
# AUR: # AUR:
'blackmagic-decklink-sdk' 'libmfx' 'vmaf' 'blackmagic-decklink-sdk' 'libmfx'
)
makedepends_x86_64=(
# AUR:
'vmaf'
) )
provides=( provides=(
'ffmpeg' 'ffmpeg-full-nvenc' 'ffmpeg-nvenc' 'ffmpeg-libfdk_aac' 'ffmpeg-decklink' 'ffmpeg' 'ffmpeg-full-nvenc' 'ffmpeg-nvenc' 'ffmpeg-libfdk_aac' 'ffmpeg-decklink'
@@ -73,6 +77,7 @@ build() {
# set x86_64 specific options # set x86_64 specific options
if [ "$CARCH" = 'x86_64' ] if [ "$CARCH" = 'x86_64' ]
then then
local _libvmaf='--enable-libvmaf'
local _cudasdk='--enable-cuda-sdk' local _cudasdk='--enable-cuda-sdk'
local _libnpp='--enable-libnpp' local _libnpp='--enable-libnpp'
@@ -157,7 +162,7 @@ build() {
--enable-libtwolame \ --enable-libtwolame \
--enable-libv4l2 \ --enable-libv4l2 \
--enable-libvidstab \ --enable-libvidstab \
--enable-libvmaf \ $_libvmaf \
--enable-libvo-amrwbenc \ --enable-libvo-amrwbenc \
--enable-libvorbis \ --enable-libvorbis \
--enable-libvpx \ --enable-libvpx \