[arch-commits] Commit in libva/trunk (257.patch PKGBUILD)

[Maxime Gauduin]

    Date: Saturday, January 26, 2019 @ 16:19:01
  Author: alucryd
Revision: 344830

upgpkg: libva 2.4.0-1

Modified:
  libva/trunk/PKGBUILD
Deleted:
  libva/trunk/257.patch

-----------+
 257.patch |   67 ------------------------------------------------------------
 PKGBUILD  |   53 ++++++++++++++++++++++++++++-------------------
 2 files changed, 32 insertions(+), 88 deletions(-)

Deleted: 257.patch
===================================================================
--- 257.patch	2019-01-26 16:08:46 UTC (rev 344829)
+++ 257.patch	2019-01-26 16:19:01 UTC (rev 344830)
@@ -1,67 +0,0 @@
-From 3dbd558f204490565e98feae25eaa39cd9206937 Mon Sep 17 00:00:00 2001
-From: Haihao Xiang <haihao.xiang at intel.com>
-Date: Fri, 7 Dec 2018 13:25:41 +0800
-Subject: [PATCH] Add pointer to struct wl_interface for driver to use
-
-See https://github.com/intel/intel-vaapi-driver/issues/419 for the
-information
-
-Note: don't export the interface symbol in case others may reuse it.
-
-Signed-off-by: Haihao Xiang <haihao.xiang at intel.com>
----
- va/wayland/va_backend_wayland.h | 10 +++++++++-
- va/wayland/va_wayland_drm.c     |  4 ++++
- 2 files changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/va/wayland/va_backend_wayland.h b/va/wayland/va_backend_wayland.h
-index 9e5740a7..906d4bfb 100644
---- a/va/wayland/va_backend_wayland.h
-+++ b/va/wayland/va_backend_wayland.h
-@@ -64,8 +64,16 @@ struct VADriverVTableWayland {
-     /** \brief Indicate whether buffer sharing with prime fd is supported. */
-     unsigned int has_prime_sharing;
- 
-+    /**
-+     * Pointer to an implementation of struct wl_interface
-+     *
-+     * It is set by libva-wayland when a context is created, then the backend
-+     * driver may reuse it.
-+     */
-+    const void *wl_interface;
-+
-     /** \brief Reserved bytes for future use, must be zero */
--    unsigned long reserved[8];
-+    unsigned long reserved[7];
- };
- 
- #endif /* VA_BACKEND_WAYLAND_H */
-diff --git a/va/wayland/va_wayland_drm.c b/va/wayland/va_wayland_drm.c
-index 8e226951..4cd3f6c7 100644
---- a/va/wayland/va_wayland_drm.c
-+++ b/va/wayland/va_wayland_drm.c
-@@ -136,6 +136,7 @@ va_wayland_drm_destroy(VADisplayContextP pDisplayContext)
-     struct VADriverVTableWayland *vtable = ctx->vtable_wayland;
- 
-     vtable->has_prime_sharing = 0;
-+    vtable->wl_interface = NULL;
- 
-     wl_drm_ctx->is_authenticated = 0;
- 
-@@ -222,6 +223,8 @@ va_wayland_drm_create(VADisplayContextP pDisplayContext)
-     struct VADriverVTableWayland *vtable = ctx->vtable_wayland;
-     struct wl_display *wrapped_display = NULL;
- 
-+    vtable->wl_interface = NULL;
-+
-     wl_drm_ctx = malloc(sizeof(*wl_drm_ctx));
-     if (!wl_drm_ctx) {
-         va_wayland_error("could not allocate wl_drm_ctx");
-@@ -300,6 +303,7 @@ va_wayland_drm_create(VADisplayContextP pDisplayContext)
-         goto end;
-     }
- 
-+    vtable->wl_interface = &wl_drm_interface;
-     result = true;
- 
- end:

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-01-26 16:08:46 UTC (rev 344829)
+++ PKGBUILD	2019-01-26 16:19:01 UTC (rev 344830)
@@ -4,29 +4,40 @@
 
 pkgname=libva
 pkgver=2.4.0
-pkgrel=2
+pkgrel=1
 pkgdesc='Video Acceleration (VA) API for Linux'
-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}"
-        257.patch)
-sha256sums=('SKIP'
-            '768a5e7a78fadda4f040097a83fb0dc1411b11fd14346e7041be0a704eca823e')
+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)
 
-prepare() {
-  cd libva
-  
-  # https://github.com/intel/intel-vaapi-driver/issues/419
-  patch -Np1 -i ../257.patch
-}
-
 build() {
   CFLAGS+=" -DENABLE_VA_MESSAGING"  # Option missing
   arch-meson libva build