summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2018-04-15 19:04:40 +0000
committerDaniel Bermond2018-04-16 18:13:25 +0000
commit7b2fc9d83b59848ba431c4d11486c0b5ca966bdb (patch)
tree7a9171f984b00a772a0c33598b819ea8edfb25f8
parentd0fbec2ec56d3d1115a9a6d0c53bd64717850117 (diff)
downloadaur-7b2fc9d83b59848ba431c4d11486c0b5ca966bdb.tar.gz
Move intel-media-sdk from makedepends_x86_64 to depends_x86_64
Since intel-media-sdk is needed not only for building with Intel QSV support but also for Intel QSV to work during runtime, it makes sense to stay in depends as a needed component. Forgot to do it in previous commit. Another option instead of placing it only in depends would be to place it in makedepends + optdepends because ffmpeg runs without intel-media-sdk installed (libmfx.a is a static dispatcher library that calls other sdk components at runtime). Currently I'm sticking with the depends-only solution.
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD11
2 files changed, 10 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 232672d58d6c..577b0dc0c70f 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 = 6
+ pkgrel = 7
url = http://www.ffmpeg.org/
arch = i686
arch = x86_64
@@ -124,8 +124,8 @@ pkgbase = ffmpeg-full
sha256sums = 04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36
depends_x86_64 = cuda
depends_x86_64 = nvidia-utils
+ depends_x86_64 = intel-media-sdk
makedepends_x86_64 = vmaf
- makedepends_x86_64 = intel-media-sdk
pkgname = ffmpeg-full
diff --git a/PKGBUILD b/PKGBUILD
index bafdca5084a9..4f52f3a027bf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=ffmpeg-full
_srcname=ffmpeg
pkgver=3.4.2
-pkgrel=6
+pkgrel=7
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/'
@@ -26,7 +26,12 @@ depends=(
'libopenmpt-svn' 'shine' 'vo-amrwbenc' 'xavs' 'ndi-sdk' 'libmysofa'
'rockchip-mpp'
)
-depends_x86_64=('cuda' 'nvidia-utils')
+depends_x86_64=(
+ # official repositories:
+ 'cuda' 'nvidia-utils'
+ # AUR:
+ 'intel-media-sdk'
+)
makedepends=(
# official repositories:
'nasm' 'opencl-headers'
@@ -35,7 +40,7 @@ makedepends=(
)
makedepends_x86_64=(
# AUR:
- 'vmaf' 'intel-media-sdk'
+ 'vmaf'
)
provides=(
'ffmpeg' 'ffmpeg-full-nvenc' 'ffmpeg-nvenc' 'ffmpeg-libfdk_aac' 'ffmpeg-decklink'