[arch-commits] Commit in libva/repos/extra-x86_64 (4 files)
Maxime Gauduin
alucryd at archlinux.org
Mon Oct 1 18:07:14 UTC 2018
Date: Monday, October 1, 2018 @ 18:07:13
Author: alucryd
Revision: 335613
archrelease: copy trunk to extra-x86_64
Added:
libva/repos/extra-x86_64/PKGBUILD
(from rev 335612, libva/trunk/PKGBUILD)
libva/repos/extra-x86_64/not-finding-wl-drm-interface-with-libglvnd.patch
(from rev 335612, libva/trunk/not-finding-wl-drm-interface-with-libglvnd.patch)
Deleted:
libva/repos/extra-x86_64/PKGBUILD
libva/repos/extra-x86_64/not-finding-wl-drm-interface-with-libglvnd.patch
--------------------------------------------------+
PKGBUILD | 61 ++++++-------
not-finding-wl-drm-interface-with-libglvnd.patch | 96 ++++++++++-----------
2 files changed, 78 insertions(+), 79 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-10-01 18:07:05 UTC (rev 335612)
+++ PKGBUILD 2018-10-01 18:07:13 UTC (rev 335613)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Maxime Gauduin <alucryd at archlonux.org>
-# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-
-pkgname=libva
-pkgver=2.2.0
-pkgrel=2
-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')
-source=("git+https://github.com/intel/libva.git#tag=${pkgver}")
-sha256sums=('SKIP')
-
-build() {
- arch-meson libva build
- ninja -C build
-}
-
-package() {
- DESTDIR="${pkgdir}" ninja -C build install
- install -Dm 644 libva/COPYING -t "${pkgdir}"/usr/share/licenses/libva
-}
-
-# vim: ts=2 sw=2 et:
Copied: libva/repos/extra-x86_64/PKGBUILD (from rev 335612, libva/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-10-01 18:07:13 UTC (rev 335613)
@@ -0,0 +1,30 @@
+# Maintainer: Maxime Gauduin <alucryd at archlonux.org>
+# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+
+pkgname=libva
+pkgver=2.3.0
+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')
+source=("git+https://github.com/intel/libva.git#tag=${pkgver}")
+sha256sums=('SKIP')
+
+build() {
+ arch-meson libva build
+ ninja -C build
+}
+
+package() {
+ DESTDIR="${pkgdir}" ninja -C build install
+ install -Dm 644 libva/COPYING -t "${pkgdir}"/usr/share/licenses/libva
+}
+
+# vim: ts=2 sw=2 et:
Deleted: not-finding-wl-drm-interface-with-libglvnd.patch
===================================================================
--- not-finding-wl-drm-interface-with-libglvnd.patch 2018-10-01 18:07:05 UTC (rev 335612)
+++ not-finding-wl-drm-interface-with-libglvnd.patch 2018-10-01 18:07:13 UTC (rev 335613)
@@ -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");
-
Copied: libva/repos/extra-x86_64/not-finding-wl-drm-interface-with-libglvnd.patch (from rev 335612, libva/trunk/not-finding-wl-drm-interface-with-libglvnd.patch)
===================================================================
--- not-finding-wl-drm-interface-with-libglvnd.patch (rev 0)
+++ not-finding-wl-drm-interface-with-libglvnd.patch 2018-10-01 18:07:13 UTC (rev 335613)
@@ -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");
+
More information about the arch-commits
mailing list