summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Kharitonov2016-03-21 23:52:16 +0500
committerDmitry Kharitonov2016-03-21 23:52:16 +0500
commit603a798758ebdf6a2c82400e4c0ec809a1d7a6e6 (patch)
treec8fad8130684ef3dd2f7f0eaa14255a8ca9d22ea
parent28d9b56f8d5ba9a9923b788771239f54138c6704 (diff)
downloadaur-603a798758ebdf6a2c82400e4c0ec809a1d7a6e6.tar.gz
Fixing Intel QSV support per ffmpeg-full-git
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD9
2 files changed, 9 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index deccdaafe277..e395f5b7441f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Sun Mar 20 15:22:11 UTC 2016
+# Mon Mar 21 18:51:56 UTC 2016
pkgbase = ffmpeg-full-nvenc
pkgdesc = Record, convert, and stream audio and video (all codecs including Nvidia NVENC)
pkgver = 3.0
- pkgrel = 6
+ pkgrel = 7
epoch = 1
url = http://ffmpeg.org/
arch = i686
@@ -112,6 +112,7 @@ pkgbase = ffmpeg-full-nvenc
sha256sums = SKIP
sha256sums = e0c1b126862072a71e18b9580a6b01afc76a54aa6e642d2c413ba0ac9d3010c4
depends_x86_64 = cuda
+ optdepends_x86_64 = intel-media-sdk: for Intel QSV support (Experimental! See PKGBUILD of that package for additional info)
pkgname = ffmpeg-full-nvenc
diff --git a/PKGBUILD b/PKGBUILD
index cfecb2746784..43d61598de35 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@
pkgname=ffmpeg-full-nvenc
_pkgbasename=ffmpeg
pkgver=3.0
-pkgrel=6
+pkgrel=7
epoch=1
pkgdesc="Record, convert, and stream audio and video (all codecs including Nvidia NVENC)"
arch=('i686' 'x86_64')
@@ -31,6 +31,7 @@ depends_x86_64=('cuda')
makedepends=('hardening-wrapper' 'libvdpau' 'nvidia-sdk' 'yasm')
optdepends=('avxsynth-git: for Avisynth support'
'chromaprint-fftw: for chromaprint which uses fftw for FFT calculations')
+optdepends_x86_64=('intel-media-sdk: for Intel QSV support (Experimental! See PKGBUILD of that package for additional info)')
conflicts=('ffmpeg' 'ffmpeg-full' 'ffmpeg-git' 'ffmpeg-full-git' 'ffmpeg-full-extra')
provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
'libavresample.so' 'libavutil.so' 'libpostproc.so' 'libswresample.so'
@@ -45,22 +46,24 @@ sha256sums=('f19ff77a2f7f736a41dd1499eef4784bf3cb7461f07c13a268164823590113c0'
build() {
cd $_pkgbasename-$pkgver
- # Add cuda to the build if architecture is x86_64 (cuda is x86_64 only)
+ # Add x86_64 (opt)depends to the build
if [ "$CARCH" = "x86_64" ]; then
_cuda="--enable-cuda"
_cudainc="-I/opt/cuda/include"
_cudalib="-L/opt/cuda/lib64"
+ _intelsdklib="-Wl,-rpath -Wl,/opt/intel/mediasdk/lib64"
else
_cuda=""
_cudainc=""
_cudalib=""
+ _intelsdklib=""
fi
msg "Starting configure..."
./configure \
--prefix=/usr \
--extra-cflags="-I/usr/include/nvidia-sdk" \
- --extra-ldflags="-Wl,-rpath -Wl," \
+ --extra-ldflags="${_intelsdklib}" \
\
--enable-rpath \
--enable-gpl \