summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Kharitonov2017-11-09 10:11:11 +0500
committerDmitry Kharitonov2017-11-09 10:11:11 +0500
commit6c21ee4ac5d0ad9523b2aafcc29b046924ba7525 (patch)
tree049dcc79e363e26ccb42546f4a9df86285d8424d
parentebc1ebe906a52afc9f83f9c923ae5e2324a0f434 (diff)
downloadaur-6c21ee4ac5d0ad9523b2aafcc29b046924ba7525.tar.gz
Revert "Updated libva deps after recent Arch testing changes; added rkmpp support"
This reverts commit ebc1ebe906a52afc9f83f9c923ae5e2324a0f434.
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD11
2 files changed, 9 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 33ef739f71e1..00de74383fc0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Wed Nov 8 18:54:17 UTC 2017
+# Wed Nov 8 15:06:04 UTC 2017
pkgbase = ffmpeg-full-nvenc
pkgdesc = Record, convert, and stream audio and video (all codecs including Nvidia NVENC)
pkgver = 3.4
- pkgrel = 3
+ pkgrel = 2
epoch = 1
url = http://ffmpeg.org/
arch = i686
@@ -49,6 +49,7 @@ pkgbase = ffmpeg-full-nvenc
depends = libsoxr
depends = libssh
depends = libtheora
+ depends = libva
depends = libvdpau
depends = libwebp
depends = libxml2
@@ -63,9 +64,8 @@ pkgbase = ffmpeg-full-nvenc
depends = openjpeg2
depends = libopenmpt-svn
depends = opus
- depends = rockchip-mpp
- depends = rtmpdump
depends = rubberband
+ depends = rtmpdump
depends = sdl2
depends = smbclient
depends = speex
@@ -83,9 +83,6 @@ pkgbase = ffmpeg-full-nvenc
depends = zimg
depends = zlib
depends = zvbi
- depends = libva-drm.so
- depends = libva.so
- depends = libva-x11.so
depends = libvorbisenc.so
depends = libvorbis.so
depends = libvpx.so
diff --git a/PKGBUILD b/PKGBUILD
index 8568e4e552a9..ca359e87ba4f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -19,7 +19,7 @@
pkgname=ffmpeg-full-nvenc
_pkgbasename=ffmpeg
pkgver=3.4
-pkgrel=3
+pkgrel=2
epoch=1
pkgdesc="Record, convert, and stream audio and video (all codecs including Nvidia NVENC)"
arch=('i686' 'x86_64')
@@ -29,14 +29,14 @@ depends=('alsa-lib' 'bzip2' 'celt' 'chromaprint-fftw' 'fontconfig' 'frei0r-plugi
'fribidi' 'glibc' 'gnutls' 'gsm' 'jack' 'kvazaar' 'ladspa' 'lame' 'libass'
'libavc1394' 'libbluray' 'libbs2b' 'libcaca' 'libcdio-paranoia' 'libdc1394'
'libfdk-aac' 'libgme' 'libiec61883' 'libilbc' 'libmodplug' 'libomxil-bellagio'
- 'libmysofa' 'libpulse' 'librsvg' 'libsoxr' 'libssh' 'libtheora'
+ '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' 'rockchip-mpp' 'rtmpdump' 'rubberband'
+ 'openjpeg2' 'libopenmpt-svn' 'opus' 'rubberband' 'rtmpdump'
'sdl2' 'smbclient' 'speex' 'shine' 'tesseract' 'twolame' 'v4l-utils'
'vid.stab' 'vo-amrwbenc' 'libxcb' 'xvidcore' 'xz' 'wavpack' 'zeromq' 'zimg'
- 'zlib' 'zvbi' 'libva-drm.so' 'libva.so' 'libva-x11.so' 'libvorbisenc.so'
- 'libvorbis.so' 'libvpx.so' 'libx264.so' 'libx265.so' 'snappy' 'sndio' 'xavs')
+ 'zlib' 'zvbi' 'libvorbisenc.so' 'libvorbis.so' 'libvpx.so' 'libx264.so'
+ 'libx265.so' 'snappy' 'sndio' 'xavs')
depends_x86_64=('cuda' 'nvidia-utils')
makedepends=('flite' 'libmfx' 'libvdpau' 'nasm' 'opencl-headers' 'libvmaf')
optdepends=('avxsynth-git: for Avisynth support'
@@ -189,7 +189,6 @@ build() {
--enable-opencl \
--enable-opengl \
--enable-openssl \
- --enable-rkmpp \
--enable-sndio \
--enable-sdl2 \
--enable-vaapi \