From 3388424cbb6e054e4867e6fb0cc687a1a4c2bda2 Mon Sep 17 00:00:00 2001 From: Juan Zhao Date: Thu, 12 Dec 2013 15:25:34 +0800 Subject: [PATCH] change {without x} to {with x} The display server based on X or Wayland, is now a choice of different profile in Tizen 3.0. Basically and consistently, two macros were used "with wayland" and "with x". Below summarize the combination of the macros: | wayland | x | meaning |--------------------------- | 0 | 1 | pure X11 platform(no wayland) | 1 | 0 | pure wayland platform (no X11) | 1 | 1 | wayland but X compatibility | 0 | 0 | no X and no wayland This method unifies the meaning and usage. Deploy this method to cairo package. Change-Id: I84421929b142aea0e702b3f1411c958a12155171 --- packaging/cairo.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packaging/cairo.spec b/packaging/cairo.spec index 7a976c2..eb11e4e 100644 --- a/packaging/cairo.spec +++ b/packaging/cairo.spec @@ -1,7 +1,7 @@ %bcond_without cairo_xcb_backend %bcond_without cairo_gl_backend %bcond_with wayland -%bcond_without x +%bcond_with x Name: cairo @@ -24,7 +24,7 @@ BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(pixman-1) BuildRequires: which %if %{with cairo_gl_backend} -%if !%{without x} +%if %{with x} BuildRequires: pkgconfig(gl) %endif BuildRequires: pkgconfig(glesv2) @@ -32,7 +32,7 @@ BuildRequires: pkgconfig(glesv2) BuildRequires: pkgconfig(wayland-egl) %endif %endif -%if !%{without x} +%if %{with x} BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xrender) @@ -144,7 +144,7 @@ NOCONFIGURE=1 ./autogen.sh --enable-script \ --enable-svg \ --enable-tee \ -%if %{without x} +%if %{with wayland} && !%{with x} --disable-xlib \ --disable-xcb \ %else -- 2.7.4