diff options
author | Juan Zhao <juan.j.zhao@intel.com> | 2013-12-12 15:25:34 +0800 |
---|---|---|
committer | Juan Zhao <juan.j.zhao@intel.com> | 2013-12-12 15:25:34 +0800 |
commit | 3388424cbb6e054e4867e6fb0cc687a1a4c2bda2 (patch) | |
tree | e800cfe1e78ec5dea630881583e5eefa21f2c6ef | |
parent | 7070a91ef1189ae23dcca6dfbd3762e628f82550 (diff) | |
download | cairo-3388424cbb6e054e4867e6fb0cc687a1a4c2bda2.tar.gz cairo-3388424cbb6e054e4867e6fb0cc687a1a4c2bda2.tar.bz2 cairo-3388424cbb6e054e4867e6fb0cc687a1a4c2bda2.zip |
change {without x} to {with x}submit/tizen_ivi_panda/20140321.233337submit/tizen/20140113.200040submit/tizen/20131213.094508accepted/tizen/mobile/20140113.194939accepted/tizen/mobile/20131216.220225accepted/tizen/ivi/panda/20140321.235028accepted/tizen/ivi/20131214.022721accepted/tizen/generic/20140114.103452accepted/tizen/generic/20140106.135221tizen_ivi_pandaaccepted/tizen_ivi_pandaaccepted/tizen_genericaccepted/tizen/mobileaccepted/tizen/ivi/stableaccepted/tizen/generic
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
-rw-r--r-- | packaging/cairo.spec | 8 |
1 files 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 |