[arch-commits] Commit in lib32-libva/repos/multilib-x86_64 (3 files)
Laurent Carlier
lcarlier at archlinux.org
Wed Jul 5 16:00:09 UTC 2017
Date: Wednesday, July 5, 2017 @ 16:00:09
Author: lcarlier
Revision: 242408
archrelease: copy trunk to multilib-x86_64
Added:
lib32-libva/repos/multilib-x86_64/PKGBUILD
(from rev 242407, lib32-libva/trunk/PKGBUILD)
Deleted:
lib32-libva/repos/multilib-x86_64/PKGBUILD
lib32-libva/repos/multilib-x86_64/not-finding-wl-drm-interface-with-libglvnd.patch
--------------------------------------------------+
PKGBUILD | 74 ++++++++++-----------
not-finding-wl-drm-interface-with-libglvnd.patch | 48 -------------
2 files changed, 37 insertions(+), 85 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2017-07-05 16:00:05 UTC (rev 242407)
+++ PKGBUILD 2017-07-05 16:00:09 UTC (rev 242408)
@@ -1,37 +0,0 @@
-# $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.8.1
-pkgrel=1
-pkgdesc='Video Acceleration (VA) API for Linux (32-bit)'
-arch=(x86_64)
-url='https://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)
-sha512sums=('f9466aa0a9537e9e8db4028a1ef2da9ffe70932867c2b00dd2e4cfd7062b1356ce1b7e1ea8d261341a30a7b506d00152b2bc2dea79009001854f9f2e65e6e28a')
-
-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-x86_64/PKGBUILD (from rev 242407, lib32-libva/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2017-07-05 16:00:09 UTC (rev 242408)
@@ -0,0 +1,37 @@
+# $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.8.2
+pkgrel=1
+pkgdesc='Video Acceleration (VA) API for Linux (32-bit)'
+arch=(x86_64)
+url='https://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)
+sha256sums=('9ed3e3ddc8f47a715d4c6ec366beb21c83fc4e8a3d4d39a811baff76f0a0cede')
+
+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"
+}
Deleted: not-finding-wl-drm-interface-with-libglvnd.patch
===================================================================
--- not-finding-wl-drm-interface-with-libglvnd.patch 2017-07-05 16:00:05 UTC (rev 242407)
+++ not-finding-wl-drm-interface-with-libglvnd.patch 2017-07-05 16:00:09 UTC (rev 242408)
@@ -1,48 +0,0 @@
-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");
-
More information about the arch-commits
mailing list