Attachment 120201 Details for Bug 79478 – skip the check related with wayland if wayland is not used or found

[patch] skip the check related with wayland if wayland is not used or found

0001-Skip-the-check-related-with-wayland-if-wayland-is-no.patch (text/plain), 2.28 KB, created by ykzhao on 2015-11-30 01:07:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ykzhao

Created: 2015-11-30 01:07:46 UTC

Size: 2.28 KB

patch

obsolete

>From 0e170fe45203f909a089b715bc34611b2a4af39a Mon Sep 17 00:00:00 2001
>From: Zhao Yakui <yakui.zhao@intel.com>
>Date: Mon, 30 Nov 2015 01:45:18 -0500
>Subject: [PATCH] Skip the check related with wayland if wayland is not used or found
>
>https://bugs.freedesktop.org/show_bug.cgi?id=79478
>
>Signed-off-by: Thomas Orgis <obukus@sourcemage.org>
>Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
>---
> configure.ac | 20 +++++++++++++-------
> 1 file changed, 13 insertions(+), 7 deletions(-)
>
>diff --git a/configure.ac b/configure.ac
>index 88a7ef3..9d2c3a3 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -273,15 +273,16 @@ if test "$enable_wayland" = "yes"; then
>     PKG_CHECK_MODULES([WAYLAND], [wayland-client >= wayland_api_version],
>         [USE_WAYLAND="yes"], [:])
>     if test "$USE_WAYLAND" = "yes"; then
>+        m4_ifdef([WAYLAND_SCANNER_RULES],
>+            [WAYLAND_SCANNER_RULES(['$(top_builddir)/va/wayland/protocol'])],
>+            [wayland_scanner_rules=""; AC_SUBST(wayland_scanner_rules)])
>+
>         AC_DEFINE([HAVE_VA_WAYLAND], [1],
>                   [Defined to 1 if VA/Wayland API is built])
>     fi
> fi
>-AM_CONDITIONAL(USE_WAYLAND, test "$USE_WAYLAND" = "yes")
> 
>-m4_ifdef([WAYLAND_SCANNER_RULES],
>-    [WAYLAND_SCANNER_RULES(['$(top_builddir)/va/wayland/protocol'])],
>-    [wayland_scanner_rules=""; AC_SUBST(wayland_scanner_rules)])
>+AM_CONDITIONAL(USE_WAYLAND, test "$USE_WAYLAND" = "yes")
> 
> pkgconfigdir=${libdir}/pkgconfig
> AC_SUBST(pkgconfigdir)
>@@ -309,8 +310,6 @@ debian.upstream/libva-drm.install.in
> debian.upstream/libva-egl.install.in
>     debian.upstream/libva-glx$LIBVA_MAJOR_VERSION.install:\
> debian.upstream/libva-glx.install.in
>-    debian.upstream/libva-wayland$LIBVA_MAJOR_VERSION.install:\
>-debian.upstream/libva-wayland.install.in
>     debian.upstream/libva-x11-$LIBVA_MAJOR_VERSION.install:\
> debian.upstream/libva-x11.install.in
>     doc/Makefile
>@@ -335,10 +334,17 @@ debian.upstream/libva-x11.install.in
>     va/egl/Makefile
>     va/glx/Makefile
>     va/va_version.h
>+    va/x11/Makefile
>+])
>+
>+if test "$USE_WAYLAND" = "yes"; then
>+AC_OUTPUT([
>+    debian.upstream/libva-wayland$LIBVA_MAJOR_VERSION.install:\
>+debian.upstream/libva-wayland.install.in
>     va/wayland/Makefile
>     va/wayland/protocol/Makefile
>-    va/x11/Makefile
> ])
>+fi
> 
> # Print a small summary
> BACKENDS=""
>-- 
>1.8.2.1
>

Actions: View | Splinter Review

Attachments on bug 79478: 115144 | 116697 | 116698 | 117345 | 117777 | 120201

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.