From: daemyung jang Date: Fri, 12 Jun 2015 03:03:38 +0000 (+0900) Subject: Add device smack rule and fix build erros when using mobile spec. X-Git-Tag: dali_1.0.45~8 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=452e5901f9979a98b365c8df55cdf96c58fac74f;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git Add device smack rule and fix build erros when using mobile spec. Change-Id: I801bcb1cc29d80142286ee5c89151a610300915e --- diff --git a/build/tizen/configure.ac b/build/tizen/configure.ac index d760e20..4fe7ac7 100644 --- a/build/tizen/configure.ac +++ b/build/tizen/configure.ac @@ -176,7 +176,11 @@ AM_CONDITIONAL([WAYLAND], [test x$enable_wayland = xyes]) # should not disable features. This allows the developer to override # features through the command line. +if test "x$enable_profile" = "xMOBILE"; then +PKG_CHECK_MODULES(OPENGLES20, gles20) +else PKG_CHECK_MODULES(OPENGLES20, glesv2 egl) +fi if test "x$enable_profile" != "xUBUNTU"; then PKG_CHECK_MODULES(CAPI_APPFW_APPLICATION, capi-appfw-application) diff --git a/dali-adaptor.rule-mobile b/dali-adaptor.rule-mobile new file mode 100644 index 0000000..60f7b0d --- /dev/null +++ b/dali-adaptor.rule-mobile @@ -0,0 +1 @@ +dali sensord rw diff --git a/packaging/dali-adaptor-mobile.spec b/packaging/dali-adaptor-mobile.spec index cbcfbae..32a73a5 100644 --- a/packaging/dali-adaptor-mobile.spec +++ b/packaging/dali-adaptor-mobile.spec @@ -21,6 +21,7 @@ Source0: %{name}-%{version}.tar.gz Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig Requires: boost-thread +Requires: boost-chrono Requires: giflib BuildRequires: pkgconfig BuildRequires: gawk @@ -47,7 +48,7 @@ BuildRequires: libdrm-devel BuildRequires: pkgconfig(libexif) BuildRequires: pkgconfig(capi-system-system-settings) BuildRequires: pkgconfig(libpng) -BuildRequires: pkgconfig(opengl-es-20) +BuildRequires: pkgconfig(gles20) BuildRequires: pkgconfig(efl-assist) BuildRequires: libcurl-devel BuildRequires: pkgconfig(harfbuzz) @@ -125,6 +126,7 @@ Dynamics plugin to wrap the libBulletDynamics libraries %setup -q %define dali_data_rw_dir /opt/usr/share/dali/ %define dali_data_ro_dir /usr/share/dali/ +%define smack_rule_dir /etc/smack/accesses2.d/ %define user_shader_cache_dir %{dali_data_ro_dir}/core/shaderbin/ %define font_preloaded_path /usr/share/fonts/ %define font_downloaded_path /opt/share/fonts/ @@ -187,6 +189,12 @@ rm -rf %{buildroot} cd build/tizen %make_install DALI_DATA_RW_DIR="%{dali_data_rw_dir}" DALI_DATA_RO_DIR="%{dali_data_ro_dir}" +############################## +# Smack +############################## +mkdir -p %{buildroot}%{smack_rule_dir} +cp -f %{_builddir}/%{name}-%{version}/%{name}.rule-mobile %{buildroot}%{smack_rule_dir}/%{name}.rule + # LICENSE mkdir -p %{buildroot}/usr/share/license cp -af %{_builddir}/%{name}-%{version}/LICENSE %{buildroot}/usr/share/license/%{name} @@ -255,6 +263,7 @@ exit 0 %files %manifest dali-adaptor.manifest-mobile %defattr(-,root,root,-) +%{smack_rule_dir}/%{name}.rule %{_libdir}/libdali-adap*.so* %defattr(-,app,app,-) %dir %{user_shader_cache_dir}