[arch-commits] Commit in libva-intel-driver/trunk (427.patch PKGBUILD)
Jan Steffens
heftig at archlinux.org
Fri Jan 25 10:21:25 UTC 2019
Date: Friday, January 25, 2019 @ 10:21:23
Author: heftig
Revision: 344748
2.3.0-2: fix a wayland issue
Added:
libva-intel-driver/trunk/427.patch
Modified:
libva-intel-driver/trunk/PKGBUILD
-----------+
427.patch | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
PKGBUILD | 20 ++++++++++++------
2 files changed, 79 insertions(+), 6 deletions(-)
Added: 427.patch
===================================================================
--- 427.patch (rev 0)
+++ 427.patch 2019-01-25 10:21:23 UTC (rev 344748)
@@ -0,0 +1,65 @@
+From 0abb7a1c938437000bfca1a9b3706884467c681e Mon Sep 17 00:00:00 2001
+From: Haihao Xiang <haihao.xiang at intel.com>
+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 <haihao.xiang at intel.com>
+---
+ 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;
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2019-01-25 10:21:04 UTC (rev 344747)
+++ PKGBUILD 2019-01-25 10:21:23 UTC (rev 344748)
@@ -4,7 +4,7 @@
pkgname=libva-intel-driver
pkgver=2.3.0
-pkgrel=1
+pkgrel=2
pkgdesc='VA-API implementation for Intel G45 and HD Graphics family'
arch=('x86_64')
url='https://01.org/linuxmedia/vaapi'
@@ -12,15 +12,23 @@
depends=('libva' 'libdrm')
makedepends=('git' 'meson')
replaces=('libva-driver-intel')
-source=("git+https://github.com/intel/intel-vaapi-driver.git#tag=${pkgver}")
-sha256sums=('SKIP')
+source=("git+https://github.com/intel/intel-vaapi-driver.git#tag=${pkgver}"
+ 427.patch)
+sha256sums=('SKIP'
+ 'e51eaf65b1bb09bf62a1b78668da0c268722387cb8eb3c05ec2d7462c651d1c0')
prepare() {
+ cd intel-vaapi-driver
+
+ # https://github.com/intel/intel-vaapi-driver/issues/419
+ patch -Np1 -i ../427.patch
+
# Only relevant if intel-gpu-tools is installed,
# since then the shaders will be recompiled
- sed -i '1s/python$/&2/' intel-vaapi-driver/src/shaders/gpp.py
+ sed -i '1s/python$/&2/' src/shaders/gpp.py
+
# Fix undefined variable in src/meson.build
- sed -i 's/2.2.0/2.2.0.0/' intel-vaapi-driver/meson.build
+ sed -i 's/2.2.0/2.2.0.0/' meson.build
}
build() {
@@ -29,7 +37,7 @@
}
package() {
- DESTDIR="${pkgdir}" ninja -C build install
+ DESTDIR="${pkgdir}" meson install -C build
install -Dm 644 intel-vaapi-driver/COPYING -t "${pkgdir}"/usr/share/licenses/libva-intel-driver
}
More information about the arch-commits
mailing list