diff --git a/packages/multimedia/intel-vaapi-driver/package.mk b/packages/multimedia/intel-vaapi-driver/package.mk index 78f18a9ed7..fc8dffa897 100644 --- a/packages/multimedia/intel-vaapi-driver/package.mk +++ b/packages/multimedia/intel-vaapi-driver/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="intel-vaapi-driver" -PKG_VERSION="2.3.0" -PKG_SHA256="fcc3f09291e58fd316fd015d4e1329e7e03c38cffa4651bda725d500a66aa74e" +PKG_VERSION="2.4.0" +PKG_SHA256="58567dac882167021f031489062cbbab76bc646214be0ee44d5f724d960b3d76" PKG_ARCH="x86_64" PKG_LICENSE="GPL" PKG_SITE="https://01.org/linuxmedia" diff --git a/packages/multimedia/intel-vaapi-driver/patches/intel-vaapi-driver-999.01-check-the-interface-from-libva-first.patch b/packages/multimedia/intel-vaapi-driver/patches/intel-vaapi-driver-999.01-check-the-interface-from-libva-first.patch deleted file mode 100644 index 5f7813bef8..0000000000 --- a/packages/multimedia/intel-vaapi-driver/patches/intel-vaapi-driver-999.01-check-the-interface-from-libva-first.patch +++ /dev/null @@ -1,81 +0,0 @@ -From fa7fd06b25e98a6af3b221eb7c653887f53ece3d Mon Sep 17 00:00:00 2001 -From: Haihao Xiang -Date: Fri, 7 Dec 2018 13:31:43 +0800 -Subject: [PATCH] Check the interface from libva first - -And bump libva dependency to 1.4.0 - -This fixes https://github.com/intel/intel-vaapi-driver/issues/419 - -Signed-off-by: Haihao Xiang ---- - configure.ac | 2 +- - src/i965_output_wayland.c | 27 ++++++++++++++++----------- - 2 files changed, 17 insertions(+), 12 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 6cde1a3a..a0b462fb 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -10,7 +10,7 @@ m4_append([intel_vaapi_driver_version], intel_vaapi_driver_pre_version, [.pre]) - ]) - - # libva minimum version requirement --m4_define([va_api_version], [1.1.0]) -+m4_define([va_api_version], [1.4.0]) - - # libdrm minimum version requirement - m4_define([libdrm_version], [2.4.52]) -diff --git a/src/i965_output_wayland.c b/src/i965_output_wayland.c -index 122db953..a637552e 100644 ---- a/src/i965_output_wayland.c -+++ b/src/i965_output_wayland.c -@@ -397,6 +397,7 @@ i965_output_wayland_init(VADriverContextP ctx) - struct i965_driver_data * const i965 = i965_driver_data(ctx); - struct dso_handle *dso_handle; - struct wl_vtable *wl_vtable; -+ struct VADriverVTableWayland * const vtable = ctx->vtable_wayland; - - static const struct dso_symbol libegl_symbols[] = { - { -@@ -465,25 +466,29 @@ i965_output_wayland_init(VADriverContextP ctx) - if (!i965->wl_output) - goto error; - -- i965->wl_output->libegl_handle = dso_open(LIBEGL_NAME); -- if (!i965->wl_output->libegl_handle) { -- i965->wl_output->libegl_handle = dso_open(LIBEGL_NAME_FALLBACK); -- if (!i965->wl_output->libegl_handle) -+ wl_vtable = &i965->wl_output->vtable; -+ -+ if (vtable->wl_interface) -+ wl_vtable->drm_interface = vtable->wl_interface; -+ else { -+ i965->wl_output->libegl_handle = dso_open(LIBEGL_NAME); -+ if (!i965->wl_output->libegl_handle) { -+ i965->wl_output->libegl_handle = dso_open(LIBEGL_NAME_FALLBACK); -+ if (!i965->wl_output->libegl_handle) -+ goto error; -+ } -+ -+ dso_handle = i965->wl_output->libegl_handle; -+ if (!dso_get_symbols(dso_handle, wl_vtable, sizeof(*wl_vtable), -+ libegl_symbols)) - goto error; - } - -- dso_handle = i965->wl_output->libegl_handle; -- wl_vtable = &i965->wl_output->vtable; -- if (!dso_get_symbols(dso_handle, wl_vtable, sizeof(*wl_vtable), -- libegl_symbols)) -- goto error; -- - i965->wl_output->libwl_client_handle = dso_open(LIBWAYLAND_CLIENT_NAME); - if (!i965->wl_output->libwl_client_handle) - goto error; - - dso_handle = i965->wl_output->libwl_client_handle; -- wl_vtable = &i965->wl_output->vtable; - if (!dso_get_symbols(dso_handle, wl_vtable, sizeof(*wl_vtable), - libwl_client_symbols)) - goto error;