[arch-commits] Commit in libva-intel-driver/trunk (2 files)

[Laurent Carlier]

    Date: Saturday, March 11, 2017 @ 13:44:02
  Author: lcarlier
Revision: 290618

upgpkg: libva-intel-driver 1.7.3-2

fix loading with libglvnd drivers (FS#53253)

Added:
  libva-intel-driver/trunk/libva-intel-driver-1.7.3-glvnd-fix.patch
Modified:
  libva-intel-driver/trunk/PKGBUILD

------------------------------------------+
 PKGBUILD                                 |   11 ++++++++---
 libva-intel-driver-1.7.3-glvnd-fix.patch |   29 +++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-03-11 11:55:38 UTC (rev 290617)
+++ PKGBUILD	2017-03-11 13:44:02 UTC (rev 290618)
@@ -4,7 +4,7 @@
 
 pkgname=libva-intel-driver
 pkgver=1.7.3
-pkgrel=1
+pkgrel=2
 pkgdesc='VA-API implementation for Intel G45 and HD Graphics family'
 arch=('i686' 'x86_64')
 url='http://freedesktop.org/wiki/Software/vaapi'
@@ -11,8 +11,10 @@
 license=('MIT')
 depends=('libva')
 replaces=('libva-driver-intel')
-source=(https://freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2)
-sha1sums=('5100f187afc4e39fce5664b96fe11a38faa9afaa')
+source=(https://freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2
+        libva-intel-driver-1.7.3-glvnd-fix.patch)
+sha1sums=('5100f187afc4e39fce5664b96fe11a38faa9afaa'
+          'cf885e9fe35b03a453d21e6bad0f203f2995a88e')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -20,6 +22,9 @@
   # Only relevant if intel-gpu-tools is installed,
   # since then the shaders will be recompiled
   sed -i '1s/python$/&2/' src/shaders/gpp.py
+
+  # fix with libglvnd
+  patch -Np1 -i ../libva-intel-driver-1.7.3-glvnd-fix.patch
 }
 
 build() {

Added: libva-intel-driver-1.7.3-glvnd-fix.patch
===================================================================
--- libva-intel-driver-1.7.3-glvnd-fix.patch	                        (rev 0)
+++ libva-intel-driver-1.7.3-glvnd-fix.patch	2017-03-11 13:44:02 UTC (rev 290618)
@@ -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;