commit f59aa742507de2dfe9a0dbb9ca807c952fe49213 Author: Hans de Goede <hdegoede(a)redhat.com&gt; Date: Wed Feb 15 13:53:47 2017 +0100 Fix libva not working when using with libglvnd + wayland (rhbz#1422151) libva-intel-driver-1.7.3-glvnd-fix.patch | 29 +++++++++++++++++++++++++++++ libva-intel-driver.spec | 11 ++++++++--- 2 files changed, 37 insertions(+), 3 deletions(-) --- diff --git a/libva-intel-driver-1.7.3-glvnd-fix.patch b/libva-intel-driver-1.7.3-glvnd-fix.patch new file mode 100644 index 0000000..61d4d92 --- /dev/null +++ b/libva-intel-driver-1.7.3-glvnd-fix.patch @@ -0,0 +1,29 @@ +diff -up libva-intel-driver-1.7.3/src/i965_output_wayland.c~ libva-intel-driver-1.7.3/src/i965_output_wayland.c +--- libva-intel-driver-1.7.3/src/i965_output_wayland.c~ 2016-11-10 01:37:13.000000000 +0100 ++++ libva-intel-driver-1.7.3/src/i965_output_wayland.c 2017-02-15 10:58:25.288569428 +0100 +@@ -36,7 +36,10 @@ + #include "i965_defines.h" + #include "dso_utils.h" + +-#define LIBEGL_NAME "libEGL.so.1" ++/* We need mesa's libEGL, first try the soname of a glvnd enabled mesa build */ ++#define LIBEGL_NAME "libEGL_mesa.so.0" ++/* Then fallback to plain libEGL.so.1 (which might not be mesa) */ ++#define LIBEGL_NAME_FALLBACK "libEGL.so.1" + #define LIBWAYLAND_CLIENT_NAME "libwayland-client.so.0" + + typedef uint32_t (*wl_display_get_global_func)(struct wl_display *display, +@@ -380,8 +383,11 @@ i965_output_wayland_init(VADriverContext + goto error; + + i965->wl_output->libegl_handle = dso_open(LIBEGL_NAME); +- if (!i965->wl_output->libegl_handle) +- goto error; ++ 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; + wl_vtable = &i965->wl_output->vtable; diff --git a/libva-intel-driver.spec b/libva-intel-driver.spec index 69e452f..0f9b2a2 100644 --- a/libva-intel-driver.spec +++ b/libva-intel-driver.spec @@ -2,12 +2,13 @@ Name: libva-intel-driver Version: 1.7.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HW video decode support for Intel integrated graphics Group: System Environment/Libraries License: MIT and EPL URL: http://freedesktop.org/wiki/Software/vaapi Source0: http://www.freedesktop.org/software/vaapi/releases/%{name}/%{name}-%{vers... +Patch0: libva-intel-driver-1.7.3-glvnd-fix.patch ExclusiveArch: %{ix86} x86_64 ia64 @@ -34,7 +35,7 @@ HW video decode support for Intel integrated graphics. %prep -%setup -q +%autosetup -p1 %{?_with_gen4asm: #Move pre-built (binary) asm code for f in src/shaders/vme/*.g?b ; do @@ -62,11 +63,15 @@ gendiff . .prebuilt %files -%doc AUTHORS COPYING NEWS README +%doc AUTHORS NEWS README +%license COPYING %{_libdir}/dri/i965_drv_video.so %changelog +* Wed Feb 15 2017 Hans de Goede <j.w.r.degoede(a)gmail.com&gt; - 1.7.3-2 +- Fix libva not working when using with libglvnd + wayland (rhbz#1422151) + * Thu Nov 10 2016 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.7.3-1 - Update to 1.7.3