diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-11-03 16:06:58 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-11-03 16:06:58 +0000 |
commit | bd4aeefe33e63f613512604e47bfca7b2187697d (patch) | |
tree | adb35b5a9a00ee7ea591ab0c987f70167c23b597 /media-video/mpv/files | |
parent | 48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff) |
gentoo resync : 03.11.2019
Diffstat (limited to 'media-video/mpv/files')
5 files changed, 27 insertions, 134 deletions
diff --git a/media-video/mpv/files/mpv-0.19.0-make-ffmpeg-version-check-non-fatal.patch b/media-video/mpv/files/mpv-0.19.0-make-ffmpeg-version-check-non-fatal.patch deleted file mode 100644 index 7c8d5b44c825..000000000000 --- a/media-video/mpv/files/mpv-0.19.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 67dde3449..696d2e716 100644 ---- a/player/main.c -+++ b/player/main.c -@@ -419,13 +419,12 @@ int mp_initialize(struct MPContext *mpctx, char **options) - if (!print_libav_versions(mp_null_log, 0)) { - // Using mismatched libraries can be legitimate, but even then it's - // a bad idea. We don't acknowledge its usefulness and stability. -- 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 (opts->dump_stats && opts->dump_stats[0]) { diff --git a/media-video/mpv/files/mpv-0.23.0-make-libavdevice-check-accept-libav.patch b/media-video/mpv/files/mpv-0.23.0-make-libavdevice-check-accept-libav.patch deleted file mode 100644 index de70a4f5cf78..000000000000 --- a/media-video/mpv/files/mpv-0.23.0-make-libavdevice-check-accept-libav.patch +++ /dev/null @@ -1,20 +0,0 @@ -build: make libavdevice configure check accept libav-12 - -libav-12 is supported, but configure script expects -a higher libavdevice version than libav-12 provides. - -Gentoo-Bug: 603122 - -diff --git a/wscript b/wscript -index 94db7e296..7f61f54cc 100644 ---- a/wscript -+++ b/wscript -@@ -444,7 +444,7 @@ FFmpeg/Libav libraries. You need at least {0}. Aborting.".format(libav_versions_ - }, { - 'name': '--libavdevice', - 'desc': 'libavdevice', -- 'func': check_pkg_config('libavdevice', '>= 57.0.0'), -+ 'func': check_pkg_config('libavdevice', '>= 56.1.0'), - }, { - 'name': 'avcodec-chroma-pos-api', - 'desc': 'libavcodec avcodec_enum_to_chroma_pos API', diff --git a/media-video/mpv/files/mpv-0.25.0-fix-float-comparisons-in-tests.patch b/media-video/mpv/files/mpv-0.25.0-fix-float-comparisons-in-tests.patch deleted file mode 100644 index 5498b99a3c76..000000000000 --- a/media-video/mpv/files/mpv-0.25.0-fix-float-comparisons-in-tests.patch +++ /dev/null @@ -1,61 +0,0 @@ -commit f4f24c105f9c132e84cba9a9707acc261033a816 -Author: Ilya Tumaykin <itumaykin@gmail.com> -Date: Thu Feb 1 14:05:06 2018 +0300 - -tests: stop comparing floats against DBL_EPSILON, use FLT_EPSILON - -Fixes #5253. - -diff --git a/test/gl_video.c b/test/gl_video.c -index a2d2577e25..6b5f3a7060 100644 ---- a/test/gl_video.c -+++ b/test/gl_video.c -@@ -4,22 +4,22 @@ - static void test_scale_ambient_lux_limits(void **state) { - float x; - x = gl_video_scale_ambient_lux(16.0, 64.0, 2.40, 1.961, 16.0); -- assert_double_equal(x, 2.40f); -+ assert_float_equal(x, 2.40f); - - x = gl_video_scale_ambient_lux(16.0, 64.0, 2.40, 1.961, 64.0); -- assert_double_equal(x, 1.961f); -+ assert_float_equal(x, 1.961f); - } - - static void test_scale_ambient_lux_sign(void **state) { - float x; - x = gl_video_scale_ambient_lux(16.0, 64.0, 1.961, 2.40, 64.0); -- assert_double_equal(x, 2.40f); -+ assert_float_equal(x, 2.40f); - } - - static void test_scale_ambient_lux_clamping(void **state) { - float x; - x = gl_video_scale_ambient_lux(16.0, 64.0, 2.40, 1.961, 0.0); -- assert_double_equal(x, 2.40f); -+ assert_float_equal(x, 2.40f); - } - - static void test_scale_ambient_lux_log10_midpoint(void **state) { -@@ -27,7 +27,7 @@ static void test_scale_ambient_lux_log10_midpoint(void **state) { - // 32 corresponds to the the midpoint after converting lux to the log10 scale - x = gl_video_scale_ambient_lux(16.0, 64.0, 2.40, 1.961, 32.0); - float mid_gamma = (2.40 - 1.961) / 2 + 1.961; -- assert_double_equal(x, mid_gamma); -+ assert_float_equal(x, mid_gamma); - } - - int main(void) { -diff --git a/test/test_helpers.h b/test/test_helpers.h -index 7a61da82ea..49328f623f 100644 ---- a/test/test_helpers.h -+++ b/test/test_helpers.h -@@ -10,6 +10,7 @@ - #include <math.h> - #include <float.h> - --#define assert_double_equal(a, b) assert_true(fabs(a - b) <= DBL_EPSILON) -+#define assert_double_equal(a, b) assert_true(fabs((a) - (b)) <= DBL_EPSILON * fmax(fabs(a), fabs(b))) -+#define assert_float_equal(a, b) assert_true(fabsf((a) - (b)) <= FLT_EPSILON * fmaxf(fabsf(a), fabsf(b))) - - #endif diff --git a/media-video/mpv/files/mpv-0.27.0-add-missing-link-flags-for-rpi.patch b/media-video/mpv/files/mpv-0.27.0-add-missing-link-flags-for-rpi.patch deleted file mode 100644 index 411573a66251..000000000000 --- a/media-video/mpv/files/mpv-0.27.0-add-missing-link-flags-for-rpi.patch +++ /dev/null @@ -1,25 +0,0 @@ -commit 48143b0cf52de37f93ae53a95261988d9b5ebff2 -Author: Ilya Tumaykin <itumaykin@gmail.com> -Date: Thu Jan 26 23:51:29 2017 +0300 - -build: rpi: add missing linker flags to fix build - -See https://www.raspberrypi.org/forums/viewtopic.php?f=67&t=20005&p=194090 -and https://github.com/raspberrypi/firmware/issues/110 - -Raspberry-pi upstream also adds '-lGLESv2' when EGL is used: -https://github.com/raspberrypi/userland/blob/master/pkgconfig/egl.pc.in - -diff --git a/wscript b/wscript -index 1880f631e5..741fe1e5a4 100644 ---- a/wscript -+++ b/wscript -@@ -772,7 +772,7 @@ video_output_features = [ - lib=['mmal_core', 'mmal_util', 'mmal_vc_client', 'bcm_host']), - # We still need all OpenGL symbols, because the vo_opengl code is - # generic and supports anything from GLES2/OpenGL 2.1 to OpenGL 4 core. -- check_cc(lib="EGL"), -+ check_cc(lib="EGL", linkflags="-lGLESv2"), - check_cc(lib="GLESv2"), - ), - } , { 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 new file mode 100644 index 000000000000..5a9be073fbfa --- /dev/null +++ b/media-video/mpv/files/mpv-0.29.1-egl-bound.patch @@ -0,0 +1,27 @@ +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', |