diff options
author | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2017-12-06 05:15:18 +0300 |
---|---|---|
committer | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2017-12-06 05:15:18 +0300 |
commit | 51033e9c51b4c49a76416e4abb1af57b0d74ff09 (patch) | |
tree | 54e79b399272ad8921e35fd7e59bc8b908fc20cc /media-video/mpv/files/mpv-fix-ffmpeg-mpv-version-check.patch | |
parent | c34d496cd11541568f2b7f47e394be0ffa9726ba (diff) |
mpv shit conitnues.....
so patch based method proposed by https://bugs.gentoo.org/show_bug.cgi?id=635650 does not work properly and
also require a lot of maintanance on any tiny change in build scripts.
so i decided to use method used in arch'a aur: https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=mpv-git
https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=ffmpeg-mpv-git
Diffstat (limited to 'media-video/mpv/files/mpv-fix-ffmpeg-mpv-version-check.patch')
-rw-r--r-- | media-video/mpv/files/mpv-fix-ffmpeg-mpv-version-check.patch | 46 |
1 files changed, 0 insertions, 46 deletions
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 deleted file mode 100644 index 99fb32e..0000000 --- a/media-video/mpv/files/mpv-fix-ffmpeg-mpv-version-check.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/wscript b/wscript -index 8db26d5b1c..9aaba07ac5 100644 ---- a/wscript -+++ b/wscript -@@ -412,20 +412,20 @@ iconv support use --disable-iconv.", - ] - - ffmpeg_pkg_config_checks = [ -- 'libavutil', '>= 56.0.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.6.102', -+ 'libavformat', '>= 1.0.102', -+ 'libswscale', '>= 1.0.101', -+ 'libavfilter', '>= 1.0.101', -+ 'libswresample', '>= 1.0.100', - ] - libav_pkg_config_checks = [ -- 'libavutil', '>= 56.6.0', -- 'libavcodec', '>= 58.5.0', -- 'libavformat', '>= 58.1.0', -- 'libswscale', '>= 5.0.0', -- 'libavfilter', '>= 7.0.0', -- 'libavresample', '>= 4.0.0', -+ 'libavutil', '>= 1.6.0', -+ 'libavcodec', '>= 1.5.0', -+ 'libavformat', '>= 1.1.0', -+ 'libswscale', '>= 1.0.0', -+ 'libavfilter', '>= 1.0.0', -+ 'libavresample', '>= 1.0.0', - ] - - def check_ffmpeg_or_libav_versions(): -@@ -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_VERSION_MICRO >= 100 ? 1 : -1]', - use='libavcodec'), - }, { |