[arch-commits] Commit in libva-intel-driver/repos (6 files)
Bartłomiej Piotrowski
bpiotrowski at archlinux.org
Mon Apr 3 18:59:38 UTC 2017
Date: Monday, April 3, 2017 @ 18:59:37
Author: bpiotrowski
Revision: 292048
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
libva-intel-driver/repos/testing-i686/
libva-intel-driver/repos/testing-i686/PKGBUILD
(from rev 292047, libva-intel-driver/trunk/PKGBUILD)
libva-intel-driver/repos/testing-i686/libva-intel-driver-1.7.3-glvnd-fix.patch
(from rev 292047, libva-intel-driver/trunk/libva-intel-driver-1.7.3-glvnd-fix.patch)
libva-intel-driver/repos/testing-x86_64/
libva-intel-driver/repos/testing-x86_64/PKGBUILD
(from rev 292047, libva-intel-driver/trunk/PKGBUILD)
libva-intel-driver/repos/testing-x86_64/libva-intel-driver-1.7.3-glvnd-fix.patch
(from rev 292047, libva-intel-driver/trunk/libva-intel-driver-1.7.3-glvnd-fix.patch)
---------------------------------------------------------+
testing-i686/PKGBUILD | 35 ++++++++++++++
testing-i686/libva-intel-driver-1.7.3-glvnd-fix.patch | 29 +++++++++++
testing-x86_64/PKGBUILD | 35 ++++++++++++++
testing-x86_64/libva-intel-driver-1.7.3-glvnd-fix.patch | 29 +++++++++++
4 files changed, 128 insertions(+)
Copied: libva-intel-driver/repos/testing-i686/PKGBUILD (from rev 292047, libva-intel-driver/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2017-04-03 18:59:37 UTC (rev 292048)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Ionut Biru <ibiru at archlinux.org>
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+
+pkgname=libva-intel-driver
+pkgver=1.8.0
+pkgrel=1
+pkgdesc='VA-API implementation for Intel G45 and HD Graphics family'
+arch=(i686 x86_64)
+url='https://01.org/linuxmedia/vaapi'
+license=(MIT)
+depends=(libva)
+replaces=(libva-driver-intel)
+source=(https://github.com/01org/intel-vaapi-driver/releases/download/$pkgver/intel-vaapi-driver-$pkgver.tar.bz2)
+sha1sums=('9982122c8ef36aad01aa09c083974532afa8f8ca')
+
+prepare() {
+ cd intel-vaapi-driver-$pkgver
+
+ # Only relevant if intel-gpu-tools is installed,
+ # since then the shaders will be recompiled
+ sed -i '1s/python$/&2/' src/shaders/gpp.py
+}
+
+build() {
+ cd intel-vaapi-driver-$pkgver
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd intel-vaapi-driver-$pkgver
+ make DESTDIR="$pkgdir" install
+ install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
Copied: libva-intel-driver/repos/testing-i686/libva-intel-driver-1.7.3-glvnd-fix.patch (from rev 292047, libva-intel-driver/trunk/libva-intel-driver-1.7.3-glvnd-fix.patch)
===================================================================
--- testing-i686/libva-intel-driver-1.7.3-glvnd-fix.patch (rev 0)
+++ testing-i686/libva-intel-driver-1.7.3-glvnd-fix.patch 2017-04-03 18:59:37 UTC (rev 292048)
@@ -0,0 +1,29 @@
+diff -up libva-intel-driver-1.7.3/src/i965_output_wayland.c~ libva-intel-driver-1.7.3/src/i965_output_wayland.c
+--- libva-intel-driver-1.7.3/src/i965_output_wayland.c~ 2016-11-10 01:37:13.000000000 +0100
++++ libva-intel-driver-1.7.3/src/i965_output_wayland.c 2017-02-15 10:58:25.288569428 +0100
+@@ -36,7 +36,10 @@
+ #include "i965_defines.h"
+ #include "dso_utils.h"
+
+-#define LIBEGL_NAME "libEGL.so.1"
++/* We need mesa's libEGL, first try the soname of a glvnd enabled mesa build */
++#define LIBEGL_NAME "libEGL_mesa.so.0"
++/* Then fallback to plain libEGL.so.1 (which might not be mesa) */
++#define LIBEGL_NAME_FALLBACK "libEGL.so.1"
+ #define LIBWAYLAND_CLIENT_NAME "libwayland-client.so.0"
+
+ typedef uint32_t (*wl_display_get_global_func)(struct wl_display *display,
+@@ -380,8 +383,11 @@ i965_output_wayland_init(VADriverContext
+ goto error;
+
+ i965->wl_output->libegl_handle = dso_open(LIBEGL_NAME);
+- if (!i965->wl_output->libegl_handle)
+- goto error;
++ if (!i965->wl_output->libegl_handle) {
++ i965->wl_output->libegl_handle = dso_open(LIBEGL_NAME_FALLBACK);
++ if (!i965->wl_output->libegl_handle)
++ goto error;
++ }
+
+ dso_handle = i965->wl_output->libegl_handle;
+ wl_vtable = &i965->wl_output->vtable;
Copied: libva-intel-driver/repos/testing-x86_64/PKGBUILD (from rev 292047, libva-intel-driver/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2017-04-03 18:59:37 UTC (rev 292048)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Ionut Biru <ibiru at archlinux.org>
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+
+pkgname=libva-intel-driver
+pkgver=1.8.0
+pkgrel=1
+pkgdesc='VA-API implementation for Intel G45 and HD Graphics family'
+arch=(i686 x86_64)
+url='https://01.org/linuxmedia/vaapi'
+license=(MIT)
+depends=(libva)
+replaces=(libva-driver-intel)
+source=(https://github.com/01org/intel-vaapi-driver/releases/download/$pkgver/intel-vaapi-driver-$pkgver.tar.bz2)
+sha1sums=('9982122c8ef36aad01aa09c083974532afa8f8ca')
+
+prepare() {
+ cd intel-vaapi-driver-$pkgver
+
+ # Only relevant if intel-gpu-tools is installed,
+ # since then the shaders will be recompiled
+ sed -i '1s/python$/&2/' src/shaders/gpp.py
+}
+
+build() {
+ cd intel-vaapi-driver-$pkgver
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd intel-vaapi-driver-$pkgver
+ make DESTDIR="$pkgdir" install
+ install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
Copied: libva-intel-driver/repos/testing-x86_64/libva-intel-driver-1.7.3-glvnd-fix.patch (from rev 292047, libva-intel-driver/trunk/libva-intel-driver-1.7.3-glvnd-fix.patch)
===================================================================
--- testing-x86_64/libva-intel-driver-1.7.3-glvnd-fix.patch (rev 0)
+++ testing-x86_64/libva-intel-driver-1.7.3-glvnd-fix.patch 2017-04-03 18:59:37 UTC (rev 292048)
@@ -0,0 +1,29 @@
+diff -up libva-intel-driver-1.7.3/src/i965_output_wayland.c~ libva-intel-driver-1.7.3/src/i965_output_wayland.c
+--- libva-intel-driver-1.7.3/src/i965_output_wayland.c~ 2016-11-10 01:37:13.000000000 +0100
++++ libva-intel-driver-1.7.3/src/i965_output_wayland.c 2017-02-15 10:58:25.288569428 +0100
+@@ -36,7 +36,10 @@
+ #include "i965_defines.h"
+ #include "dso_utils.h"
+
+-#define LIBEGL_NAME "libEGL.so.1"
++/* We need mesa's libEGL, first try the soname of a glvnd enabled mesa build */
++#define LIBEGL_NAME "libEGL_mesa.so.0"
++/* Then fallback to plain libEGL.so.1 (which might not be mesa) */
++#define LIBEGL_NAME_FALLBACK "libEGL.so.1"
+ #define LIBWAYLAND_CLIENT_NAME "libwayland-client.so.0"
+
+ typedef uint32_t (*wl_display_get_global_func)(struct wl_display *display,
+@@ -380,8 +383,11 @@ i965_output_wayland_init(VADriverContext
+ goto error;
+
+ i965->wl_output->libegl_handle = dso_open(LIBEGL_NAME);
+- if (!i965->wl_output->libegl_handle)
+- goto error;
++ if (!i965->wl_output->libegl_handle) {
++ i965->wl_output->libegl_handle = dso_open(LIBEGL_NAME_FALLBACK);
++ if (!i965->wl_output->libegl_handle)
++ goto error;
++ }
+
+ dso_handle = i965->wl_output->libegl_handle;
+ wl_vtable = &i965->wl_output->vtable;
More information about the arch-commits
mailing list