Remove ffmpeg-full dependency

It seems that a ffmpeg build compiled with cuda support (like
ffmpeg-full) is not needed at all for giving cuda suppport in mpv.

It compiles fine with --enable-cuda-hwaccel when using ffmpeg from
the official repositories. And the resulting mpv binary can play
videos with cuda hwaccel decoding, needing just nvidia-utils
(libcuda.so) to be installed for this. Note that nvidia-340xx-utils
and nvidia-304xx-utils provides nvidia-utils (libcuda.so) for
legacy nvidia users. Not even the cuda package is needed for
playing videos with cuda hwaccel decoding.

This change can be reviewed if something breaks or does not
behave like the expected.

2 files changed, 26 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7ccd14fd6dc4..658743a2ea13 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu Oct 12 17:53:05 UTC 2017
+# Thu Oct 12 18:34:41 UTC 2017
 pkgbase = mpv-full-git
 	pkgdesc = A free, open source, and cross-platform media player (git version with all possible libs)
-	pkgver = 0.27.0.r227.g91ebc34344
-	pkgrel = 2
+	pkgver = 0.27.0.r228.gb4c1f0aae3
+	pkgrel = 1
 	url = http://mpv.io/
 	arch = i686
 	arch = x86_64
@@ -14,13 +14,17 @@ pkgbase = mpv-full-git
 	makedepends = ladspa
 	makedepends = vulkan-headers
 	makedepends = wayland-protocols
+	depends = ffmpeg
 	depends = lcms2
+	depends = libcdio-paranoia
 	depends = libgl
 	depends = libxss
 	depends = libxinerama
 	depends = libxv
 	depends = libxkbcommon
+	depends = libva
 	depends = wayland
+	depends = libcaca
 	depends = desktop-file-utils
 	depends = hicolor-icon-theme
 	depends = xdg-utils
@@ -28,32 +32,26 @@ pkgbase = mpv-full-git
 	depends = libdvdnav
 	depends = libxrandr
 	depends = jack
-	depends = vapoursynth
-	depends = libarchive
+	depends = rubberband
 	depends = uchardet
-	depends = zlib
+	depends = libarchive
+	depends = openal
+	depends = smbclient
+	depends = vapoursynth
 	depends = vulkan-icd-loader
+	depends = zlib
 	depends = mujs
 	depends = rsound
 	depends = sndio
 	depends = shaderc-git
 	optdepends = youtube-dl: for video-sharing websites playback
+	optdepends = nvidia-utils: for hardware accelerated video decoding with CUDA
 	provides = mpv
 	conflicts = mpv
 	conflicts = mpv-git
 	options = !emptydirs
 	source = mpv-full-git::git+https://github.com/mpv-player/mpv.git
 	sha256sums = SKIP
-	depends_i686 = libcdio-paranoia
-	depends_i686 = libcaca
-	depends_i686 = smbclient
-	depends_i686 = rubberband
-	depends_i686 = libass
-	depends_i686 = libbluray
-	depends_i686 = sdl2
-	depends_i686 = openal
-	depends_i686 = ffmpeg
-	depends_x86_64 = ffmpeg-full
 
 pkgname = mpv-full-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 0f27cd1665a1..e1817b9b6616 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,39 +1,27 @@
 # Maintainer: Daniel Bermond < yahoo-com: danielbermond >
 
-# NOTE:
-# To enable CUDA support you need a ffmpeg build that has been
-# compiled with CUDA (ffmpeg-full).
-# CUDA is x86_64 only and so it will not be available in i686 builds.
-
 pkgname=mpv-full-git
-pkgver=0.27.0.r227.g91ebc34344
-pkgrel=2
+pkgver=0.27.0.r228.gb4c1f0aae3
+pkgrel=1
 pkgdesc='A free, open source, and cross-platform media player (git version with all possible libs)'
 arch=('i686' 'x86_64')
 license=('GPL3')
 url='http://mpv.io/'
 depends=(
     # official repositories:
-        'lcms2' 'libgl' 'libxss' 'libxinerama' 'libxv' 'libxkbcommon' 'wayland'
+        'ffmpeg' 'lcms2' 'libcdio-paranoia' 'libgl' 'libxss'
+        'libxinerama' 'libxv' 'libxkbcommon' 'libva' 'wayland' 'libcaca'
         'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils' 'lua52' 'libdvdnav'
-        'libxrandr' 'jack' 'vapoursynth' 'libarchive' 'uchardet' 'zlib'
-        'vulkan-icd-loader'
+        'libxrandr' 'jack' 'rubberband' 'uchardet' 'libarchive'
+        'openal' 'smbclient' 'vapoursynth' 'vulkan-icd-loader' 'zlib'
+        
     # AUR:
         'mujs' 'rsound' 'sndio' 'shaderc-git'
 )
-depends_i686=(
-    'libcdio-paranoia' 'libcaca' 'smbclient' 'rubberband' 'libass'
-    'libbluray' 'sdl2' 'openal' 'ffmpeg'
-)
-depends_x86_64=(
-    # AUR:
-        'ffmpeg-full'
-)
-optdepends=('youtube-dl: for video-sharing websites playback')
-makedepends=(
-    'git' 'mesa' 'python-docutils' 'ladspa' 'vulkan-headers'
-    'wayland-protocols'
-)
+optdepends=('youtube-dl: for video-sharing websites playback'
+            'nvidia-utils: for hardware accelerated video decoding with CUDA')
+makedepends=('git' 'mesa' 'python-docutils' 'ladspa' 'vulkan-headers'
+             'wayland-protocols')
 provides=('mpv')
 conflicts=('mpv' 'mpv-git')
 options=('!emptydirs')
@@ -52,14 +40,6 @@ pkgver() {
 build() {
     cd "$pkgname"
     
-    # Add CUDA to the build if architecture is x86_64
-    if [ "$CARCH" = 'x86_64' ] 
-    then
-        _cuda='--enable-cuda-hwaccel'
-    else
-        _cuda='--disable-cuda-hwaccel'
-    fi
-    
     msg2 'Running bootstrap. Please wait...'
     ./bootstrap.py
     
@@ -166,7 +146,7 @@ build() {
         --disable-d3d-hwaccel \
         --disable-d3d9-hwaccel \
         --disable-gl-dxinterop-d3d9 \
-        "$_cuda" \
+        --enable-cuda-hwaccel \
         \
         --enable-tv \
         --enable-tv-v4l2 \