| 1 |
mgorny 15/07/24 15:14:10 |
| 2 |
|
| 3 |
Modified: libva-intel-driver-1.6.0-wayland-automagic.patch |
| 4 |
Log: |
| 5 |
Fix wayland-automagic patch to handle both USE=wayland and USE=-wayland (with installed and uninstalled wayland) properly. Bug #555440. |
| 6 |
|
| 7 |
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 x11-libs/libva-intel-driver/files/libva-intel-driver-1.6.0-wayland-automagic.patch |
| 11 |
|
| 12 |
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 |
| 13 |
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 |
| 14 |
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 |
| 15 |
|
| 16 |
Index: libva-intel-driver-1.6.0-wayland-automagic.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/files/libva-intel-driver-1.6.0-wayland-automagic.patch,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- libva-intel-driver-1.6.0-wayland-automagic.patch 14 Jul 2015 09:21:17 -0000 1.1 |
| 23 |
+++ libva-intel-driver-1.6.0-wayland-automagic.patch 24 Jul 2015 15:14:10 -0000 1.2 |
| 24 |
@@ -1,22 +1,37 @@ |
| 25 |
-Index: libva-intel-driver-1.6.0/configure.ac |
| 26 |
-=================================================================== |
| 27 |
---- libva-intel-driver-1.6.0.orig/configure.ac |
| 28 |
-+++ libva-intel-driver-1.6.0/configure.ac |
| 29 |
-@@ -165,12 +165,14 @@ if test "$enable_wayland" = "yes"; then |
| 30 |
- PKG_CHECK_MODULES([LIBVA_WAYLAND_DEPS], [libva-wayland], |
| 31 |
- [AC_DEFINE([HAVE_VA_WAYLAND], [1], [Defined to 1 if VA/Wayland API is enabled])], |
| 32 |
- [USE_WAYLAND="no"]) |
| 33 |
--fi |
| 34 |
--AM_CONDITIONAL(USE_WAYLAND, test "$USE_WAYLAND" = "yes") |
| 35 |
-- |
| 36 |
- m4_ifdef([WAYLAND_SCANNER_RULES], |
| 37 |
- [WAYLAND_SCANNER_RULES(['$(top_builddir)/src/wayland'])], |
| 38 |
- [wayland_scanner_rules=""; AC_SUBST(wayland_scanner_rules)]) |
| 39 |
+From 405437e31d3faf6adc32d887ae1945b8d93f7846 Mon Sep 17 00:00:00 2001 |
| 40 |
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
| 41 |
+Date: Fri, 24 Jul 2015 17:01:23 +0200 |
| 42 |
+Subject: [PATCH] Do not require wayland-scanner if wayland is disabled |
| 43 |
+ |
| 44 |
+Do not perform fatal wayland-scanner checks if wayland is disabled |
| 45 |
+(either by --disable-wayland or wayland check failure) even if |
| 46 |
+wayland-scanner macros are installed on the system. |
| 47 |
+--- |
| 48 |
+ configure.ac | 11 ++++++++--- |
| 49 |
+ 1 file changed, 8 insertions(+), 3 deletions(-) |
| 50 |
+ |
| 51 |
+diff --git a/configure.ac b/configure.ac |
| 52 |
+index 6e73059..70eb275 100644 |
| 53 |
+--- a/configure.ac |
| 54 |
++++ b/configure.ac |
| 55 |
+@@ -168,9 +168,14 @@ if test "$enable_wayland" = "yes"; then |
| 56 |
+ fi |
| 57 |
+ AM_CONDITIONAL(USE_WAYLAND, test "$USE_WAYLAND" = "yes") |
| 58 |
+ |
| 59 |
+-m4_ifdef([WAYLAND_SCANNER_RULES], |
| 60 |
+- [WAYLAND_SCANNER_RULES(['$(top_builddir)/src/wayland'])], |
| 61 |
+- [wayland_scanner_rules=""; AC_SUBST(wayland_scanner_rules)]) |
| 62 |
++if test "$USE_WAYLAND" = "yes"; then |
| 63 |
++ m4_ifdef([WAYLAND_SCANNER_RULES], |
| 64 |
++ [WAYLAND_SCANNER_RULES(['$(top_builddir)/src/wayland'])], |
| 65 |
++ [wayland_scanner_rules=/dev/null; AC_SUBST_FILE(wayland_scanner_rules)]) |
| 66 |
+else |
| 67 |
-+ wayland_scanner_rules="" |
| 68 |
-+ AC_SUBST(wayland_scanner_rules) |
| 69 |
++ wayland_scanner_rules=/dev/null |
| 70 |
++ AC_SUBST_FILE(wayland_scanner_rules) |
| 71 |
+fi |
| 72 |
-+AM_CONDITIONAL(USE_WAYLAND, test "$USE_WAYLAND" = "yes") |
| 73 |
|
| 74 |
AC_OUTPUT([ |
| 75 |
Makefile |
| 76 |
+-- |
| 77 |
+2.4.6 |
| 78 |
+ |
Archives