PTREL-546 fix: enable wayland build accepted/tizen_generic accepted/tizen_ivi_panda accepted/tizen_ivi_release sandbox/pcoval/tizen tizen_ivi_panda tizen_ivi_release accepted/tizen/generic/20140306.213119 accepted/tizen/ivi/20140307.054320 accepted/tizen/ivi/panda/20140321.225121 accepted/tizen/ivi/release/20140315.015622 submit/tizen/20140306.160229 submit/tizen_ivi_panda/20140321.225021 submit/tizen_ivi_release/20140315.015809
authorJuan Zhao <juan.j.zhao@intel.com>
Tue, 17 Dec 2013 09:33:38 +0000 (17:33 +0800)
committerPhilippe Coval <philippe.coval@open.eurogiciel.org>
Thu, 6 Mar 2014 15:33:38 +0000 (16:33 +0100)
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 elementary package.

Change-Id: I761ef5a9b03493fe7e867282d4d3cd2a812d7482
Signed-off-by: Eduardo Lima (Etrunko) <eduardo.lima@intel.com>
packaging/elementary.spec

index fc803b5c95ee4641e106e55ad3e4dcbde39d5276..dc498ede5978fc4d3ba335c7d9052e1e6a1aef74 100644 (file)
@@ -1,3 +1,5 @@
+%bcond_with wayland
+%bcond_with x
 Name:           elementary
 Version:        1.7.8
 Release:        0 
@@ -14,14 +16,21 @@ BuildRequires:  pkgconfig(ecore-evas)
 BuildRequires:  pkgconfig(ecore-fb)
 BuildRequires:  pkgconfig(ecore-file)
 BuildRequires:  pkgconfig(ecore-imf)
+%if %{with wayland}
+BuildRequires:  pkgconfig(ecore-wayland)
+%endif
+%if %{with x}
 BuildRequires:  pkgconfig(ecore-x)
+BuildRequires:  pkgconfig(x11)
+%endif
 BuildRequires:  pkgconfig(edbus)
 BuildRequires:  pkgconfig(edje)
 BuildRequires:  pkgconfig(eet)
 BuildRequires:  pkgconfig(efreet)
 BuildRequires:  pkgconfig(eina)
 BuildRequires:  pkgconfig(evas)
-BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(emotion)
+BuildRequires:  pkgconfig(ethumb_client)
 BuildRequires:  eet-tools
 BuildRequires:  python-devel
 
@@ -62,7 +71,15 @@ cp %{SOURCE1001} .
 
 %build
 
-%autogen --disable-static --enable-build-examples
+%reconfigure --disable-static \
+%if %{with wayland}
+         --enable-ecore-wayland \
+%endif
+%if !%{with x}
+         --disable-ecore-x \
+%endif
+         --enable-build-examples
+
 make %{?_smp_mflags}
 
 %install