Date: Sunday, October 29, 2017 @ 20:28:49
Author: alucryd
Revision: 308601
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
libva/repos/staging-i686/
libva/repos/staging-i686/PKGBUILD
(from rev 308600, libva/trunk/PKGBUILD)
libva/repos/staging-i686/not-finding-wl-drm-interface-with-libglvnd.patch
(from rev 308600,
libva/trunk/not-finding-wl-drm-interface-with-libglvnd.patch)
libva/repos/staging-x86_64/
libva/repos/staging-x86_64/PKGBUILD
(from rev 308600, libva/trunk/PKGBUILD)
libva/repos/staging-x86_64/not-finding-wl-drm-interface-with-libglvnd.patch
(from rev 308600,
libva/trunk/not-finding-wl-drm-interface-with-libglvnd.patch)
-----------------------------------------------------------------+
staging-i686/PKGBUILD | 35 +++++++
staging-i686/not-finding-wl-drm-interface-with-libglvnd.patch | 48
++++++++++
staging-x86_64/PKGBUILD | 35 +++++++
staging-x86_64/not-finding-wl-drm-interface-with-libglvnd.patch | 48
++++++++++
4 files changed, 166 insertions(+)
Copied: libva/repos/staging-i686/PKGBUILD (from rev 308600,
libva/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2017-10-29 20:28:49 UTC (rev 308601)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Maxime Gauduin <aluc...@archlonux.org>
+# Contributor: Bartłomiej Piotrowski <bpiotrow...@archlinux.org>
+# Contributor: Ionut Biru <ib...@archlinux.org>
+
+pkgname=libva
+pkgver=2.0.0
+pkgrel=1
+pkgdesc='Video Acceleration (VA) API for Linux'
+arch=('i686' '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')
+source=("https://github.com/01org/libva/releases/download/${pkgver}/libva-${pkgver}.tar.bz2";)
+sha256sums=('bb0601f9a209e60d8d0b867067323661a7816ff429021441b775452b8589e533')
+
+build() {
+ cd libva-${pkgver}
+
+ ./configure \
+ --prefix='/usr'
+ make
+}
+
+package() {
+ cd libva-${pkgver}
+
+ make DESTDIR="${pkgdir}" install
+ install -Dm 644 COPYING -t "${pkgdir}"/usr/share/licenses/libva
+}
+
+# vim: ts=2 sw=2 et:
Copied:
libva/repos/staging-i686/not-finding-wl-drm-interface-with-libglvnd.patch (from
rev 308600, libva/trunk/not-finding-wl-drm-interface-with-libglvnd.patch)
===================================================================
--- staging-i686/not-finding-wl-drm-interface-with-libglvnd.patch
(rev 0)
+++ staging-i686/not-finding-wl-drm-interface-with-libglvnd.patch
2017-10-29 20:28:49 UTC (rev 308601)
@@ -0,0 +1,48 @@
+From b832b37c6a6f7ff69a4ea4656007827a1b7e67e8 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdego...@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 <hdego...@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");
+
Copied: libva/repos/staging-x86_64/PKGBUILD (from rev 308600,
libva/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2017-10-29 20:28:49 UTC (rev 308601)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Maxime Gauduin <aluc...@archlonux.org>
+# Contributor: Bartłomiej Piotrowski <bpiotrow...@archlinux.org>
+# Contributor: Ionut Biru <ib...@archlinux.org>
+
+pkgname=libva
+pkgver=2.0.0
+pkgrel=1
+pkgdesc='Video Acceleration (VA) API for Linux'
+arch=('i686' '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')
+source=("https://github.com/01org/libva/releases/download/${pkgver}/libva-${pkgver}.tar.bz2";)
+sha256sums=('bb0601f9a209e60d8d0b867067323661a7816ff429021441b775452b8589e533')
+
+build() {
+ cd libva-${pkgver}
+
+ ./configure \
+ --prefix='/usr'
+ make
+}
+
+package() {
+ cd libva-${pkgver}
+
+ make DESTDIR="${pkgdir}" install
+ install -Dm 644 COPYING -t "${pkgdir}"/usr/share/licenses/libva
+}
+
+# vim: ts=2 sw=2 et:
Copied:
libva/repos/staging-x86_64/not-finding-wl-drm-interface-with-libglvnd.patch
(from rev 308600, libva/trunk/not-finding-wl-drm-interface-with-libglvnd.patch)
===================================================================
--- staging-x86_64/not-finding-wl-drm-interface-with-libglvnd.patch
(rev 0)
+++ staging-x86_64/not-finding-wl-drm-interface-with-libglvnd.patch
2017-10-29 20:28:49 UTC (rev 308601)
@@ -0,0 +1,48 @@
+From b832b37c6a6f7ff69a4ea4656007827a1b7e67e8 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdego...@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 <hdego...@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");
+
