diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-01-15 15:51:32 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-01-15 15:51:32 +0000 |
commit | 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch) | |
tree | e1810a4b135afce04b34862ef0fab2bfaeb8aeca /media-video/mpv/files | |
parent | 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff) |
gentoo resync : 15.01.2020
Diffstat (limited to 'media-video/mpv/files')
-rw-r--r-- | media-video/mpv/files/mpv-0.29.0-make-ffmpeg-version-check-non-fatal.patch | 28 | ||||
-rw-r--r-- | media-video/mpv/files/mpv-0.29.1-egl-bound.patch | 27 |
2 files changed, 0 insertions, 55 deletions
diff --git a/media-video/mpv/files/mpv-0.29.0-make-ffmpeg-version-check-non-fatal.patch b/media-video/mpv/files/mpv-0.29.0-make-ffmpeg-version-check-non-fatal.patch deleted file mode 100644 index 1a4975a4e305..000000000000 --- a/media-video/mpv/files/mpv-0.29.0-make-ffmpeg-version-check-non-fatal.patch +++ /dev/null @@ -1,28 +0,0 @@ -player: make ffmpeg/libav version check non-fatal - -We already enforce mpv rebuilds when ffmpeg/libav SONAME changes. - -diff --git a/player/main.c b/player/main.c -index f56191a297..4e51aebd66 100644 ---- a/player/main.c -+++ b/player/main.c -@@ -387,13 +387,12 @@ int mp_initialize(struct MPContext *mpctx, char **options) - // Distro maintainers who patch this out should be aware that mpv - // intentionally ignores ABI in some places where it's not possible to - // get by without violating it. -- print_libav_versions(mpctx->log, MSGL_FATAL); -- MP_FATAL(mpctx, "\nmpv was compiled against a different version of " -- "FFmpeg/Libav than the shared\nlibrary it is linked against. " -- "This is most likely a broken build and could\nresult in " -- "misbehavior and crashes.\n\nmpv does not support this " -- "configuration and will not run - rebuild mpv instead.\n"); -- return -1; -+ print_libav_versions(mpctx->log, MSGL_WARN); -+ MP_WARN(mpctx, "\nmpv was compiled against a different version of " -+ "FFmpeg/Libav than the shared\nlibrary it is linked against. " -+ "This could result in misbehavior and crashes.\n\n" -+ "Upstream does not support this configuration.\n" -+ "Please rebuild mpv in case of any problems.\n"); - } - - if (!mpctx->playlist->first && !opts->player_idle_mode) { diff --git a/media-video/mpv/files/mpv-0.29.1-egl-bound.patch b/media-video/mpv/files/mpv-0.29.1-egl-bound.patch deleted file mode 100644 index 5a9be073fbfa..000000000000 --- a/media-video/mpv/files/mpv-0.29.1-egl-bound.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f726b368da87024a0cfe82627e0730ffe4578716 Mon Sep 17 00:00:00 2001 -From: Marvin Schmidt <marv@exherbo.org> -Date: Wed, 18 Sep 2019 17:07:29 +0200 -Subject: [PATCH] build: lower version requirement for EGL - -`egl.pc` can be provided either by mesa or libglvnd. The latter doesn't -follow the same version scheme as mesa but instead uses the API version -that the library exposes, which is 1.5 for EGL[1] - -[1] https://github.com/NVIDIA/libglvnd/commit/0dfaea2bcb7cdcc785f95e244223bd004a2d7fba#diff-b58a140c00ea99fb9a708e15afaade62R8 ---- - wscript | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/wscript b/wscript -index 3569dbf060..97a4d9196b 100644 ---- a/wscript -+++ b/wscript -@@ -636,7 +636,7 @@ video_output_features = [ - 'deps': 'wayland', - 'groups': [ 'gl' ], - 'func': check_pkg_config('wayland-egl', '>= 9.0.0', -- 'egl', '>= 9.0.0') -+ 'egl', '>= 1.5') - } , { - 'name': '--gl-win32', - 'desc': 'OpenGL Win32 Backend', |