From: Juan Zhao <juan.j.zhao@intel.com>
Date: Fri, 13 Dec 2013 03:36:02 +0000 (+0800)
Subject: change {without x} to {with x}
X-Git-Tag: submit/tizen/20131218.093400^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9c78fc538df38c3a617b959783b8d29786ad16b9;p=platform%2Fupstream%2Fevas.git

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 evas package.

Change-Id: Ia5a37460e89433bfb21201671948ff2cf03db25e
---

diff --git a/packaging/evas.spec b/packaging/evas.spec
index 3a8324b..8475afd 100644
--- a/packaging/evas.spec
+++ b/packaging/evas.spec
@@ -1,4 +1,6 @@
 %bcond_with wayland
+%bcond_with x
+
 Name:           evas
 Version:        1.7.8
 Release:        1
@@ -16,16 +18,18 @@ BuildRequires:  pkgconfig(eina)
 BuildRequires:  pkgconfig(fontconfig)
 BuildRequires:  pkgconfig(freetype2)
 BuildRequires:  pkgconfig(fribidi)
-BuildRequires:  pkgconfig(gl)
 BuildRequires:  pkgconfig(glesv2)
 BuildRequires:  pkgconfig(harfbuzz)
 BuildRequires:  pkgconfig(ice)
 BuildRequires:  pkgconfig(libpng)
 BuildRequires:  pkgconfig(libtiff-4)
 BuildRequires:  pkgconfig(pixman-1)
+%if %{with x}
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xext)
 BuildRequires:  pkgconfig(xrender)
+BuildRequires:  pkgconfig(gl)
+%endif
 %if %{with wayland}
 BuildRequires:  pkgconfig(egl)
 BuildRequires:  pkgconfig(wayland-client)
@@ -61,6 +65,12 @@ cp %{SOURCE1001} .
 
 %build
 %configure --enable-pthreads \
+%if !%{with x}
+           --without-x             \
+           --disable-software-xcb  \
+           --disable-software-xlib \
+           --enable-gl-flavor-gles \
+%endif
 %if %{with wayland}
             --enable-gles-variety-sgx \
             --enable-wayland-egl \