Added rkmpp support; disabled rpath; fixed build on i686

2 files changed, 11 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9889083e5a47..e6c710a02cd7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Fri Dec 22 05:36:30 UTC 2017
 pkgbase = ffmpeg-full-nvenc
 	pkgdesc = Record, convert, and stream audio and video (all codecs including Nvidia NVENC)
 	pkgver = 3.4.1
-	pkgrel = 1
+	pkgrel = 2
 	epoch = 1
 	url = http://ffmpeg.org/
 	arch = i686
@@ -64,6 +62,7 @@ pkgbase = ffmpeg-full-nvenc
 	depends = openjpeg2
 	depends = libopenmpt-svn
 	depends = opus
+	depends = rockchip-mpp
 	depends = rubberband
 	depends = rtmpdump
 	depends = sdl2
@@ -112,6 +111,7 @@ pkgbase = ffmpeg-full-nvenc
 	source = https://ffmpeg.org/releases/ffmpeg-3.4.1.tar.xz
 	source = https://ffmpeg.org/releases/ffmpeg-3.4.1.tar.xz.asc
 	source = UNREDISTRIBUTABLE.txt
+	validpgpkeys = FCF986EA15E6E293A5644F10B4322F04D67658D8
 	sha256sums = 5a77278a63741efa74e26bf197b9bb09ac6381b9757391b922407210f0f991c0
 	sha256sums = SKIP
 	sha256sums = e0c1b126862072a71e18b9580a6b01afc76a54aa6e642d2c413ba0ac9d3010c4
diff --git a/PKGBUILD b/PKGBUILD
index 92d5fb279a07..a765119192b3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -19,7 +19,7 @@
 pkgname=ffmpeg-full-nvenc
 _pkgbasename=ffmpeg
 pkgver=3.4.1
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="Record, convert, and stream audio and video (all codecs including Nvidia NVENC)"
 arch=('i686' 'x86_64')
@@ -32,7 +32,7 @@ depends=('alsa-lib' 'bzip2' 'celt' 'chromaprint-fftw' 'fontconfig' 'frei0r-plugi
          'libmysofa' 'libpulse' 'librsvg' 'libsoxr' 'libssh' 'libtheora' 'libva' 
          'libvdpau' 'libwebp' 'libxml2' 'libxv' 'mesa' 'openal' 'opencore-amr'
          'opencv' 'opencl-driver' 'opencl-icd-loader' 'openh264' 
-         'openjpeg2' 'libopenmpt-svn' 'opus' 'rubberband' 'rtmpdump'
+         'openjpeg2' 'libopenmpt-svn' 'opus' 'rockchip-mpp' 'rubberband' 'rtmpdump'
          'sdl2' 'smbclient' 'speex' 'shine' 'tesseract' 'twolame' 'v4l-utils'
          'vid.stab' 'vo-amrwbenc' 'libxcb' 'xvidcore' 'xz' 'wavpack' 'zeromq' 'zimg'
          'zlib' 'zvbi' 'libvorbisenc.so' 'libvorbis.so' 'libvpx.so' 'libx264.so'
@@ -63,8 +63,7 @@ build() {
       local _cudasdk='--enable-cuda-sdk'
       local _cuvid='--enable-cuvid'
       local _libnpp='--enable-libnpp'
-      local _cflags='--extra-cflags=-I/opt/cuda/include'
-      
+      local _cflags='-I/opt/cuda/include'      
       # '-L/usr/lib/nvidia' (for cuda_sdk) needs to be enabled only on
       # systems with nvidia-340xx-utils or nvidia-304xx-utils
       if pacman -Qqs '^nvidia-340xx-utils$' | grep -q '^nvidia-340xx-utils$' ||
@@ -72,7 +71,7 @@ build() {
       then
           local _nvidia_340xx_ldflags='-L/usr/lib/nvidia'
       fi
-      local _ldflags="--extra-ldflags=-L/opt/cuda/lib64 ${_nvidia_340xx_ldflags}"
+      local _ldflags="-L/opt/cuda/lib64 ${_nvidia_340xx_ldflags}"
       local _ldflags="${_ldflags} -Wl,-rpath -Wl,/opt/intel/mediasdk/lib64:/opt/intel/mediasdk/plugins"
       
       # strictly specifying nvcc path is needed if package is installing
@@ -86,12 +85,12 @@ build() {
   ## if you have decklink-sdk installed
   ./configure \
     --prefix=/usr \
-    $_cflags \
-    "$_ldflags" \
+    --extra-cflags="${_cflags}" \
+    --extra-ldflags="${_ldflags}" \
     \
     --toolchain=hardened \
     \
-    --enable-rpath \
+    --disable-rpath \
     --enable-gpl \
     --enable-version3 \
     --enable-nonfree \
@@ -189,6 +188,7 @@ build() {
     --enable-opencl \
     --enable-opengl \
     --enable-openssl \
+    --enable-rkmpp \
     --enable-sndio \
     --enable-sdl2 \
     --enable-vaapi \