Merge remote-tracking branch 'origin/tizen' into new_text

Conflicts:
	build/tizen/adaptor/Makefile.am

Change-Id: Ide3266e4a0c8f9712baf42531666c22384c4a41e

diff --combined build/tizen/adaptor/Makefile.am
index a1fcf95,3646021..106b8c0
--- 1/build/tizen/adaptor/Makefile.am
--- 2/build/tizen/adaptor/Makefile.am
+++ b/build/tizen/adaptor/Makefile.am
@@@ -28,10 -28,6 +28,10 @@@ tizen_platform_abstraction_src_dir = ..
  portable_platform_abstraction_src_dir = ../../../platform-abstractions/portable
  include ../../../platform-abstractions/tizen/file.list
  
 +# Text Abstraction
 +text_src_dir = ../../../text
 +include ../../../text/file.list
 +
  # Internal Common
  adaptor_common_dir = ../../../adaptors/common
  include ../../../adaptors/common/file.list
@@@ -70,9 -66,6 +70,9 @@@ endi
  adaptor_public_api_dir = ../../../adaptors/public-api
  include ../../../adaptors/public-api/file.list
  
 +# Static libraries
 +static_libraries_libunibreak_src_dir = ../../../text/dali/internal/libunibreak
 +include ../../../text/dali/internal/libunibreak/file.list
  
  ############# source files #############
  
@@@ -87,8 -80,7 +87,8 @@@ if COMMON_PROFIL
  
  adaptor_internal_src_files = $(adaptor_common_internal_src_files) \
                               $(adaptor_common_internal_default_profile_src_files) \
 -                             $(adaptor_tizen_internal_src_files)
 +                             $(adaptor_tizen_internal_src_files) \
 +                             $(static_libraries_libunibreak_src_files)
  
  if WAYLAND
  adaptor_internal_src_files += $(adaptor_wayland_tizen_internal_src_files) \
@@@ -107,8 -99,7 +107,8 @@@ adaptor_internal_src_files = $(adaptor_
                               $(adaptor_common_internal_default_profile_src_files) \
                               $(adaptor_ubuntu_internal_src_files) \
                               $(adaptor_x11_ubuntu_internal_src_files) \
 -                             $(adaptor_x11_internal_default_profile_src_files)
 +                             $(adaptor_x11_internal_default_profile_src_files) \
 +                             $(static_libraries_libunibreak_src_files)
  
  endif # UBUNTU_PROFILE
  
@@@ -118,8 -109,7 +118,8 @@@ if MOBILE_PROFIL
  
  adaptor_internal_src_files = $(adaptor_common_internal_src_files) \
                               $(adaptor_common_internal_mobile_profile_src_files) \
 -                             $(adaptor_tizen_internal_src_files)
 +                             $(adaptor_tizen_internal_src_files) \
 +                             $(static_libraries_libunibreak_src_files)
  
  if WAYLAND
  adaptor_internal_src_files += $(adaptor_wayland_tizen_internal_src_files)
@@@ -134,8 -124,7 +134,8 @@@ if WEARABLE_PROFIL
  
  adaptor_internal_src_files = $(adaptor_common_internal_src_files) \
                               $(adaptor_common_internal_mobile_profile_src_files) \
 -                             $(adaptor_tizen_internal_src_files)
 +                             $(adaptor_tizen_internal_src_files) \
 +                             $(static_libraries_libunibreak_src_files)
  if WAYLAND
  adaptor_internal_src_files += $(adaptor_wayland_tizen_internal_src_files)
  else
@@@ -150,8 -139,7 +150,8 @@@ if TV_PROFIL
  
  adaptor_internal_src_files = $(adaptor_common_internal_src_files) \
                               $(adaptor_common_internal_tv_profile_src_files) \
 -                             $(adaptor_tizen_internal_src_files)
 +                             $(adaptor_tizen_internal_src_files) \
 +                             $(static_libraries_libunibreak_src_files)
  if WAYLAND
  adaptor_internal_src_files += $(adaptor_wayland_tizen_internal_src_files)
  else
@@@ -180,7 -168,6 +180,7 @@@ lib_LTLIBRARIES = libdali-adaptor.l
  libdali_adaptor_la_SOURCES = \
                       $(base_adaptor_src_files) \
                       $(tizen_platform_abstraction_src_files) \
 +                     $(text_abstraction_src_files) \
                       $(public_api_src_files) \
                       $(adaptor_internal_src_files)
  
@@@ -196,10 -183,7 +196,10 @@@ libdali_adaptor_la_includes = 
                        -I../../../adaptors/public-api \
                        -I../../../adaptors/public-api/adaptor-framework \
                        -I../../../adaptors/common \
 -                      -I../../../adaptors/
 +                      -I../../../adaptors/ \
 +                      -I../../../text \
 +                      -I../../../text/dali/internal/libunibreak
 +
  if WAYLAND
  libdali_adaptor_la_includes += \
                        -I../../../adaptors/wayland
@@@ -244,6 -228,7 +244,7 @@@ libdali_adaptor_la_CXXFLAGS = 
                        $(FONTCONFIG_CFLAGS) \
                        $(PNG_CFLAGS) \
                        $(CAPI_APPFW_APPLICATION_CFLAGS) \
+                       $(CAPI_SYSTEM_INFO_CFLAGS) \
                        $(ELEMENTARY_CFLAGS) \
                        $(EVAS_CFLAGS) \
                        $(ECORE_CFLAGS) \
@@@ -280,7 -265,7 +281,8 @@@ libdali_adaptor_la_LIBADD = 
                        $(LIBCURL_LIBS) \
                        $(CAPI_SYSTEM_SYSTEM_SETTINGS_LIBS) \
                        $(CAPI_APPFW_APPLICATION_LIBS) \
 +                      $(HARFBUZZ_LIBS) \
+                       $(CAPI_SYSTEM_INFO_LIBS) \
                        -lgif \
                        -lboost_thread
  
@@@ -338,9 -323,6 +340,9 @@@ tizenadaptorpublicapi_HEADERS = $(publi
  tizenadaptorframeworkpublicapidir = $(tizenadaptorpublicapidir)/adaptor-framework
  tizenadaptorframeworkpublicapi_HEADERS = $(public_api_adaptor_framework_header_files)
  
 +tizentextabstractionpublicapidir = $(tizenadaptorpublicapidir)/text-abstraction
 +tizentextabstractionpublicapi_HEADERS = $(text_abstraction_header_files)
 +
  if !UBUNTU_PROFILE
  
  if !WAYLAND
@@@ -379,5 -361,4 +381,5 @@@ linker_test_LDADD = 
    $(DALICORE_LIBS) \
    $(VCONF_LIBS) \
    libdali-adaptor.la \
 +  $(HARFBUZZ_LIBS) \
    -L${prefix}/lib

diff --combined build/tizen/configure.ac
index 96e8a05,6cfa86b..2bf6f5a
--- 1/build/tizen/configure.ac
--- 2/build/tizen/configure.ac
+++ b/build/tizen/configure.ac
@@@ -45,8 -45,6 +45,8 @@@ PKG_CHECK_MODULES(XML, libxml-2.0
  PKG_CHECK_MODULES(LIBEXIF, libexif)
  PKG_CHECK_MODULES(LIBDRM, libdrm)
  PKG_CHECK_MODULES(LIBCURL, libcurl)
 +PKG_CHECK_MODULES(HARFBUZZ, harfbuzz)
 +PKG_CHECK_MODULES(FRIBIDI, fribidi)
  
  # Check for availability of BulletPhysics
  PKG_CHECK_EXISTS(bullet, [
@@@ -133,6 -131,12 +133,12 @@@ AC_ARG_WITH([jpeg-turbo]
  
  AM_CONDITIONAL(TURBO_JPEG_IS_ON, test $with_jpeg_turbo = yes)
  
+ AC_ARG_WITH([over-tizen_2_2],
+             [AC_HELP_STRING([--with-over-tizen_2_2],
+                             [Use tizen API over ver. 2.2])],
+             [with_over_tizen_2_2=yes],
+             [with_over_tizen_2_2=no])
+ 
  # Tizen Profile options
  AC_ARG_ENABLE([profile],
                [AC_HELP_STRING([--enable-profile=COMMON,MOBILE,WEARABLE,TV,UBUNTU],
@@@ -172,8 -176,13 +178,13 @@@ PKG_CHECK_MODULES(SENSOR, sensor
  PKG_CHECK_MODULES(TTS, tts)
  PKG_CHECK_MODULES(VCONF, vconf)
  PKG_CHECK_MODULES(CAPI_SYSTEM_SYSTEM_SETTINGS, capi-system-system-settings)
+ 
+ if test "x$with_over_tizen_2_2" = "xyes"; then
+ PKG_CHECK_MODULES(CAPI_SYSTEM_INFO, capi-system-info)
  fi
  
+ fi # ubuntu profile test
+ 
  if test "x$enable_wayland" = "xyes"; then
  PKG_CHECK_MODULES(WAYLAND, [ecore-wayland egl wayland-egl wayland-client >= 1.2.0 xkbcommon],
                    [DALI_HAS_ECOREWL=yes],
@@@ -289,4 -298,5 +300,5 @@@ Configuratio
    Font Path (Downloaded):           $fontDownloadedPath
    Font Path (Application):          $fontApplicationPath
    Font Configuration File:          $fontConfigurationFilePath
+   OVERTIZEN2.2:                     $with_over_tizen_2_2
  "

diff --combined packaging/dali-adaptor-mobile.spec
index 8142b4a,2922cc8..00351be
--- 1/packaging/dali-adaptor-mobile.spec
--- 2/packaging/dali-adaptor-mobile.spec
+++ b/packaging/dali-adaptor-mobile.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:       dali-adaptor
  Summary:    The DALi Tizen Adaptor
- Version:    1.0.33
+ Version:    1.0.34
  Release:    1
  Group:      System/Libraries
  License:    Apache-2.0
@@@ -9,9 -9,9 +9,9 @@@ Source0:    %{name}-%{version}.tar.g
  
  %define dali_profile MOBILE
  %define dali_mobile_profile 1
- %define dali_feedback_plugin 1
- %define dali_bullet_plugin 1
- %define dali_assimp_plugin 1
+ %define dali_feedback_plugin 0
+ %define dali_bullet_plugin 0
+ %define dali_assimp_plugin 0
  %define over_tizen_2_2 1
  
  %if 0%{?over_tizen_2_2}
@@@ -50,9 -50,11 +50,13 @@@ BuildRequires:  pkgconfig(libpng
  BuildRequires:  pkgconfig(opengl-es-20)
  BuildRequires:  pkgconfig(efl-assist)
  BuildRequires:  libcurl-devel
 +BuildRequires:  pkgconfig(harfbuzz)
 +BuildRequires:  fribidi-devel
  
+ %if 0%{?over_tizen_2_2}
+ BuildRequires:  pkgconfig(capi-system-info)
+ %endif
+ 
  %if 0%{?dali_assimp_plugin}
  BuildRequires:  pkgconfig(assimp)
  %endif
@@@ -156,6 -158,9 +160,9 @@@ FONT_CONFIGURATION_FILE="%{font_configu
  %if 0%{?dali_assimp_plugin}
             --enable-assimp \
  %endif
+ %if 0%{?over_tizen_2_2}
+            --with-over-tizen_2_2 \
+ %endif
             --libdir=%{_libdir}
  
  make %{?jobs:-j%jobs}

diff --combined packaging/dali-adaptor-tv.spec
index 40e73ec,13bd8ce..d07469a
--- 1/packaging/dali-adaptor-tv.spec
--- 2/packaging/dali-adaptor-tv.spec
+++ b/packaging/dali-adaptor-tv.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:       dali-adaptor
  Summary:    The DALi Tizen Adaptor
- Version:    1.0.33
+ Version:    1.0.34
  Release:    1
  Group:      System/Libraries
  License:    Apache-2.0
@@@ -42,8 -42,6 +42,8 @@@ BuildRequires:  pkgconfig(xdamage
  BuildRequires:  pkgconfig(utilX)
  BuildRequires:  pkgconfig(gles20)
  BuildRequires:  libcurl-devel
 +BuildRequires:  pkgconfig(harfbuzz)
 +BuildRequires:  fribidi-devel
  
  %if 0%{?dali_assimp_plugin}
  BuildRequires:  pkgconfig(assimp)

diff --combined packaging/dali-adaptor-wearable.spec
index 792e8bd,c5bae78..cfcbd1d
--- 1/packaging/dali-adaptor-wearable.spec
--- 2/packaging/dali-adaptor-wearable.spec
+++ b/packaging/dali-adaptor-wearable.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:       dali-adaptor
  Summary:    The DALi Tizen Adaptor
- Version:    1.0.33
+ Version:    1.0.34
  Release:    1
  Group:      System/Libraries
  License:    Apache-2.0
@@@ -44,8 -44,6 +44,8 @@@ BuildRequires:  pkgconfig(libpng
  BuildRequires:  pkgconfig(gles20)
  BuildRequires:  pkgconfig(efl-assist)
  BuildRequires:  libcurl-devel
 +BuildRequires:  pkgconfig(harfbuzz)
 +BuildRequires:  fribidi-devel
  
  %if 0%{?dali_assimp_plugin}
  BuildRequires:  pkgconfig(assimp)

diff --combined packaging/dali-adaptor.spec
index 62906a2,e395efa..b530b6a
--- 1/packaging/dali-adaptor.spec
--- 2/packaging/dali-adaptor.spec
+++ b/packaging/dali-adaptor.spec
@@@ -2,7 -2,7 +2,7 @@@
  
  Name:       dali-adaptor
  Summary:    The DALi Tizen Adaptor
- Version:    1.0.33
+ Version:    1.0.34
  Release:    1
  Group:      System/Libraries
  License:    Apache-2.0
@@@ -75,6 -75,11 +75,11 @@@ BuildRequires:  pkgconfig(glesv2
  BuildRequires:  pkgconfig(egl)
  BuildRequires:  libcurl-devel
  
+ 
+ %if 0%{?over_tizen_2_2}
+ BuildRequires:  pkgconfig(capi-system-info)
+ %endif
+ 
  %if %{with wayland}
  BuildRequires:  pkgconfig(ecore-wayland)
  BuildRequires:  pkgconfig(wayland-egl)
@@@ -86,9 -91,6 +91,9 @@@ BuildRequires:  pkgconfig(xdamage
  BuildRequires:  pkgconfig(utilX)
  %endif
  
 +BuildRequires:  pkgconfig(harfbuzz)
 +BuildRequires:  fribidi-devel
 +
  %if 0%{?dali_assimp_plugin}
  BuildRequires:  pkgconfig(assimp)
  %endif
@@@ -192,6 -194,9 +197,9 @@@ cd %{_builddir}/%{name}-%{version}/buil
  %if 0%{?dali_assimp_plugin}
             --enable-assimp \
  %endif
+ %if 0%{?over_tizen_2_2}
+            --with-over-tizen_2_2 \
+ %endif
             $configure_flags --libdir=%{_libdir}
  
  make %{?jobs:-j%jobs}