diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2015-07-24 15:14:10 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2015-07-24 15:14:10 +0000 |
| commit | 33439a678eb5a369c5e6dc8b83decdf3ad171f3a (patch) | |
| tree | edfbae26cbc94785bc8fffc00c7bd5bb1f448e1f /x11-libs | |
| parent | Drop IUSE=doc and gtk-doc support. If the gnome team wants to fix it, they ar... (diff) | |
| download | gentoo-2-33439a678eb5a369c5e6dc8b83decdf3ad171f3a.tar.gz gentoo-2-33439a678eb5a369c5e6dc8b83decdf3ad171f3a.tar.bz2 gentoo-2-33439a678eb5a369c5e6dc8b83decdf3ad171f3a.zip | |
Fix wayland-automagic patch to handle both USE=wayland and USE=-wayland (with installed and uninstalled wayland) properly. Bug #555440.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/libva-intel-driver/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-libs/libva-intel-driver/files/libva-intel-driver-1.6.0-wayland-automagic.patch | 49 |
2 files changed, 38 insertions, 18 deletions
diff --git a/x11-libs/libva-intel-driver/ChangeLog b/x11-libs/libva-intel-driver/ChangeLog index 7dff5db2b5a7..4ea68bf64438 100644 --- a/x11-libs/libva-intel-driver/ChangeLog +++ b/x11-libs/libva-intel-driver/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-libs/libva-intel-driver # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/ChangeLog,v 1.44 2015/07/14 09:21:17 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/ChangeLog,v 1.45 2015/07/24 15:14:10 mgorny Exp $ + + 24 Jul 2015; Michał Górny <mgorny@gentoo.org> + files/libva-intel-driver-1.6.0-wayland-automagic.patch: + Fix wayland-automagic patch to handle both USE=wayland and USE=-wayland (with + installed and uninstalled wayland) properly. Bug #555440. 14 Jul 2015; Alexis Ballier <aballier@gentoo.org> libva-intel-driver-1.6.0.ebuild, diff --git a/x11-libs/libva-intel-driver/files/libva-intel-driver-1.6.0-wayland-automagic.patch b/x11-libs/libva-intel-driver/files/libva-intel-driver-1.6.0-wayland-automagic.patch index f729732117d1..f2707a00ad4f 100644 --- a/x11-libs/libva-intel-driver/files/libva-intel-driver-1.6.0-wayland-automagic.patch +++ b/x11-libs/libva-intel-driver/files/libva-intel-driver-1.6.0-wayland-automagic.patch @@ -1,22 +1,37 @@ -Index: libva-intel-driver-1.6.0/configure.ac -=================================================================== ---- libva-intel-driver-1.6.0.orig/configure.ac -+++ libva-intel-driver-1.6.0/configure.ac -@@ -165,12 +165,14 @@ if test "$enable_wayland" = "yes"; then - PKG_CHECK_MODULES([LIBVA_WAYLAND_DEPS], [libva-wayland], - [AC_DEFINE([HAVE_VA_WAYLAND], [1], [Defined to 1 if VA/Wayland API is enabled])], - [USE_WAYLAND="no"]) --fi --AM_CONDITIONAL(USE_WAYLAND, test "$USE_WAYLAND" = "yes") -- - m4_ifdef([WAYLAND_SCANNER_RULES], - [WAYLAND_SCANNER_RULES(['$(top_builddir)/src/wayland'])], - [wayland_scanner_rules=""; AC_SUBST(wayland_scanner_rules)]) +From 405437e31d3faf6adc32d887ae1945b8d93f7846 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> +Date: Fri, 24 Jul 2015 17:01:23 +0200 +Subject: [PATCH] Do not require wayland-scanner if wayland is disabled + +Do not perform fatal wayland-scanner checks if wayland is disabled +(either by --disable-wayland or wayland check failure) even if +wayland-scanner macros are installed on the system. +--- + configure.ac | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 6e73059..70eb275 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -168,9 +168,14 @@ if test "$enable_wayland" = "yes"; then + fi + AM_CONDITIONAL(USE_WAYLAND, test "$USE_WAYLAND" = "yes") + +-m4_ifdef([WAYLAND_SCANNER_RULES], +- [WAYLAND_SCANNER_RULES(['$(top_builddir)/src/wayland'])], +- [wayland_scanner_rules=""; AC_SUBST(wayland_scanner_rules)]) ++if test "$USE_WAYLAND" = "yes"; then ++ m4_ifdef([WAYLAND_SCANNER_RULES], ++ [WAYLAND_SCANNER_RULES(['$(top_builddir)/src/wayland'])], ++ [wayland_scanner_rules=/dev/null; AC_SUBST_FILE(wayland_scanner_rules)]) +else -+ wayland_scanner_rules="" -+ AC_SUBST(wayland_scanner_rules) ++ wayland_scanner_rules=/dev/null ++ AC_SUBST_FILE(wayland_scanner_rules) +fi -+AM_CONDITIONAL(USE_WAYLAND, test "$USE_WAYLAND" = "yes") AC_OUTPUT([ Makefile +-- +2.4.6 + |