diff options
| author |   Ilya Tumaykin <itumaykin@gmail.com> | 2015-12-22 23:40:25 +0300 |
|---|---|---|
| committer | Ilya Tumaykin <itumaykin@gmail.com> | 2015-12-28 15:47:30 +0300 |
| commit | cf902d203d54e298849bcac1b92aafee9b15f658 (patch) | |
| tree | b7fd57930007f400e24dc6d77580c1ce780d20f5 /media-video/mpv/files | |
| parent | media-video/mpv: enable egl USE by default (diff) | |
| download | gentoo-cf902d203d54e298849bcac1b92aafee9b15f658.tar.gz gentoo-cf902d203d54e298849bcac1b92aafee9b15f658.tar.bz2 gentoo-cf902d203d54e298849bcac1b92aafee9b15f658.zip | |
media-video/mpv: version bump to 0.14.0 wrt bug 564656
Gentoo-Bug: 564656
Package-Manager: portage-2.2.24
Diffstat (limited to 'media-video/mpv/files')
| -rw-r--r-- | media-video/mpv/files/mpv-0.14.0-support-GNU-__thread.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/media-video/mpv/files/mpv-0.14.0-support-GNU-__thread.patch b/media-video/mpv/files/mpv-0.14.0-support-GNU-__thread.patch new file mode 100644 index 000000000000..6e17314ab7cf --- /dev/null +++ b/media-video/mpv/files/mpv-0.14.0-support-GNU-__thread.patch @@ -0,0 +1,37 @@ +For a lengthy discussion see https://github.com/mpv-player/mpv/issues/2631 + +Upstream commits: +https://github.com/mpv-player/mpv/commit/1a6f3c56ea6e7bf9928fc99469f8f5da4578f035 +https://github.com/mpv-player/mpv/commit/946bd52a1d1eb561ff8bb516ef6efcd02ca3ea1e + +diff --git a/video/out/opengl/common.c b/video/out/opengl/common.c +index 00cd535..f607c23 100644 +--- a/video/out/opengl/common.c ++++ b/video/out/opengl/common.c +@@ -606,7 +606,13 @@ int mpgl_validate_backend_opt(struct mp_log *log, const struct m_option *opt, + } + + #if HAVE_C11_TLS +-static _Thread_local MPGLContext *current_context; ++#define MP_TLS _Thread_local ++#elif defined(__GNU__) ++#define MP_TLS __thread ++#endif ++ ++#ifdef MP_TLS ++static MP_TLS MPGLContext *current_context; + + static void * GLAPIENTRY get_native_display(const char *name) + { +diff --git a/wscript b/wscript +index a5e6914..969d9cc 100644 +--- a/wscript ++++ b/wscript +@@ -718,7 +718,6 @@ video_output_features = [ + }, { + 'name': 'vaapi-egl', + 'desc': 'VAAPI EGL', +- 'deps': [ 'c11-tls' ], # indirectly + 'deps_any': [ 'vaapi-x-egl', 'vaapi-wayland' ], + 'func': check_true, + }, { |