Update to libva 2.4.0

3 files changed, 30 insertions, 91 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 31b4a979f16e..8d3133eca93d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
-pkgbase = libva-intel-driver-hybrid
+pkgbase = libva-intel-driver
 	pkgdesc = VA-API implementation for Intel G45 and HD Graphics family
-	pkgver = 2.3.0
-	pkgrel = 2
+	pkgver = 2.4.0
+	pkgrel = 1
 	url = https://01.org/linuxmedia/vaapi
 	arch = x86_64
 	license = MIT
@@ -13,10 +13,8 @@ pkgbase = libva-intel-driver-hybrid
 	provides = libva-intel-driver
 	conflicts = libva-intel-driver
 	replaces = libva-driver-intel
-	source = git+https://github.com/intel/intel-vaapi-driver.git#tag=2.3.0
-	source = 427.patch
+	source = git+https://github.com/intel/intel-vaapi-driver.git#tag=d595d01d6421eae30824538fa6d150701ed077df
 	sha256sums = SKIP
-	sha256sums = e51eaf65b1bb09bf62a1b78668da0c268722387cb8eb3c05ec2d7462c651d1c0
 
-pkgname = libva-intel-driver-hybrid
+pkgname = libva-intel-driver
 
diff --git a/427.patch b/427.patch
deleted file mode 100644
index 906fa8cd4c41..000000000000
--- a/427.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 0abb7a1c938437000bfca1a9b3706884467c681e Mon Sep 17 00:00:00 2001
-From: Haihao Xiang <haihao.xiang@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@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;
diff --git a/PKGBUILD b/PKGBUILD
index 6b7a961de563..db22a570b8bd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,43 @@
 # This package is based on libva-intel-driver just with the hybrid codec flag
 # Maintainer: DetMittens
-# Contributor: Maxime Gauduin <alucryd@archlinux.org> Maintainer of libva-intel-driver in extra
+# Maintainer: Maxime Gauduin <alucryd@archlinux.org>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 
-pkgname=libva-intel-driver-hybrid
-pkgver=2.3.0
-pkgrel=2
+pkgname=libva-intel-driver
+pkgver=2.4.0
+pkgrel=1
 pkgdesc='VA-API implementation for Intel G45 and HD Graphics family'
-arch=('x86_64')
-url='https://01.org/linuxmedia/vaapi'
-license=('MIT')
-depends=('libva' 'libdrm')
-makedepends=('git' 'meson')
-replaces=('libva-driver-intel')
+arch=(x86_64)
+url=https://01.org/linuxmedia/vaapi
+license=(MIT)
+depends=(
+  libva
+  libdrm
+)
+makedepends=(
+  git
+  meson
+)
+replaces=(libva-driver-intel)
 optdepends=('intel-hybrid-codec-driver: Provides codecs with partial HW acceleration')
 conflicts=('libva-intel-driver')
 provides=('libva-intel-driver')
-source=("git+https://github.com/intel/intel-vaapi-driver.git#tag=${pkgver}"
-        427.patch)
-sha256sums=('SKIP'
-            'e51eaf65b1bb09bf62a1b78668da0c268722387cb8eb3c05ec2d7462c651d1c0')
+source=(git+https://github.com/intel/intel-vaapi-driver.git#tag=d595d01d6421eae30824538fa6d150701ed077df)
+sha256sums=('SKIP')
+
+pkgver() {
+  cd intel-vaapi-driver
+
+  git describe --tags
+}
 
 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/' src/shaders/gpp.py
-  # Fix undefined variable in src/meson.build
-  sed -i 's/2.2.0/2.2.0.0/' meson.build
 }
 
 build() {
@@ -41,7 +47,7 @@ build() {
 
 package() {
   DESTDIR="${pkgdir}" meson install -C build
-  install -Dm 644 intel-vaapi-driver/COPYING -t "${pkgdir}"/usr/share/licenses/libva-intel-driver-hybrid
+  install -Dm 644 intel-vaapi-driver/COPYING -t "${pkgdir}"/usr/share/licenses/libva-intel-driver
 }
 
 # vim: ts=2 sw=2 et: