main/libva-intel-driver: upgrade to 2.4.0

2 files changed, 5 insertions, 77 deletions

diff --git a/main/libva-intel-driver/APKBUILD b/main/libva-intel-driver/APKBUILD
index fd196ea6b0..96bee79dfb 100644
--- a/main/libva-intel-driver/APKBUILD
+++ b/main/libva-intel-driver/APKBUILD
@@ -1,22 +1,19 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libva-intel-driver
-pkgver=2.3.0
-pkgrel=1
+pkgver=2.4.0
+pkgrel=0
 pkgdesc="VA-API implementation for Intel GMA chipsets and Intel HD Graphics"
 url="https://freedesktop.org/wiki/Software/vaapi"
 arch="x86 x86_64"
 license="MIT"
 makedepends="libdrm-dev libva-dev wayland-dev meson"
 install_if="libva xf86-video-intel"
-source="$pkgname-$pkgver.tar.gz::https://github.com/intel/intel-vaapi-driver/archive/$pkgver.tar.gz
-	wayland.patch
-	"
+source="$pkgname-$pkgver.tar.gz::https://github.com/intel/intel-vaapi-driver/archive/$pkgver.pre1.tar.gz"
 
-builddir="$srcdir"/intel-vaapi-driver-$pkgver
+builddir="$srcdir"/intel-vaapi-driver-$pkgver.pre1
 
 build() {
-	cd "$builddir"
 	meson builddir \
 		--prefix=/usr \
 		-Dwith_wayland=yes \
@@ -25,14 +22,11 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	ninja -C builddir test
 }
 
 package() {
-	cd "$builddir"
 	DESTDIR="$pkgdir" ninja -C builddir install
 }
 
-sha512sums="98cb6e6bdc22eefa0c7f245d3a2f1fc586d5066e9273c9031e76c30d96fc5902859119ddd4ef2ba39cd044aff57edae3a90ab2e5478c47e118132f8b2c28f1dc  libva-intel-driver-2.3.0.tar.gz
-dd5ac03413f8c2daca4a2c4a11ba5b74eecf5051a487ede7afba4b71feb9001aac8f0b47d65dc0c436e8222b34daa3ed8144dfa550cfd4f18f2b3c34f885cdec  wayland.patch"
+sha512sums="de4840a0e999defbccf4965b02fb0787b777795e5134894a4f30f67ec11fd1c99b765cd4a79802972671d38b3d20b443e76f75d34c03112a8fcb9b345a8640b5  libva-intel-driver-2.4.0.tar.gz"
diff --git a/main/libva-intel-driver/wayland.patch b/main/libva-intel-driver/wayland.patch
deleted file mode 100644
index 9ae565e054..0000000000
--- a/main/libva-intel-driver/wayland.patch
+++ /dev/null
@@ -1,66 +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;
-