[arch-commits] Commit in lib32-libva/repos (3 files)

[Laurent Carlier]

    Date: Tuesday, February 28, 2017 @ 16:09:26
  Author: lcarlier
Revision: 214217

archrelease: copy trunk to multilib-testing-x86_64

Added:
  lib32-libva/repos/multilib-testing-x86_64/
  lib32-libva/repos/multilib-testing-x86_64/PKGBUILD
    (from rev 214216, lib32-libva/trunk/PKGBUILD)
  lib32-libva/repos/multilib-testing-x86_64/not-finding-wl-drm-interface-with-libglvnd.patch
    (from rev 214216, lib32-libva/trunk/not-finding-wl-drm-interface-with-libglvnd.patch)

--------------------------------------------------+
 PKGBUILD                                         |   44 +++++++++++++++++++
 not-finding-wl-drm-interface-with-libglvnd.patch |   48 +++++++++++++++++++++
 2 files changed, 92 insertions(+)

Copied: lib32-libva/repos/multilib-testing-x86_64/PKGBUILD (from rev 214216, lib32-libva/trunk/PKGBUILD)
===================================================================
--- multilib-testing-x86_64/PKGBUILD	                        (rev 0)
+++ multilib-testing-x86_64/PKGBUILD	2017-02-28 16:09:26 UTC (rev 214217)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Llewelyn Trahaearn <WoefulDerelict at GMail dot com>
+# Contributor: kokoko3k <kokoko3k at gmail dot com>
+# Contributor: Ionut Biru <ibiru at archlinux dot org>
+# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux dot org>
+
+pkgname=lib32-libva
+pkgver=1.7.2
+pkgrel=2
+pkgdesc='Video Acceleration (VA) API for Linux (32-bit)'
+arch=('x86_64')
+url='http://freedesktop.org/wiki/Software/vaapi'
+license=('MIT')
+depends=('lib32-libdrm' 'lib32-libgl' 'lib32-wayland' 'lib32-libxext' 'lib32-libxfixes' 'libva')
+makedepends=('mesa' 'gcc-multilib')
+optdepends=('lib32-libva-vdpau-driver: vdpau back-end for nvidia'
+            'lib32-libva-intel-driver: back-end for intel cards')
+source=(http://freedesktop.org/software/vaapi/releases/libva/libva-${pkgver}.tar.bz2
+        not-finding-wl-drm-interface-with-libglvnd.patch)
+sha512sums=('4a1da09416361b69813a6fa77ee1de3d546eb1bb0d8beb7933f2c00cf9fbb8ab4e74019fa432239ee618282fdc42cb1f7f1ae2781c1d851e461994288b888a10'
+            '9df446b63d864b2a75a8d984b903b767793d4c23cb73a08433465b481840e4702dd66d98c408f5142e2cb4a9c6aedcb8c8a014e9ae28cf88fd2582d77e7becd5')
+
+prepare() {
+  cd "${pkgname#*-}-${pkgver}"
+  patch -Np1 -i ../not-finding-wl-drm-interface-with-libglvnd.patch
+}
+
+build() {
+  export CC='gcc -m32'
+  export CXX='g++ -m32'
+  export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
+
+  cd "${pkgname#*-}-${pkgver}"
+  ./configure --prefix=/usr --libdir='/usr/lib32' 
+  make
+}
+
+package() {
+  cd "${pkgname#*-}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  rm -rfv "${pkgdir}/usr/"{include,bin}
+  install -m644 -D COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+}

Copied: lib32-libva/repos/multilib-testing-x86_64/not-finding-wl-drm-interface-with-libglvnd.patch (from rev 214216, lib32-libva/trunk/not-finding-wl-drm-interface-with-libglvnd.patch)
===================================================================
--- multilib-testing-x86_64/not-finding-wl-drm-interface-with-libglvnd.patch	                        (rev 0)
+++ multilib-testing-x86_64/not-finding-wl-drm-interface-with-libglvnd.patch	2017-02-28 16:09:26 UTC (rev 214217)
@@ -0,0 +1,48 @@
+From b832b37c6a6f7ff69a4ea4656007827a1b7e67e8 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede at 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 at 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");
+