[arch-commits] Commit in mpv/repos/community-x86_64 (8 files)
Date: Wednesday, February 14, 2018 @ 13:03:09 Author: eworm Revision: 294296 archrelease: copy trunk to community-x86_64 Added: mpv/repos/community-x86_64/0001-opengl-backend-support-multiple-backends.patch (from rev 294295, mpv/trunk/0001-opengl-backend-support-multiple-backends.patch) mpv/repos/community-x86_64/0002-vaapi-Use-libva2-message-callbacks.patch (from rev 294295, mpv/trunk/0002-vaapi-Use-libva2-message-callbacks.patch) mpv/repos/community-x86_64/0003-demux_lavf-return-AVERROR_EOF-on-file-end.patch (from rev 294295, mpv/trunk/0003-demux_lavf-return-AVERROR_EOF-on-file-end.patch) mpv/repos/community-x86_64/PKGBUILD (from rev 294295, mpv/trunk/PKGBUILD) Deleted: mpv/repos/community-x86_64/0001-opengl-backend-support-multiple-backends.patch mpv/repos/community-x86_64/0002-vaapi-Use-libva2-message-callbacks.patch mpv/repos/community-x86_64/0003-demux_lavf-return-AVERROR_EOF-on-file-end.patch mpv/repos/community-x86_64/PKGBUILD --+ 0001-opengl-backend-support-multiple-backends.patch | 582 - 0002-vaapi-Use-libva2-message-callbacks.patch| 182 ++--- 0003-demux_lavf-return-AVERROR_EOF-on-file-end.patch | 52 - PKGBUILD | 152 ++-- 4 files changed, 484 insertions(+), 484 deletions(-) Deleted: 0001-opengl-backend-support-multiple-backends.patch === --- 0001-opengl-backend-support-multiple-backends.patch 2018-02-14 13:02:53 UTC (rev 294295) +++ 0001-opengl-backend-support-multiple-backends.patch 2018-02-14 13:03:09 UTC (rev 294296) @@ -1,291 +0,0 @@ -From 9c397af0dabfff7177bcb76409af5b8f9ae608cf Mon Sep 17 00:00:00 2001 -From: Drew DeVault -Date: Thu, 27 Apr 2017 17:19:58 -0400 -Subject: [PATCH 1/4] --opengl-backend: support multiple backends - -Will attempt each backend specified in order. The x11 backend is still -preferred, even on Wayland, but the user can now use ---opengl-backend=wayland,x11 to prefer wayland and fall back to x11 if -wayland is unavailable. - video/out/opengl/context.c | 66 +- - video/out/opengl/context.h | 8 ++ - video/out/vo_opengl.c | 7 +++-- - 3 files changed, 64 insertions(+), 17 deletions(-) - -diff --git a/video/out/opengl/context.c b/video/out/opengl/context.c -index 72311e11fa..568bb662b8 100644 a/video/out/opengl/context.c -+++ b/video/out/opengl/context.c -@@ -89,6 +89,30 @@ static const struct mpgl_driver *const backends[] = { - #endif - }; - -+static bool get_desc(struct m_obj_desc *dst, int index) -+{ -+if (index >= MP_ARRAY_SIZE(backends) - 1) -+return false; -+const struct mpgl_driver *driver = backends[index]; -+*dst = (struct m_obj_desc) { -+.name = driver->name, -+.description = driver->name, -+.priv_size = sizeof(struct mpgl_driver), -+.p = driver, -+}; -+return true; -+} -+ -+// for backend option -+const struct m_obj_list mpgl_backend_list = { -+.get_desc = get_desc, -+.description = "OpenGL windowing backends", -+.allow_unknown_entries = true, -+.allow_disable_entries = true, -+.allow_trailer = true, -+.disallow_positional_parameters = true, -+}; -+ - // 0-terminated list of desktop GL versions a backend should try to - // initialize. The first entry is the most preferred version. - const int mpgl_preferred_gl_versions[] = { -@@ -100,7 +124,7 @@ const int mpgl_preferred_gl_versions[] = { - 0 - }; - --int mpgl_find_backend(const char *name) -+static int mpgl_find_backend(const char *name) - { - if (name == NULL || strcmp(name, "auto") == 0) - return -1; -@@ -126,7 +150,7 @@ int mpgl_validate_backend_opt(struct mp_log *log, const struct m_option *opt, - return mpgl_find_backend(s) >= -1 ? 1 : M_OPT_INVALID; - } - --static void *get_native_display(void *pctx, const char *name) -+static void *get_native_display(const char *name) - { - MPGLContext *ctx = pctx; - if (!ctx->native_display_type || !name) -@@ -186,11 +210,41 @@ cleanup: - - // Create a VO window and create a GL context on it. - // vo_flags: passed to the backend's create window function --MPGLContext *mpgl_init(struct vo *vo, const char *backend_name, int vo_flags) -+MPGLContext *mpgl_init(struct vo *vo, struct m_obj_settings *backend_list, int vo_flags) - { - MPGLContext *ctx = NULL; --int index = mpgl_find_backend(backend_name); --if (index == -1) { -+if (backend_list && backend_list[0].name) { -+int n; -+for (n = 0; backend_list[n].name; n++) { -+// Something like "--opengl-backend=name," allows fallback to autoprobing. -+int index = mpgl_find_backend(backend_list[n].name); -+if (index == -1 || strlen(backend_list[n].name) == 0) -+goto autoprobe; -+if (index == -2) { -+MP
[arch-commits] Commit in mpv/repos/community-x86_64 (8 files)
Date: Sunday, February 11, 2018 @ 19:46:39 Author: eworm Revision: 292521 archrelease: copy trunk to community-x86_64 Added: mpv/repos/community-x86_64/0001-opengl-backend-support-multiple-backends.patch (from rev 292520, mpv/trunk/0001-opengl-backend-support-multiple-backends.patch) mpv/repos/community-x86_64/0002-vaapi-Use-libva2-message-callbacks.patch (from rev 292520, mpv/trunk/0002-vaapi-Use-libva2-message-callbacks.patch) mpv/repos/community-x86_64/0003-demux_lavf-return-AVERROR_EOF-on-file-end.patch (from rev 292520, mpv/trunk/0003-demux_lavf-return-AVERROR_EOF-on-file-end.patch) mpv/repos/community-x86_64/PKGBUILD (from rev 292520, mpv/trunk/PKGBUILD) Deleted: mpv/repos/community-x86_64/0001-opengl-backend-support-multiple-backends.patch mpv/repos/community-x86_64/0002-vaapi-Use-libva2-message-callbacks.patch mpv/repos/community-x86_64/0003-demux_lavf-return-AVERROR_EOF-on-file-end.patch mpv/repos/community-x86_64/PKGBUILD --+ 0001-opengl-backend-support-multiple-backends.patch | 582 - 0002-vaapi-Use-libva2-message-callbacks.patch| 182 ++--- 0003-demux_lavf-return-AVERROR_EOF-on-file-end.patch | 52 - PKGBUILD | 152 ++-- 4 files changed, 484 insertions(+), 484 deletions(-) Deleted: 0001-opengl-backend-support-multiple-backends.patch === --- 0001-opengl-backend-support-multiple-backends.patch 2018-02-11 19:46:26 UTC (rev 292520) +++ 0001-opengl-backend-support-multiple-backends.patch 2018-02-11 19:46:39 UTC (rev 292521) @@ -1,291 +0,0 @@ -From 9c397af0dabfff7177bcb76409af5b8f9ae608cf Mon Sep 17 00:00:00 2001 -From: Drew DeVault -Date: Thu, 27 Apr 2017 17:19:58 -0400 -Subject: [PATCH 1/4] --opengl-backend: support multiple backends - -Will attempt each backend specified in order. The x11 backend is still -preferred, even on Wayland, but the user can now use ---opengl-backend=wayland,x11 to prefer wayland and fall back to x11 if -wayland is unavailable. - video/out/opengl/context.c | 66 +- - video/out/opengl/context.h | 8 ++ - video/out/vo_opengl.c | 7 +++-- - 3 files changed, 64 insertions(+), 17 deletions(-) - -diff --git a/video/out/opengl/context.c b/video/out/opengl/context.c -index 72311e11fa..568bb662b8 100644 a/video/out/opengl/context.c -+++ b/video/out/opengl/context.c -@@ -89,6 +89,30 @@ static const struct mpgl_driver *const backends[] = { - #endif - }; - -+static bool get_desc(struct m_obj_desc *dst, int index) -+{ -+if (index >= MP_ARRAY_SIZE(backends) - 1) -+return false; -+const struct mpgl_driver *driver = backends[index]; -+*dst = (struct m_obj_desc) { -+.name = driver->name, -+.description = driver->name, -+.priv_size = sizeof(struct mpgl_driver), -+.p = driver, -+}; -+return true; -+} -+ -+// for backend option -+const struct m_obj_list mpgl_backend_list = { -+.get_desc = get_desc, -+.description = "OpenGL windowing backends", -+.allow_unknown_entries = true, -+.allow_disable_entries = true, -+.allow_trailer = true, -+.disallow_positional_parameters = true, -+}; -+ - // 0-terminated list of desktop GL versions a backend should try to - // initialize. The first entry is the most preferred version. - const int mpgl_preferred_gl_versions[] = { -@@ -100,7 +124,7 @@ const int mpgl_preferred_gl_versions[] = { - 0 - }; - --int mpgl_find_backend(const char *name) -+static int mpgl_find_backend(const char *name) - { - if (name == NULL || strcmp(name, "auto") == 0) - return -1; -@@ -126,7 +150,7 @@ int mpgl_validate_backend_opt(struct mp_log *log, const struct m_option *opt, - return mpgl_find_backend(s) >= -1 ? 1 : M_OPT_INVALID; - } - --static void *get_native_display(void *pctx, const char *name) -+static void *get_native_display(const char *name) - { - MPGLContext *ctx = pctx; - if (!ctx->native_display_type || !name) -@@ -186,11 +210,41 @@ cleanup: - - // Create a VO window and create a GL context on it. - // vo_flags: passed to the backend's create window function --MPGLContext *mpgl_init(struct vo *vo, const char *backend_name, int vo_flags) -+MPGLContext *mpgl_init(struct vo *vo, struct m_obj_settings *backend_list, int vo_flags) - { - MPGLContext *ctx = NULL; --int index = mpgl_find_backend(backend_name); --if (index == -1) { -+if (backend_list && backend_list[0].name) { -+int n; -+for (n = 0; backend_list[n].name; n++) { -+// Something like "--opengl-backend=name," allows fallback to autoprobing. -+int index = mpgl_find_backend(backend_list[n].name); -+if (index == -1 || strlen(backend_list[n].name) == 0) -+goto autoprobe; -+if (index == -2) { -+MP_FA
[arch-commits] Commit in mpv/repos/community-x86_64 (8 files)
Date: Friday, December 15, 2017 @ 17:34:42 Author: eworm Revision: 274532 archrelease: copy trunk to community-x86_64 Added: mpv/repos/community-x86_64/0001-opengl-backend-support-multiple-backends.patch (from rev 274531, mpv/trunk/0001-opengl-backend-support-multiple-backends.patch) mpv/repos/community-x86_64/0002-vaapi-Use-libva2-message-callbacks.patch (from rev 274531, mpv/trunk/0002-vaapi-Use-libva2-message-callbacks.patch) mpv/repos/community-x86_64/0003-demux_lavf-return-AVERROR_EOF-on-file-end.patch (from rev 274531, mpv/trunk/0003-demux_lavf-return-AVERROR_EOF-on-file-end.patch) mpv/repos/community-x86_64/PKGBUILD (from rev 274531, mpv/trunk/PKGBUILD) Deleted: mpv/repos/community-x86_64/0001-opengl-backend-support-multiple-backends.patch mpv/repos/community-x86_64/0002-vaapi-Use-libva2-message-callbacks.patch mpv/repos/community-x86_64/0003-demux_lavf-return-AVERROR_EOF-on-file-end.patch mpv/repos/community-x86_64/PKGBUILD --+ 0001-opengl-backend-support-multiple-backends.patch | 582 - 0002-vaapi-Use-libva2-message-callbacks.patch| 182 ++--- 0003-demux_lavf-return-AVERROR_EOF-on-file-end.patch | 52 - PKGBUILD | 149 ++-- 4 files changed, 484 insertions(+), 481 deletions(-) Deleted: 0001-opengl-backend-support-multiple-backends.patch === --- 0001-opengl-backend-support-multiple-backends.patch 2017-12-15 17:34:37 UTC (rev 274531) +++ 0001-opengl-backend-support-multiple-backends.patch 2017-12-15 17:34:42 UTC (rev 274532) @@ -1,291 +0,0 @@ -From 9c397af0dabfff7177bcb76409af5b8f9ae608cf Mon Sep 17 00:00:00 2001 -From: Drew DeVault -Date: Thu, 27 Apr 2017 17:19:58 -0400 -Subject: [PATCH 1/4] --opengl-backend: support multiple backends - -Will attempt each backend specified in order. The x11 backend is still -preferred, even on Wayland, but the user can now use ---opengl-backend=wayland,x11 to prefer wayland and fall back to x11 if -wayland is unavailable. - video/out/opengl/context.c | 66 +- - video/out/opengl/context.h | 8 ++ - video/out/vo_opengl.c | 7 +++-- - 3 files changed, 64 insertions(+), 17 deletions(-) - -diff --git a/video/out/opengl/context.c b/video/out/opengl/context.c -index 72311e11fa..568bb662b8 100644 a/video/out/opengl/context.c -+++ b/video/out/opengl/context.c -@@ -89,6 +89,30 @@ static const struct mpgl_driver *const backends[] = { - #endif - }; - -+static bool get_desc(struct m_obj_desc *dst, int index) -+{ -+if (index >= MP_ARRAY_SIZE(backends) - 1) -+return false; -+const struct mpgl_driver *driver = backends[index]; -+*dst = (struct m_obj_desc) { -+.name = driver->name, -+.description = driver->name, -+.priv_size = sizeof(struct mpgl_driver), -+.p = driver, -+}; -+return true; -+} -+ -+// for backend option -+const struct m_obj_list mpgl_backend_list = { -+.get_desc = get_desc, -+.description = "OpenGL windowing backends", -+.allow_unknown_entries = true, -+.allow_disable_entries = true, -+.allow_trailer = true, -+.disallow_positional_parameters = true, -+}; -+ - // 0-terminated list of desktop GL versions a backend should try to - // initialize. The first entry is the most preferred version. - const int mpgl_preferred_gl_versions[] = { -@@ -100,7 +124,7 @@ const int mpgl_preferred_gl_versions[] = { - 0 - }; - --int mpgl_find_backend(const char *name) -+static int mpgl_find_backend(const char *name) - { - if (name == NULL || strcmp(name, "auto") == 0) - return -1; -@@ -126,7 +150,7 @@ int mpgl_validate_backend_opt(struct mp_log *log, const struct m_option *opt, - return mpgl_find_backend(s) >= -1 ? 1 : M_OPT_INVALID; - } - --static void *get_native_display(void *pctx, const char *name) -+static void *get_native_display(const char *name) - { - MPGLContext *ctx = pctx; - if (!ctx->native_display_type || !name) -@@ -186,11 +210,41 @@ cleanup: - - // Create a VO window and create a GL context on it. - // vo_flags: passed to the backend's create window function --MPGLContext *mpgl_init(struct vo *vo, const char *backend_name, int vo_flags) -+MPGLContext *mpgl_init(struct vo *vo, struct m_obj_settings *backend_list, int vo_flags) - { - MPGLContext *ctx = NULL; --int index = mpgl_find_backend(backend_name); --if (index == -1) { -+if (backend_list && backend_list[0].name) { -+int n; -+for (n = 0; backend_list[n].name; n++) { -+// Something like "--opengl-backend=name," allows fallback to autoprobing. -+int index = mpgl_find_backend(backend_list[n].name); -+if (index == -1 || strlen(backend_list[n].name) == 0) -+goto autoprobe; -+if (index == -2) { -+MP_FA