[arch-commits] Commit in libva-intel-driver/repos (6 files)
Laurent Carlier
lcarlier at archlinux.org
Sat Mar 11 13:44:10 UTC 2017
Date: Saturday, March 11, 2017 @ 13:44:09
Author: lcarlier
Revision: 290619
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
libva-intel-driver/repos/extra-i686/PKGBUILD
(from rev 290618, libva-intel-driver/trunk/PKGBUILD)
libva-intel-driver/repos/extra-i686/libva-intel-driver-1.7.3-glvnd-fix.patch
(from rev 290618, libva-intel-driver/trunk/libva-intel-driver-1.7.3-glvnd-fix.patch)
libva-intel-driver/repos/extra-x86_64/PKGBUILD
(from rev 290618, libva-intel-driver/trunk/PKGBUILD)
libva-intel-driver/repos/extra-x86_64/libva-intel-driver-1.7.3-glvnd-fix.patch
(from rev 290618, libva-intel-driver/trunk/libva-intel-driver-1.7.3-glvnd-fix.patch)
Deleted:
libva-intel-driver/repos/extra-i686/PKGBUILD
libva-intel-driver/repos/extra-x86_64/PKGBUILD
-------------------------------------------------------+
/PKGBUILD | 80 ++++++++++++++++
extra-i686/PKGBUILD | 35 -------
extra-i686/libva-intel-driver-1.7.3-glvnd-fix.patch | 29 +++++
extra-x86_64/PKGBUILD | 35 -------
extra-x86_64/libva-intel-driver-1.7.3-glvnd-fix.patch | 29 +++++
5 files changed, 138 insertions(+), 70 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2017-03-11 13:44:02 UTC (rev 290618)
+++ extra-i686/PKGBUILD 2017-03-11 13:44:09 UTC (rev 290619)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru <ibiru at archlinux.org>
-# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-
-pkgname=libva-intel-driver
-pkgver=1.7.3
-pkgrel=1
-pkgdesc='VA-API implementation for Intel G45 and HD Graphics family'
-arch=('i686' 'x86_64')
-url='http://freedesktop.org/wiki/Software/vaapi'
-license=('MIT')
-depends=('libva')
-replaces=('libva-driver-intel')
-source=(https://freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2)
-sha1sums=('5100f187afc4e39fce5664b96fe11a38faa9afaa')
-
-prepare() {
- cd $pkgname-$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 $pkgname-$pkgver
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
- install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
Copied: libva-intel-driver/repos/extra-i686/PKGBUILD (from rev 290618, libva-intel-driver/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2017-03-11 13:44:09 UTC (rev 290619)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Ionut Biru <ibiru at archlinux.org>
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+
+pkgname=libva-intel-driver
+pkgver=1.7.3
+pkgrel=2
+pkgdesc='VA-API implementation for Intel G45 and HD Graphics family'
+arch=('i686' 'x86_64')
+url='http://freedesktop.org/wiki/Software/vaapi'
+license=('MIT')
+depends=('libva')
+replaces=('libva-driver-intel')
+source=(https://freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2
+ libva-intel-driver-1.7.3-glvnd-fix.patch)
+sha1sums=('5100f187afc4e39fce5664b96fe11a38faa9afaa'
+ 'cf885e9fe35b03a453d21e6bad0f203f2995a88e')
+
+prepare() {
+ cd $pkgname-$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
+
+ # fix with libglvnd
+ patch -Np1 -i ../libva-intel-driver-1.7.3-glvnd-fix.patch
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+ install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
+}
Copied: libva-intel-driver/repos/extra-i686/libva-intel-driver-1.7.3-glvnd-fix.patch (from rev 290618, libva-intel-driver/trunk/libva-intel-driver-1.7.3-glvnd-fix.patch)
===================================================================
--- extra-i686/libva-intel-driver-1.7.3-glvnd-fix.patch (rev 0)
+++ extra-i686/libva-intel-driver-1.7.3-glvnd-fix.patch 2017-03-11 13:44:09 UTC (rev 290619)
@@ -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;
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2017-03-11 13:44:02 UTC (rev 290618)
+++ extra-x86_64/PKGBUILD 2017-03-11 13:44:09 UTC (rev 290619)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru <ibiru at archlinux.org>
-# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-
-pkgname=libva-intel-driver
-pkgver=1.7.3
-pkgrel=1
-pkgdesc='VA-API implementation for Intel G45 and HD Graphics family'
-arch=('i686' 'x86_64')
-url='http://freedesktop.org/wiki/Software/vaapi'
-license=('MIT')
-depends=('libva')
-replaces=('libva-driver-intel')
-source=(https://freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2)
-sha1sums=('5100f187afc4e39fce5664b96fe11a38faa9afaa')
-
-prepare() {
- cd $pkgname-$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 $pkgname-$pkgver
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
- install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
Copied: libva-intel-driver/repos/extra-x86_64/PKGBUILD (from rev 290618, libva-intel-driver/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2017-03-11 13:44:09 UTC (rev 290619)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Ionut Biru <ibiru at archlinux.org>
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+
+pkgname=libva-intel-driver
+pkgver=1.7.3
+pkgrel=2
+pkgdesc='VA-API implementation for Intel G45 and HD Graphics family'
+arch=('i686' 'x86_64')
+url='http://freedesktop.org/wiki/Software/vaapi'
+license=('MIT')
+depends=('libva')
+replaces=('libva-driver-intel')
+source=(https://freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2
+ libva-intel-driver-1.7.3-glvnd-fix.patch)
+sha1sums=('5100f187afc4e39fce5664b96fe11a38faa9afaa'
+ 'cf885e9fe35b03a453d21e6bad0f203f2995a88e')
+
+prepare() {
+ cd $pkgname-$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
+
+ # fix with libglvnd
+ patch -Np1 -i ../libva-intel-driver-1.7.3-glvnd-fix.patch
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+ install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
+}
Copied: libva-intel-driver/repos/extra-x86_64/libva-intel-driver-1.7.3-glvnd-fix.patch (from rev 290618, libva-intel-driver/trunk/libva-intel-driver-1.7.3-glvnd-fix.patch)
===================================================================
--- extra-x86_64/libva-intel-driver-1.7.3-glvnd-fix.patch (rev 0)
+++ extra-x86_64/libva-intel-driver-1.7.3-glvnd-fix.patch 2017-03-11 13:44:09 UTC (rev 290619)
@@ -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