diff options
| author | Quanxian Wang <quanxian.wang@intel.com> | 2013-10-25 16:23:04 +0800 |
|---|---|---|
| committer | Philippe Coval <philippe.coval@open.eurogiciel.org> | 2015-03-04 10:15:34 +0100 |
| commit | 80ef742b7c31b2b16873aa307edae5d46b848a9a (patch) | |
| tree | 1d60f09efee58bc0ed1a514c337a949ebe98bf80 | |
| parent | 6e998d8edf0b4c8609b55418066578c6745d9e1d (diff) | |
| download | efl-80ef742b7c31b2b16873aa307edae5d46b848a9a.tar.gz | |
Fix ivi building issue
Change-Id: Ide344ca8061311e403a0878a78743e666153106b
Signed-off-by: Quanxian Wang <quanxian.wang@intel.com>
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | packaging/efl.spec | 21 |
2 files changed, 20 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 30097b745f..96ccd7ab5d 100644 --- a/configure.ac +++ b/configure.ac @@ -711,6 +711,7 @@ EFL_SELECT_WINDOWS_VERSION EFL_ADD_LIBS([EVIL], [-lole32 -lws2_32 -lsecur32 -luuid]) EVIL_DLFCN_LIBS="-lpsapi" + AC_SUBST([EVIL_DLFCN_LIBS]) ### Checks for header files diff --git a/packaging/efl.spec b/packaging/efl.spec index dad7a4503e..bdd027c519 100644 --- a/packaging/efl.spec +++ b/packaging/efl.spec @@ -1,3 +1,5 @@ +%bcond_with wayland + Name: efl Version: 1.8.alpha Release: 1 @@ -38,7 +40,12 @@ BuildRequires: pkgconfig(check) BuildRequires: zlib-devel BuildRequires: gettext-tools -#ecore +%if %{with wayland} +BuildRequires: pkgconfig(wayland-client) +BuildRequires: pkgconfig(wayland-cursor) +BuildRequires: pkgconfig(wayland-egl) +BuildRequires: pkgconfig(glesv2) +%else BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcursor) BuildRequires: pkgconfig(xinerama) @@ -52,11 +59,14 @@ BuildRequires: pkgconfig(xscrnsaver) BuildRequires: libXtst-devel BuildRequires: pkgconfig(xi) BuildRequires: pkgconfig(xgesture) +BuildRequires: pkgconfig(gles20) +%endif BuildRequires: glib2-devel BuildRequires: pkgconfig(openssl) BuildRequires: gnutls-devel BuildRequires: curl-devel BuildRequires: pkgconfig(vconf) +BuildRequires: pkgconfig(xkbcommon) #eldbus BuildRequires: dbus-devel @@ -83,7 +93,6 @@ BuildRequires: pkgconfig(fribidi) BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(harfbuzz) BuildRequires: pkgconfig(libdri2) -BuildRequires: pkgconfig(gles20) BuildRequires: pkgconfig(libtbm) #eeze @@ -143,7 +152,11 @@ Headers, pkgconfig files and other files needed for development with EFL. NOCONFIGURE=1 ./autogen.sh %configure --disable-physics --enable-tizen --enable-g-main-loop \ --disable-xim --disable-scim --enable-gesture \ +%if %{with wayland} + --enable-tile-rotate --disable-rpath --with-x11=none --with-opengl=es --enable-wayland --enable-egl +%else --enable-tile-rotate --disable-rpath --with-x11=xlib --with-opengl=es +%endif make @@ -172,6 +185,9 @@ make %{_libdir}/emotion/modules/*/*/*.so %{_libdir}/ethumb/modules/*/*/* %{_libdir}/ethumb_client/utils/*/* +%if %{with wayland} +%{_libdir}/ecore_imf/modules/*/*/*.so +%endif %{_libdir}/ecore_evas/engines/*/*/*.so %{_libdir}/ecore/*/*/*/*.so @@ -210,3 +226,4 @@ make %{_includedir}/* %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc +%exclude %{_libdir}/debug/* |