moved back to ffmpeg

4 files changed, 16 insertions, 53 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8c6fb04127c8..54b4c902a2ff 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sun Dec 10 04:38:44 UTC 2017
+# Wed Dec 13 18:34:03 UTC 2017
 pkgbase = mpv-ahjolinna-git
 	pkgdesc = MPV using ahjolinna's personal pre-made conf build
-	pkgver = 0.27.0.r515.g39bc954488
+	pkgver = 0.27.0.r531.g26cdd52801
 	pkgrel = 1
 	url = http://mpv.io
 	install = mpv.install
@@ -11,7 +11,7 @@ pkgbase = mpv-ahjolinna-git
 	makedepends = mesa
 	makedepends = python-docutils
 	makedepends = ladspa
-	makedepends = x264
+	makedepends = x264-git
 	makedepends = x265
 	makedepends = openal
 	makedepends = jack
@@ -25,8 +25,9 @@ pkgbase = mpv-ahjolinna-git
 	makedepends = streamlink
 	makedepends = youtube-dl
 	depends = pulseaudio
+	depends = crossc
 	depends = lcms2
-	depends = ffmpeg-mpv-full-git
+	depends = 
 	depends = mujs
 	depends = libdvdread
 	depends = libgl
diff --git a/PKGBUILD b/PKGBUILD
index 71eb12be981e..650dd86f9fcf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,11 +9,9 @@
 # different system ffmpeg. You can build mpv against the system ffmpeg instead
 # by uncommenting the second line below, but this may sometimes fail to build
 # when mpv depends on a feature that hasn't been merged into upstream ffmpeg.
-_ffmpeg_depend=ffmpeg-mpv-full-git
-#_ffmpeg_depend=ffmpeg-full-git
 pkgname=mpv-ahjolinna-git
 _gitname=mpv
-pkgver=0.27.0.r515.g39bc954488
+pkgver=0.27.0.r531.g26cdd52801
 pkgrel=1
 #epoch=2
 pkgdesc="MPV using ahjolinna's personal pre-made conf build"
@@ -21,7 +19,7 @@ arch=('x86_64')
 license=('GPL')
 url='http://mpv.io'
 _undetected_depends=('desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils')
-depends=('pulseaudio' 'lcms2' "$_ffmpeg_depend" 'mujs' 'libdvdread' 'libgl' 'libvdpau'
+depends=('pulseaudio' 'crossc' 'lcms2' "$_ffmpeg_depend" 'mujs' 'libdvdread' 'libgl' 'libvdpau'
          'libxinerama' 'libxv' 'libxkbcommon' 'libva'  'libass' 'uchardet' 
 	 'wayland' 'v4l-utils' 'lua52' 'rsound' 'sndio' 'libdvdnav' 'libcdio-paranoia' 'libbluray' 'libxss'
          'enca' 'libguess' 'harfbuzz' 'libxrandr' 'rubberband' 'smbclient' "${_undetected_depends[@]}")
@@ -36,7 +34,7 @@ optdepends=('youtube-dl: Another way to view youtuve videos with mpv'
             'adobe-source-sans-pro-fonts: Font as shown in the conf'
             )
 
-makedepends=('mesa' 'python-docutils' 'ladspa' 'x264' 'x265' 'openal' 'jack'
+makedepends=('mesa' 'python-docutils' 'ladspa' 'x264-git' 'x265' 'openal' 'jack'
              'samba' 'acpitool' 'inxi' 'git' 'vapoursynth' 'libvdpau' 'libva'
               'streamlink' 'youtube-dl')
 # check kind of graphic card
@@ -48,7 +46,6 @@ fi
 provides=('mpv' 'mpv-git')
 conflicts=('mpv' 'mpv-vapoursynth' 'mpv-ahjolinna-build-git' 'mpv-build-git' 'mpv-ahjolinna' )
 options=('!emptydirs')
-install=mpv.install
 source=('git+https://github.com/mpv-player/mpv'
         'git+https://github.com/ahjolinna/mpv-conf'
         'find-deps.py'
@@ -88,13 +85,6 @@ msg2 "Running bootstrap. Please wait..."
 
 build() {
   cd "${srcdir}/$_gitname"
-if [[ "$_ffmpeg_depend" = *-mpv* ]]; then
-      export CFLAGS="${CFLAGS} -I/usr/include/ffmpeg-mpv-git" \
-      export LDFLAGS="${LDFLAGS} -L/usr/lib/ffmpeg-mpv-git" \
-      export PKG_CONFIG_PATH="${PKG_CONFIG_PATH:+$PKG_CONFIG_PATH:}/usr/lib/ffmpeg-mpv-git/pkgconfig"
-  else
-    _opt_extra_flags+=("--enable-ffmpeg-upstream")
-  fi
  ./waf configure \
 	            --color=yes \
 	            --prefix=/usr \
@@ -115,6 +105,7 @@ if [[ "$_ffmpeg_depend" = *-mpv* ]]; then
 	            --enable-iconv \
 	            --enable-libsmbclient \
 	            --enable-lua \
+              --enable-crossc \
 	            --enable-libass \
 	            --enable-libass-osd \
 	            --enable-encoding \
@@ -181,14 +172,13 @@ if [[ "$_ffmpeg_depend" = *-mpv* ]]; then
 	            --enable-libv4l2 \
 	            --enable-audio-input \
 	            --enable-dvbin \
-	            --disable-apple-remote \
-              "${_opt_extra_flags[@]}"
-	
+	            --disable-apple-remote
+
 	./waf build
 }
 package() {
   cd "$srcdir/$_gitname"
-  ./waf install --destdir="${pkgdir}" 
+  ./waf install --destdir="${pkgdir}"
 
 
  # install the .desktop files
@@ -198,10 +188,8 @@ package() {
   install -Dm644 "${srcdir}/mpv-MVtools.desktop" "${pkgdir}/usr/share/applications/mpv-MVtools.desktop"
   install -Dm644 "${srcdir}/mpv-CUDA.desktop" "${pkgdir}/usr/share/applications/mpv-CUDA.desktop"
   install -Dm644 "${srcdir}/mpv-SVP.desktop" "${pkgdir}/usr/share/applications/mpv-SVP.desktop"
-  
-  
-  
-  
+
+
   # install BT.709 ICC profiles (https://github.com/mpv-player/mpv/issues/534#issuecomment-35823203)
 
    cd ${srcdir}/mpv-conf/PKGBUILD
@@ -209,16 +197,14 @@ package() {
    install -Dm755 "BT.709_Profiles/BT.709.gamma.1.95.icc" "${pkgdir}/usr/share/color/icc/BT.709_Profiles/BT.709.gamma.1.95.icc"
    install -Dm755 "BT.709_Profiles/BT.709.gamma.1.95.icc" "${pkgdir}/usr/share/color/icc/BT.709_Profiles/BT.709.icc"
    install -Dm755 "BT.709_Profiles/BT.709.gamma.1.95.icc" "${pkgdir}/usr/share/color/icc/BT.709_Profiles/BT.709.linear.icc"
-  
-  
+
     #install ahjolinna "config-build" files
  cp -R ${srcdir}/mpv-conf/mpv/etc/* ${pkgdir}/etc/mpv
     install -d "${pkgdir}/etc/mpv/"
-  
 
   # Update dependencies automatically based on dynamic libraries
   _detected_depends=($("$srcdir"/find-deps.py "$pkgdir"/usr/{bin/mpv,lib/libmpv.so}))
-  
+
   msg 'Auto-detected dependencies:'
   echo "${_detected_depends[@]}" | fold -s -w 79 | sed 's/^/ /'
   depends=("${_detected_depends[@]}" "${_undetected_depends[@]}")
diff --git a/mpv-git.install b/mpv-git.install
deleted file mode 100644
index 5c501dc49916..000000000000
--- a/mpv-git.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/mpv.install b/mpv.install
index 8c482fc0989f..813fd2a22a25 100644
--- a/mpv.install
+++ b/mpv.install
@@ -12,15 +12,3 @@ support can be provided by lua52 or luajit.
 EOF
 }
 
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}