mgorny 15/07/24 15:14:10 Modified: libva-intel-driver-1.6.0-wayland-automagic.patch Log: 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!)
Revision Changes Path 1.2 x11-libs/libva-intel-driver/files/libva-intel-driver-1.6.0-wayland-automagic.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libva-intel-driver/files/libva-intel-driver-1.6.0-wayland-automagic.patch?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libva-intel-driver/files/libva-intel-driver-1.6.0-wayland-automagic.patch?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libva-intel-driver/files/libva-intel-driver-1.6.0-wayland-automagic.patch?r1=1.1&r2=1.2 Index: libva-intel-driver-1.6.0-wayland-automagic.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/files/libva-intel-driver-1.6.0-wayland-automagic.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libva-intel-driver-1.6.0-wayland-automagic.patch 14 Jul 2015 09:21:17 -0000 1.1 +++ libva-intel-driver-1.6.0-wayland-automagic.patch 24 Jul 2015 15:14:10 -0000 1.2 @@ -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?= <[email protected]> +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 +
