From 9db59ee23c8fbf20cceeabfc005d6059df745c84 Mon Sep 17 00:00:00 2001 From: Wang Quanxian Date: Wed, 24 Jul 2013 10:20:59 +0800 Subject: [PATCH] Add gles dependency since wrt-client needs it when wrt-client is built with ewebkit2 Bug Fix TDIST-277. https://bugs.tizen.org/jira/browse/TDIST-277 Signed-Off-By Quanxian Wang --- packaging/wrt.spec | 10 ++++++++++ src/CMakeLists.txt | 6 +++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/packaging/wrt.spec b/packaging/wrt.spec index 756f857..eb3b43a 100644 --- a/packaging/wrt.spec +++ b/packaging/wrt.spec @@ -1,3 +1,4 @@ +%bcond_with mesa %bcond_with wayland %bcond_with decrypt %bcond_with multi_user @@ -59,6 +60,12 @@ BuildRequires: pkgconfig(osp-appfw) BuildRequires: osp-appfw-internal-devel Requires: osp-appfw %endif +%if %{with mesa} +BuildRequires: pkgconfig(gl) +BuildRequires: pkgconfig(glesv2) +%else +BuildRequires: pkgconfig(gles20) +%endif Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig @@ -99,6 +106,9 @@ export LDFLAGS+="-Wl,--rpath=%{_libdir}" %cmake . -DDPL_LOG="ON" \ -DPROJECT_VERSION=%{version} \ -DCMAKE_BUILD_TYPE=%{?build_type:%build_type} \ +%if %{with mesa} + -DUSE_MESA=On \ +%endif %if %{with wayland} -DX11_SUPPORT=Off \ %else diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 879c80d..b9871e5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -113,7 +113,11 @@ IF(SMACK_ENABLED) LIST(APPEND SYS_WRT_BASIC_DEP libprivilege-control) ENDIF(SMACK_ENABLED) - +IF (USE_MESA) + LIST(APPEND SYS_WRT_BASIC_DEP glesv2) +ELSE () + LIST(APPEND SYS_WRT_BASIC_DEP gles20) +ENDIF () PKG_CHECK_MODULES(SYS_WRT_ENGINE_DEPS ${SYS_WRT_BASIC_DEP} -- 2.7.4