mpv: adapted ffmpeg patch to current master

3 files changed, 13 insertions, 12 deletions

diff --git a/media-video/ffmpeg-mpv/ffmpeg-mpv-scm.ebuild b/media-video/ffmpeg-mpv/ffmpeg-mpv-scm.ebuild
index f73d2af..3ed1177 100644
--- a/media-video/ffmpeg-mpv/ffmpeg-mpv-scm.ebuild
+++ b/media-video/ffmpeg-mpv/ffmpeg-mpv-scm.ebuild
@@ -18,6 +18,7 @@ inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs git-r3
 DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
 HOMEPAGE="http://ffmpeg.org/"
 SRC_URI=""
+EGIT_REPO_URI="https://github.com/mpv-player/ffmpeg-mpv"
 FFMPEG_REVISION="${PV#*_p}"
 
 SLOT="0"
diff --git a/media-video/mpv/files/mpv-fix-ffmpeg-mpv-version-check.patch b/media-video/mpv/files/mpv-fix-ffmpeg-mpv-version-check.patch
index 9b5558d..99fb32e 100644
--- a/media-video/mpv/files/mpv-fix-ffmpeg-mpv-version-check.patch
+++ b/media-video/mpv/files/mpv-fix-ffmpeg-mpv-version-check.patch
@@ -1,18 +1,19 @@
 diff --git a/wscript b/wscript
+index 8db26d5b1c..9aaba07ac5 100644
 --- a/wscript
 +++ b/wscript
-@@ -426,20 +426,20 @@
+@@ -412,20 +412,20 @@ iconv support use --disable-iconv.",
  ]
-
+ 
  ffmpeg_pkg_config_checks = [
 -    'libavutil',     '>= 56.0.100',
--    'libavcodec',    '>= 58.2.100',
+-    'libavcodec',    '>= 58.6.102',
 -    'libavformat',   '>= 58.0.102',
 -    'libswscale',    '>= 5.0.101',
 -    'libavfilter',   '>= 7.0.101',
 -    'libswresample', '>= 3.0.100',
 +    'libavutil',     '>= 1.0.100',
-+    'libavcodec',    '>= 1.2.100',
++    'libavcodec',    '>= 1.6.102',
 +    'libavformat',   '>= 1.0.102',
 +    'libswscale',    '>= 1.0.101',
 +    'libavfilter',   '>= 1.0.101',
@@ -32,14 +33,14 @@ diff --git a/wscript b/wscript
 +    'libavfilter',   '>= 1.0.0',
 +    'libavresample', '>= 1.0.0',
  ]
-
+ 
  def check_ffmpeg_or_libav_versions():
-@@ -460,7 +460,7 @@
-     }, {
-         'name': 'ffmpeg_mpv',
-         'desc': 'libav* is FFmpeg mpv modified version',
+@@ -447,7 +447,7 @@ libav_dependencies = [
+         'name': 'ffmpeg',
+         'desc': 'libav* is FFmpeg',
+         # FFmpeg <=> LIBAVUTIL_VERSION_MICRO>=100
 -        'func': check_statement('libavcodec/version.h',
 +        'func': check_statement('/usr/lib/ffmpeg-mpv/include/libavcodec/version.h',
-                                 'int x[LIBAVCODEC_MPV ? 1 : -1]',
-                                 use='libavcodec')
+                                 'int x[LIBAVCODEC_VERSION_MICRO >= 100 ? 1 : -1]',
+                                 use='libavcodec'),
      }, {
diff --git a/media-video/mpv/mpv-scm.ebuild b/media-video/mpv/mpv-scm.ebuild
index 68c5834..201b92c 100644
--- a/media-video/mpv/mpv-scm.ebuild
+++ b/media-video/mpv/mpv-scm.ebuild
@@ -135,7 +135,6 @@ RDEPEND="${COMMON_DEPEND}
 PATCHES=(
 	"${FILESDIR}/${PN}-0.19.0-make-ffmpeg-version-check-non-fatal.patch"
 	"${FILESDIR}/${PN}-fix-ffmpeg-mpv-version-check.patch"
-	#"${FILESDIR}/${PN}-0.23.0-make-libavdevice-check-accept-libav.patch"
 )
 
 pkg_setup() {