From 48f571123428ed5614f55d5ca266d7d2d2a76f79 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 18 Mar 2019 17:11:56 +0000
Subject: libva: update to 2.4.0

---
 abs/extra/libva/PKGBUILD                           | 60 ++++++++++++++--------
 ...ot-finding-wl-drm-interface-with-libglvnd.patch | 48 -----------------
 2 files changed, 40 insertions(+), 68 deletions(-)
 delete mode 100644 abs/extra/libva/not-finding-wl-drm-interface-with-libglvnd.patch

diff --git a/abs/extra/libva/PKGBUILD b/abs/extra/libva/PKGBUILD
index b8037c6..a044c09 100644
--- a/abs/extra/libva/PKGBUILD
+++ b/abs/extra/libva/PKGBUILD
@@ -1,36 +1,56 @@
-# $Id$
 # Maintainer: Maxime Gauduin <alucryd@archlonux.org>
 # Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=libva
-pkgver=2.1.0
+pkgver=2.4.0
 pkgrel=1
 pkgdesc='Video Acceleration (VA) API for Linux'
-arch=('x86_64')
-url='https://01.org/linuxmedia/vaapi'
-license=('MIT')
-depends=('glibc' 'libdrm' 'libgl' 'libx11' 'libxext' 'libxfixes' 'wayland')
-makedepends=('mesa')
-optdepends=('libva-vdpau-driver: backend for Nvidia and AMD cards'
-            'libva-intel-driver: backend for Intel cards')
-provides=('libva-drm.so' 'libva-glx.so' 'libva-wayland.so' 'libva-x11.so' 'libva.so')
-source=("https://github.com/01org/libva/releases/download/${pkgver}/libva-${pkgver}.tar.bz2")
-sha256sums=('f3fa953a11d3210c3a4ee79031abdbe0863d5ce13d9b3f93f315f1eec60a4b0f')
+arch=(x86_64)
+url=https://01.org/linuxmedia/vaapi
+license=(MIT)
+depends=(
+  libdrm
+  libgl
+  libx11
+  libxext
+  libxfixes
+  wayland
+)
+makedepends=(
+  git
+  libglvnd
+  mesa
+  meson
+)
+optdepends=(
+  'libva-vdpau-driver: backend for Nvidia and AMD cards'
+  'libva-intel-driver: backend for Intel cards'
+)
+provides=(
+  libva-drm.so
+  libva-glx.so
+  libva-wayland.so
+  libva-x11.so
+  libva.so
+)
+backup=(etc/libva.conf)
+source=(git+https://github.com/intel/libva.git#tag=${pkgver})
+sha256sums=(SKIP)
 
 build() {
-  cd libva-${pkgver}
-
-  ./configure \
-    --prefix='/usr'
-  make
+  CFLAGS+=" -DENABLE_VA_MESSAGING"  # Option missing
+  arch-meson libva build
+  ninja -C build
 }
 
 package() {
-  cd libva-${pkgver}
+  DESTDIR="${pkgdir}" meson install -C build
+  install -Dm 644 libva/COPYING -t "${pkgdir}"/usr/share/licenses/libva
 
-  make DESTDIR="${pkgdir}" install
-  install -Dm 644 COPYING -t "${pkgdir}"/usr/share/licenses/libva
+  install -Dm 644 /dev/stdin "${pkgdir}"/etc/libva.conf <<END
+LIBVA_MESSAGING_LEVEL=1
+END
 }
 
 # vim: ts=2 sw=2 et:
diff --git a/abs/extra/libva/not-finding-wl-drm-interface-with-libglvnd.patch b/abs/extra/libva/not-finding-wl-drm-interface-with-libglvnd.patch
deleted file mode 100644
index 4041e6c..0000000
--- a/abs/extra/libva/not-finding-wl-drm-interface-with-libglvnd.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From b832b37c6a6f7ff69a4ea4656007827a1b7e67e8 Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Wed, 15 Feb 2017 15:18:44 +0100
-Subject: [PATCH] Wayland-drm: Fix not finding wl_drm_interface on systems with
- libglvnd
-
-We do not want just any libEGL.so.1 we want mesa's libEGL.so.1 as that
-is the only way which defines the wl_drm_interface symbol we need,
-one systems with libglvnd libEGL.so.1 is a dispatcher library provided
-by libglvnd and the actual mesa libEGL we want is named libEGL_mesa.so.0
-so try that first.
-
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- va/wayland/va_wayland_drm.c | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/va/wayland/va_wayland_drm.c b/va/wayland/va_wayland_drm.c
-index 958ea85..2ff19f5 100644
---- a/va/wayland/va_wayland_drm.c
-+++ b/va/wayland/va_wayland_drm.c
-@@ -38,7 +38,10 @@
- #include "wayland-drm-client-protocol.h"
- 
- /* XXX: Wayland/DRM support currently lives in Mesa libEGL.so.* library */
--#define LIBWAYLAND_DRM_NAME "libEGL.so.1"
-+/* First try the soname of a glvnd enabled mesa build */
-+#define LIBWAYLAND_DRM_NAME "libEGL_mesa.so.0"
-+/* Then fallback to plain libEGL.so.1 (which might not be mesa) */
-+#define LIBWAYLAND_DRM_NAME_FALLBACK "libEGL.so.1"
- 
- typedef struct va_wayland_drm_context {
-     struct va_wayland_context   base;
-@@ -207,8 +210,11 @@ va_wayland_drm_create(VADisplayContextP pDisplayContext)
-     vtable->has_prime_sharing = 0;
- 
-     wl_drm_ctx->handle = dlopen(LIBWAYLAND_DRM_NAME, RTLD_LAZY|RTLD_LOCAL);
--    if (!wl_drm_ctx->handle)
--        return false;
-+    if (!wl_drm_ctx->handle) {
-+        wl_drm_ctx->handle = dlopen(LIBWAYLAND_DRM_NAME_FALLBACK, RTLD_LAZY|RTLD_LOCAL);
-+        if (!wl_drm_ctx->handle)
-+            return false;
-+    }
- 
-     wl_drm_ctx->drm_interface =
-         dlsym(wl_drm_ctx->handle, "wl_drm_interface");
-
-- 
cgit v0.12