[libva-intel-hybrid-driver] Add patch to fix #1567582

commit f8b26582f9142763ef201618ac16b08257b318bc Author: Robert-André Mauchin <zebob.m(a)gmail.com&gt; Date: Thu Jun 28 00:15:33 2018 +0200 Add patch to fix #1567582 ...-1.0.2-load_libva-x11_for_any_ABI_version.patch | 55 ++++++++++++++++++++++ libva-intel-hybrid-driver.spec | 7 ++- 2 files changed, 61 insertions(+), 1 deletion(-) --- diff --git a/libva-intel-hybrid-driver-1.0.2-load_libva-x11_for_any_ABI_version.patch b/libva-intel-hybrid-driver-1.0.2-load_libva-x11_for_any_ABI_version.patch new file mode 100644 index 0000000..8812fe6 --- /dev/null +++ b/libva-intel-hybrid-driver-1.0.2-load_libva-x11_for_any_ABI_version.patch @@ -0,0 +1,55 @@ +From b3b4d9a3a08d48bf6022723908a22255cc271ab7 Mon Sep 17 00:00:00 2001 +From: Daniel Charles <daniel.charles(a)intel.com&gt; +Date: Fri, 4 May 2018 09:56:10 -0700 +Subject: [PATCH] driver_init: load libva-x11.so for any ABI version + +with libva > 2.0.0 hybrid driver can operate with it as well +so make this load generic to libva installed version + +Signed-off-by: Daniel Charles <daniel.charles(a)intel.com&gt; +--- + src/media_drv_output_dri.c | 10 ++++++++++ + src/media_drv_output_dri.h | 2 +- + 2 files changed, 11 insertions(+), 1 deletion(-) + +diff --git a/src/media_drv_output_dri.c b/src/media_drv_output_dri.c +index 42299b8..bbd9713 100644 +--- a/src/media_drv_output_dri.c ++++ b/src/media_drv_output_dri.c +@@ -105,6 +105,15 @@ media_output_dri_init (VADriverContextP ctx) + struct dri_vtable *dri_vtable; + + static const struct dso_symbol symbols[] = { ++#if VA_CHECK_VERSION(1,0,0) ++ {"va_dri_get_drawable", ++ offsetof (struct dri_vtable, get_drawable)}, ++ {"va_dri_get_rendering_buffer", ++ offsetof (struct dri_vtable, get_rendering_buffer)}, ++ {"va_dri_swap_buffer", ++ offsetof (struct dri_vtable, swap_buffer)}, ++ {NULL,} ++#else + {"dri_get_drawable", + offsetof (struct dri_vtable, get_drawable)}, + {"dri_get_rendering_buffer", +@@ -112,6 +121,7 @@ media_output_dri_init (VADriverContextP ctx) + {"dri_swap_buffer", + offsetof (struct dri_vtable, swap_buffer)}, + {NULL,} ++#endif + }; + + drv_ctx->dri_output = +diff --git a/src/media_drv_output_dri.h b/src/media_drv_output_dri.h +index 0d6ccf0..889861c 100644 +--- a/src/media_drv_output_dri.h ++++ b/src/media_drv_output_dri.h +@@ -30,7 +30,7 @@ + #define _MEDIA__DRIVER_OUT_DRI_H + #include <stdbool.h> + #include "media_drv_defines.h" +-#define LIBVA_X11_NAME "libva-x11.so.1" ++#define LIBVA_X11_NAME "libva-x11.so" + VOID media_output_dri_terminate (VADriverContextP ctx); + BOOL media_output_dri_init (VADriverContextP ctx); + diff --git a/libva-intel-hybrid-driver.spec b/libva-intel-hybrid-driver.spec index c7f296a..8cbeb2a 100644 --- a/libva-intel-hybrid-driver.spec +++ b/libva-intel-hybrid-driver.spec @@ -1,6 +1,6 @@ Name: libva-intel-hybrid-driver Version: 1.0.2 -Release: 11%{?dist} +Release: 12%{?dist} Summary: VA driver for Intel G45 & HD Graphics family # Everything under MIT, except vp9hdec/intel_hybrid_hostvld_vp9*, @@ -15,6 +15,8 @@ Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz # Build script uses obsolete macro AC_PROG_LIBTOOL, replace it with LT_INIT Patch0: libva-intel-hybrid-driver-1.0.2_replace_obsolete_AC_PROG_LIBTOOL.patch Patch1: Update-the-dependency-to-libva-2.0.patch +# Fixes https://github.com/01org/intel-hybrid-driver/issues/25 and RHBZ#1567582 +Patch2: https://patch-diff.githubusercontent.com/raw/01org/intel-hybrid-driver/pu... #obviously only for intel platform ExclusiveArch: %{ix86} x86_64 ia64 @@ -57,6 +59,9 @@ find %{buildroot} -name "*.la" -delete %changelog +* Wed Jun 27 2018 Robert-André Mauchin <zebob.m(a)gmail.com&gt; - 1.0.2-12 +- Add patch to fix #1567582 + * Sun May 13 2018 Robert-André Mauchin <zebob.m(a)gmail.com&gt; - 1.0.2-11 - Fix typo in License - Fixes bug #1577586