summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlya Tumaykin <itumaykin@gmail.com>2016-02-29 17:32:17 +0300
committerIlya Tumaykin <itumaykin@gmail.com>2016-02-29 22:28:44 +0300
commitd5c7520d1570c6495046164ed1246c8d56daf789 (patch)
treebb75a42c798a75398b96751040b6399cbf5bbc56 /media-video/mpv/files
parentmedia-video/mpv: verbump to 0.16.0 (diff)
downloadgentoo-d5c7520d1570c6495046164ed1246c8d56daf789.tar.gz
gentoo-d5c7520d1570c6495046164ed1246c8d56daf789.tar.bz2
gentoo-d5c7520d1570c6495046164ed1246c8d56daf789.zip
media-video/mpv: remove old
Package-Manager: portage-2.2.27
Diffstat (limited to 'media-video/mpv/files')
-rw-r--r--media-video/mpv/files/mpv-0.14.0-support-GNU-__thread.patch37
-rw-r--r--media-video/mpv/files/mpv-fix-include-in-tests.patch17
2 files changed, 0 insertions, 54 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
deleted file mode 100644
index 6e17314ab7cf..000000000000
--- a/media-video/mpv/files/mpv-0.14.0-support-GNU-__thread.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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,
- }, {
diff --git a/media-video/mpv/files/mpv-fix-include-in-tests.patch b/media-video/mpv/files/mpv-fix-include-in-tests.patch
deleted file mode 100644
index b02011910e5f..000000000000
--- a/media-video/mpv/files/mpv-fix-include-in-tests.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-commit 867334395765ae7d2765e0834f9fd3dd5de53cab
-Author: Ilya Tumaykin <itumaykin@gmail.com>
-Date: Tue Dec 22 17:10:12 2015 +0300
-
- tests: fix #include
-
-diff --git a/test/gl_video.c b/test/gl_video.c
-index 253ab35..97fee94 100644
---- a/test/gl_video.c
-+++ b/test/gl_video.c
-@@ -1,5 +1,5 @@
- #include "test_helpers.h"
--#include "video/out/gl_video.h"
-+#include "video/out/opengl/video.h"
-
- static void test_scale_ambient_lux_limits(void **state) {
- float x;