Remove --disable-ffmpeg-upstream (removed by upstream)

Finally the uncomfortable situation of mpv depending on its own
ffmpeg fork (ffmpeg-mpv) was reverted by upstream mpv. Now mpv
can be built with regular upstream ffmpeg as before.

As a consequence, package no longer depends on ffmpeg-mpv-git.

2 files changed, 6 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 871c126db99b..415ac35dca36 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon Dec  4 15:55:25 UTC 2017
+# Tue Dec  5 14:07:07 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.r488.g9abb710afb
+	pkgver = 0.27.0.r493.gf19797dea6
 	pkgrel = 1
 	url = http://mpv.io/
 	arch = i686
@@ -14,6 +14,7 @@ pkgbase = mpv-full-git
 	makedepends = ladspa
 	makedepends = vulkan-headers
 	makedepends = wayland-protocols
+	depends = ffmpeg
 	depends = lcms2
 	depends = libcdio-paranoia
 	depends = libgl
@@ -39,7 +40,6 @@ pkgbase = mpv-full-git
 	depends = vapoursynth
 	depends = vulkan-icd-loader
 	depends = zlib
-	depends = ffmpeg-mpv-git
 	depends = mujs
 	depends = rsound
 	depends = sndio
diff --git a/PKGBUILD b/PKGBUILD
index 0ef890ecb0b2..1bdde0746b41 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Daniel Bermond < yahoo-com: danielbermond >
 
 pkgname=mpv-full-git
-pkgver=0.27.0.r488.g9abb710afb
+pkgver=0.27.0.r493.gf19797dea6
 pkgrel=1
 pkgdesc='A free, open source, and cross-platform media player (git version with all possible libs)'
 arch=('i686' 'x86_64')
@@ -9,14 +9,14 @@ license=('GPL3')
 url='http://mpv.io/'
 depends=(
     # official repositories:
-        'lcms2' 'libcdio-paranoia' 'libgl' 'libxss'
+        'ffmpeg' 'lcms2' 'libcdio-paranoia' 'libgl' 'libxss'
         'libxinerama' 'libxv' 'libxkbcommon' 'libva' 'wayland' 'libcaca'
         'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils' 'lua52' 'libdvdnav'
         'libxrandr' 'jack' 'rubberband' 'uchardet' 'libarchive'
         'openal' 'smbclient' 'vapoursynth' 'vulkan-icd-loader' 'zlib'
         
     # AUR:
-        'ffmpeg-mpv-git' 'mujs' 'rsound' 'sndio' 'shaderc-git' 'crossc'
+        'mujs' 'rsound' 'sndio' 'shaderc-git' 'crossc'
 )
 optdepends=('youtube-dl: for video-sharing websites playback'
             'nvidia-utils: for hardware accelerated video decoding with CUDA')
@@ -43,10 +43,6 @@ build() {
     msg2 'Running bootstrap. Please wait...'
     ./bootstrap.py
     
-    CFLAGS="${CFLAGS} -I/usr/include/ffmpeg-mpv-git" \
-    LDFLAGS="${LDFLAGS} -L/usr/lib/ffmpeg-mpv-git" \
-    PKG_CONFIG_PATH="${PKG_CONFIG_PATH:+${PKG_CONFIG_PATH}:}/usr/lib/ffmpeg-mpv-git/pkgconfig" \
-    \
     ./waf configure \
         --color='yes' \
         --prefix='/usr' \
@@ -88,7 +84,6 @@ build() {
         --enable-vapoursynth \
         --enable-vapoursynth-lazy \
         --enable-libarchive \
-        --disable-ffmpeg-upstream \
         --enable-libavdevice \
         --lua='52arch' \
         \