From 4b2fc4f2b52266c2b1d4e9e801f055f7bbfa1f2a Mon Sep 17 00:00:00 2001 From: Rmys Date: Fri, 25 Oct 2019 21:07:45 +0300 Subject: [PATCH] x11 library*:rebuild verbump --- x11/driver/libva-intel-driver/files/427.patch | 65 +++++++++++++++++++ x11/driver/libva-intel-driver/pspec.xml | 12 +++- 2 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 x11/driver/libva-intel-driver/files/427.patch diff --git a/x11/driver/libva-intel-driver/files/427.patch b/x11/driver/libva-intel-driver/files/427.patch new file mode 100644 index 0000000000..906fa8cd4c --- /dev/null +++ b/x11/driver/libva-intel-driver/files/427.patch @@ -0,0 +1,65 @@ +From 0abb7a1c938437000bfca1a9b3706884467c681e 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 + +This fixes https://github.com/intel/intel-vaapi-driver/issues/419 + +Signed-off-by: Haihao Xiang +--- + src/i965_output_wayland.c | 27 ++++++++++++++++----------- + 1 file changed, 16 insertions(+), 11 deletions(-) + +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; diff --git a/x11/driver/libva-intel-driver/pspec.xml b/x11/driver/libva-intel-driver/pspec.xml index 6f459584b2..a684d14913 100644 --- a/x11/driver/libva-intel-driver/pspec.xml +++ b/x11/driver/libva-intel-driver/pspec.xml @@ -12,12 +12,15 @@ driver VA-API implementation for Intel G45 and HD Graphics family libva-intel-driver, VA-API implementation for Intel G45 and HD Graphics family. - https://github.com/01org/intel-vaapi-driver/releases/download/2.1.0/intel-vaapi-driver-2.1.0.tar.bz2 + https://github.com/01org/intel-vaapi-driver/releases/download/2.3.0/intel-vaapi-driver-2.3.0.tar.bz2 libdrm-devel libX11-devel libva-devel + + 427.patch + @@ -34,6 +37,13 @@ + + 2019-10-25 + 2.3.0 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2018-07-31 2.1.0