[arch-commits] Commit in mpv/trunk (2 files)

[Christian Hesse]

    Date: Sunday, October 29, 2017 @ 21:31:15
  Author: eworm
Revision: 264700

upgpkg: mpv 1:0.27.0-3

libva 2.0.0 rebuild

Added:
  mpv/trunk/0002-vaapi-Use-libva2-message-callbacks.patch
Modified:
  mpv/trunk/PKGBUILD

-----------------------------------------------+
 0002-vaapi-Use-libva2-message-callbacks.patch |   91 ++++++++++++++++++++++++
 PKGBUILD                                      |    7 +
 2 files changed, 97 insertions(+), 1 deletion(-)

Added: 0002-vaapi-Use-libva2-message-callbacks.patch
===================================================================
--- 0002-vaapi-Use-libva2-message-callbacks.patch	                        (rev 0)
+++ 0002-vaapi-Use-libva2-message-callbacks.patch	2017-10-29 21:31:15 UTC (rev 264700)
@@ -0,0 +1,91 @@
+From 2ecf240b1cd20875991a5b18efafbe799864ff7f Mon Sep 17 00:00:00 2001
+From: Mark Thompson <sw at jkqxz.net>
+Date: Mon, 9 Oct 2017 20:10:26 +0100
+Subject: vaapi: Use libva2 message callbacks
+
+They are no longer global, so they work vaguely sensibly.
+---
+ video/vaapi.c | 32 +++++++++++++++++++++++++++++---
+ 1 file changed, 29 insertions(+), 3 deletions(-)
+
+diff --git a/video/vaapi.c b/video/vaapi.c
+index 6bedbbaa18..3b1cb9cc41 100644
+--- a/video/vaapi.c
++++ b/video/vaapi.c
+@@ -40,9 +40,27 @@ int va_get_colorspace_flag(enum mp_csp csp)
+     return 0;
+ }
+ 
+-// VA message callbacks are global and do not have a context parameter, so it's
+-// impossible to know from which VADisplay they originate. Try to route them
+-// to existing mpv/libmpv instances within this process.
++#if VA_CHECK_VERSION(1, 0, 0)
++static void va_message_callback(void *context, const char *msg, int mp_level)
++{
++    struct mp_vaapi_ctx *res = context;
++    mp_msg(res->log, mp_level, "libva: %s", msg);
++}
++
++static void va_error_callback(void *context, const char *msg)
++{
++    va_message_callback(context, msg, MSGL_ERR);
++}
++
++static void va_info_callback(void *context, const char *msg)
++{
++    va_message_callback(context, msg, MSGL_V);
++}
++#else
++// Pre-libva2 VA message callbacks are global and do not have a context
++// parameter, so it's impossible to know from which VADisplay they
++// originate.  Try to route them to existing mpv/libmpv instances within
++// this process.
+ static pthread_mutex_t va_log_mutex = PTHREAD_MUTEX_INITIALIZER;
+ static struct mp_vaapi_ctx **va_mpv_clients;
+ static int num_va_mpv_clients;
+@@ -77,6 +95,7 @@ static void va_info_callback(const char *msg)
+ {
+     va_message_callback(msg, MSGL_V);
+ }
++#endif
+ 
+ static void open_lavu_vaapi_device(struct mp_vaapi_ctx *ctx)
+ {
+@@ -108,6 +127,10 @@ struct mp_vaapi_ctx *va_initialize(VADisplay *display, struct mp_log *plog,
+         },
+     };
+ 
++#if VA_CHECK_VERSION(1, 0, 0)
++    vaSetErrorCallback(display, va_error_callback, res);
++    vaSetInfoCallback(display,  va_info_callback,  res);
++#else
+     pthread_mutex_lock(&va_log_mutex);
+     MP_TARRAY_APPEND(NULL, va_mpv_clients, num_va_mpv_clients, res);
+     pthread_mutex_unlock(&va_log_mutex);
+@@ -117,6 +140,7 @@ struct mp_vaapi_ctx *va_initialize(VADisplay *display, struct mp_log *plog,
+ #ifdef VA_FOURCC_I010
+     vaSetErrorCallback(va_error_callback);
+     vaSetInfoCallback(va_info_callback);
++#endif
+ #endif
+ 
+     int major, minor;
+@@ -154,6 +178,7 @@ void va_destroy(struct mp_vaapi_ctx *ctx)
+         if (ctx->destroy_native_ctx)
+             ctx->destroy_native_ctx(ctx->native_ctx);
+ 
++#if !VA_CHECK_VERSION(1, 0, 0)
+         pthread_mutex_lock(&va_log_mutex);
+         for (int n = 0; n < num_va_mpv_clients; n++) {
+             if (va_mpv_clients[n] == ctx) {
+@@ -164,6 +189,7 @@ void va_destroy(struct mp_vaapi_ctx *ctx)
+         if (num_va_mpv_clients == 0)
+             TA_FREEP(&va_mpv_clients); // avoid triggering leak detectors
+         pthread_mutex_unlock(&va_log_mutex);
++#endif
+ 
+         talloc_free(ctx);
+     }
+-- 
+cgit v1.1-22-g1649
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-10-29 20:59:27 UTC (rev 264699)
+++ PKGBUILD	2017-10-29 21:31:15 UTC (rev 264700)
@@ -6,7 +6,7 @@
 pkgname=mpv
 epoch=1
 pkgver=0.27.0
-pkgrel=2
+pkgrel=3
 _waf_version=1.8.12
 pkgdesc='a free, open source, and cross-platform media player'
 arch=('i686' 'x86_64')
@@ -23,9 +23,11 @@
 options=('!emptydirs')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/mpv-player/$pkgname/archive/v$pkgver.tar.gz"
   '0001-opengl-backend-support-multiple-backends.patch'
+  '0002-vaapi-Use-libva2-message-callbacks.patch'
   "http://www.freehackers.org/~tnagy/release/waf-${_waf_version}")
 sha256sums=('341d8bf18b75c1f78d5b681480b5b7f5c8b87d97a0d4f53a5648ede9c219a49c'
   '609e0530f1b0cdb910dcffb5f62bf55936540e24105ce1b2daf1bd6291a7d58a'
+  '3c3517f4f4c71e39e1e04ea440688fc8d7b3dc55e6bc0a9398d11a9b75bde07d'
   '01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b')
 
 prepare() {
@@ -34,6 +36,9 @@
   # --opengl-backend: support multiple backends (#4384) (FS#53962)
   patch -Np1 < "${srcdir}"/0001-opengl-backend-support-multiple-backends.patch
 
+  # vaapi: Use libva2 message callbacks
+  patch -Np1 < "${srcdir}"/0002-vaapi-Use-libva2-message-callbacks.patch
+
   install -m755 "${srcdir}"/waf-${_waf_version} waf
 }