Support dual ABI

Change-Id: If0ffebb755fcbf8a4014c13cc2bdf0f302203704

diff --git a/adaptors/common/feedback/feedback-plugin-proxy.cpp b/adaptors/common/feedback/feedback-plugin-proxy.cpp
index 2777e21..6179d0e 100644 (file)
--- a/adaptors/common/feedback/feedback-plugin-proxy.cpp
+++ b/adaptors/common/feedback/feedback-plugin-proxy.cpp
@@ -31,7 +31,11 @@ namespace Internal
 namespace Adaptor
 {
 
+#if _GLIBCXX_USE_CXX11_ABI
 const char * const FeedbackPluginProxy::DEFAULT_OBJECT_NAME( "libdali-feedback-plugin.so" );
+#else
+const char * const FeedbackPluginProxy::DEFAULT_OBJECT_NAME( "libdali-feedback-plugin-cxx03.so" );
+#endif
 
 FeedbackPluginProxy::FeedbackPluginProxy( const std::string& sharedObjectName )
 : mInitializeAttempted( false ),

diff --git a/adaptors/common/key-impl.cpp b/adaptors/common/key-impl.cpp
index d50b52e..12a3538 100644 (file)
--- a/adaptors/common/key-impl.cpp
+++ b/adaptors/common/key-impl.cpp
@@ -45,7 +45,11 @@ Debug::Filter* gKeyExtensionLogFilter = Debug::Filter::New(Debug::NoLogging, fal
 #endif
 
 // Path for loading extension keys
+#if _GLIBCXX_USE_CXX11_ABI
 const char* KEY_EXTENSION_PLUGIN_SO( "libdali-key-extension.so" );
+#else
+const char* KEY_EXTENSION_PLUGIN_SO( "libdali-key-extension-cxx03.so" );
+#endif
 
 class KeyMap
 {

diff --git a/adaptors/common/video-player-impl.cpp b/adaptors/common/video-player-impl.cpp
index 2585b17..feab793 100644 (file)
--- a/adaptors/common/video-player-impl.cpp
+++ b/adaptors/common/video-player-impl.cpp
@@ -38,7 +38,12 @@ namespace Adaptor
 
 namespace // unnamed namespace
 {
+
+#if _GLIBCXX_USE_CXX11_ABI
 const char* VIDEO_PLUGIN_SO( "libdali-video-player-plugin.so" );
+#else
+const char* VIDEO_PLUGIN_SO( "libdali-video-player-plugin-cxx03.so" );
+#endif
 
 Dali::BaseHandle Create()
 {

diff --git a/build/tizen/Makefile.am b/build/tizen/Makefile.am
index 3210dfa..108ccb2 100644 (file)
--- a/build/tizen/Makefile.am
+++ b/build/tizen/Makefile.am
@@ -42,8 +42,8 @@ rename_cov_data:
        @test -z $(COVERAGE_DIR) || mkdir -p $(COVERAGE_DIR)
        @rm -f $(COVERAGE_DIR)/*
        @-cp adaptor/.libs/*.gcda adaptor/.libs/*.gcno  $(COVERAGE_DIR)
-       @for i in `find $(COVERAGE_DIR) -name "libdali_adaptor_la-*.gcda" -o -name "libdali_adaptor_la-*.gcno"` ;\
-               do mv $$i `echo $$i | sed s/libdali_adaptor_la-//` ; echo $$i ; done
+       @for i in `find $(COVERAGE_DIR) -name "libdali_adaptor*_la-*.gcda" -o -name "libdali_adaptor*_la-*.gcno"` ;\
+               do mv $$i `echo $$i | sed s/libdali_adaptor*_la-//` ; echo $$i ; done
 
 cov_data: rename_cov_data
        @cd $(COVERAGE_DIR) ; lcov $(LCOV_OPTS) --base-directory . --directory . -c -o dali.info

diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am
index 4226361..f1bfe8c 100644 (file)
--- a/build/tizen/adaptor/Makefile.am
+++ b/build/tizen/adaptor/Makefile.am
@@ -266,11 +266,14 @@ DALI_ADAPTOR_CFLAGS += -DENABLE_VECTOR_BASED_TEXT_RENDERING
 endif
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = dali-adaptor.pc dali-adaptor-integration.pc
 
-lib_LTLIBRARIES = libdali-adaptor.la
+if ENABLE_CXX03_ABI
+pkgconfig_DATA = dali-adaptor-cxx03.pc dali-adaptor-integration-cxx03.pc
+else
+pkgconfig_DATA = dali-adaptor.pc dali-adaptor-integration.pc
+endif
 
-libdali_adaptor_la_SOURCES = \
+LIBDALI_ADAPTOR_LA_SOURCES = \
                      $(base_adaptor_src_files) \
                      $(main_loop_integration_src_files) \
                      $(tizen_platform_abstraction_src_files) \
@@ -283,14 +286,14 @@ libdali_adaptor_la_SOURCES = \
 
 
 if ENABLE_NETWORK_LOGGING
-libdali_adaptor_la_SOURCES += \
+LIBDALI_ADAPTOR_LA_SOURCES += \
   $(base_adaptor_networking_src_files)
 endif
 
 libdali_adaptor_la_DEPENDENCIES =
 
 # List include directories with more platform-specific (tizen) before portable root:
-libdali_adaptor_la_includes = \
+LIBDALI_ADAPTOR_LA_includes = \
                       -I../../.. \
                       -I../../../platform-abstractions/tizen \
                       -I../../../platform-abstractions/tizen/resource-loader \
@@ -308,39 +311,39 @@ libdali_adaptor_la_includes = \
                       -I../../../third-party/image-resampler
 
 if WAYLAND
-libdali_adaptor_la_includes += -I../../../adaptors/integration-api/wayland
+LIBDALI_ADAPTOR_LA_includes += -I../../../adaptors/integration-api/wayland
 
 if USE_ECORE_WAYLAND
-libdali_adaptor_la_includes += \
+LIBDALI_ADAPTOR_LA_includes += \
                       -I../../../adaptors/ecore/common \
                       -I../../../adaptors/ecore/wayland
 else
-libdali_adaptor_la_includes += -I../../../adaptors/wayland \
+LIBDALI_ADAPTOR_LA_includes += -I../../../adaptors/wayland \
                                -I../../../adaptors/wayland/input/text/imf \
                                -I../../../adaptors/wayland/clipboard
 endif # USE_ECORE_WAYLADN
 
-libdali_adaptor_la_includes += \
+LIBDALI_ADAPTOR_LA_includes += \
                       -I../../../adaptors/tizen
 else
-libdali_adaptor_la_includes += \
+LIBDALI_ADAPTOR_LA_includes += \
                       -I../../../adaptors/ecore/common \
                       -I../../../adaptors/x11 \
                       -I../../../adaptors/integration-api/x11
 endif # WAYLAND
 
 if UBUNTU_PROFILE
-libdali_adaptor_la_includes += \
+LIBDALI_ADAPTOR_LA_includes += \
                       -I../../../adaptors/ubuntu
 else
-libdali_adaptor_la_includes += \
+LIBDALI_ADAPTOR_LA_includes += \
                       -I../../../adaptors/tizen
 endif
 
 daliDefaultThemeDir  = ${dataReadWriteDir}/theme/
 daliShaderbinCacheDir = ${dataReadOnlyDir}/core/shaderbin/
 
-libdali_adaptor_la_CXXFLAGS = \
+LIBDALI_ADAPTOR_LA_CXXFLAGS = \
                       -DDALI_DATA_RW_DIR="\"${daliReadWriteDir}\"" \
                       -DDALI_DATA_RO_DIR="\"${daliReadOnlyDir}\"" \
                       -DDALI_DEFAULT_FONT_CACHE_DIR="\"${daliDefaultFontCacheDir}\"" \
@@ -355,7 +358,7 @@ libdali_adaptor_la_CXXFLAGS = \
                       -DNON_POWER_OF_TWO_TEXTURES \
                       -DDALI_COMPILATION -DDALI_ADAPTOR_COMPILATION \
                       -Werror -Wall -lgcc -Wold-style-cast\
-                      $(libdali_adaptor_la_includes) \
+                      $(LIBDALI_ADAPTOR_LA_includes) \
                       $(DALI_ADAPTOR_CFLAGS) \
                       $(DALICORE_CFLAGS) \
                       $(OPENGLES20_CFLAGS) \
@@ -376,15 +379,15 @@ libdali_adaptor_la_CXXFLAGS = \
 
 # Todo, as soon as common repos are updated on build server remove this.
 if !COMMON_PROFILE
-libdali_adaptor_la_CXXFLAGS += -DWAYLAND_EXTENSIONS_SUPPORTED
+LIBDALI_ADAPTOR_LA_CXXFLAGS += -DWAYLAND_EXTENSIONS_SUPPORTED
 endif
 
-libdali_adaptor_la_CFLAGS = \
+LIBDALI_ADAPTOR_LA_CFLAGS = \
                       -Werror -Wall \
                       -DDALI_COMPILATION -DDALI_ADAPTOR_COMPILATION \
                       $(DALI_ADAPTOR_CFLAGS)
 
-libdali_adaptor_la_LIBADD = \
+LIBDALI_ADAPTOR_LA_LIBADD = \
                       $(DALICORE_LIBS) \
                       $(OPENGLES20_LIBS) \
                       $(FREETYPE_LIBS) \
@@ -407,110 +410,110 @@ libdali_adaptor_la_LIBADD = \
                       -ljpeg
 
 # EVAS used indicator
-libdali_adaptor_la_CXXFLAGS += $(EVAS_CFLAGS) \
+LIBDALI_ADAPTOR_LA_CXXFLAGS += $(EVAS_CFLAGS) \
                                $(ECORE_CFLAGS) \
                                $(ECORE_IPC_CFLAGS) \
                                $(ELDBUS_CFLAGS)
 
 
-libdali_adaptor_la_LIBADD += $(ECORE_IPC_LIBS) \
+LIBDALI_ADAPTOR_LA_LIBADD += $(ECORE_IPC_LIBS) \
                              $(ELDBUS_LIBS)
 
 if USE_APPFW
 
-libdali_adaptor_la_CXXFLAGS += $(CAPI_APPFW_APPLICATION_CFLAGS) \
+LIBDALI_ADAPTOR_LA_CXXFLAGS += $(CAPI_APPFW_APPLICATION_CFLAGS) \
                                $(CAPI_SYSTEM_SYSTEM_SETTINGS_CFLAGS) \
                                $(CAPI_SYSTEM_INFO_CFLAGS) \
                                $(TTS_CFLAGS) \
                                $(SENSOR_CFLAGS)
 
-libdali_adaptor_la_LIBADD += $(CAPI_APPFW_APPLICATION_LIBS) \
+LIBDALI_ADAPTOR_LA_LIBADD += $(CAPI_APPFW_APPLICATION_LIBS) \
                              $(CAPI_SYSTEM_SYSTEM_SETTINGS_LIBS) \
                              $(CAPI_SYSTEM_INFO_LIBS) \
                              $(TTS_LIBS) \
                              $(SENSOR_LIBS)
 if USE_APPFW_EFL_BASE
-libdali_adaptor_la_CXXFLAGS += $(ELEMENTARY_CFLAGS)
+LIBDALI_ADAPTOR_LA_CXXFLAGS += $(ELEMENTARY_CFLAGS)
 
-libdali_adaptor_la_LIBADD += $(ELEMENTARY_LIBS)
+LIBDALI_ADAPTOR_LA_LIBADD += $(ELEMENTARY_LIBS)
 
 else
-libdali_adaptor_la_CXXFLAGS += $(CAPI_APPFW_COMMON_CFLAGS) \
+LIBDALI_ADAPTOR_LA_CXXFLAGS += $(CAPI_APPFW_COMMON_CFLAGS) \
                                $(CAPI_APPFW_CONTROL_CFLAGS) \
                                $(ECORE_IMF_CFLAGS) \
                                $(FRIBIDI_CFLAGS)
 
-libdali_adaptor_la_LIBADD += $(CAPI_APPFW_COMMON_LIBS) \
+LIBDALI_ADAPTOR_LA_LIBADD += $(CAPI_APPFW_COMMON_LIBS) \
                              $(CAPI_APPFW_CONTROL_LIBS) \
                              $(ECORE_IMF_LIBS) \
                              $(FRIBIDI_LIBS)
 endif
 else
-libdali_adaptor_la_CXXFLAGS += $(ELEMENTARY_CFLAGS)
+LIBDALI_ADAPTOR_LA_CXXFLAGS += $(ELEMENTARY_CFLAGS)
 
-libdali_adaptor_la_LIBADD += $(ELEMENTARY_LIBS)
+LIBDALI_ADAPTOR_LA_LIBADD += $(ELEMENTARY_LIBS)
 endif
 
 if WAYLAND
 # This is to avoid having to include wayland-egl.h everywhere
-libdali_adaptor_la_CXXFLAGS += -DWL_EGL_PLATFORM
-libdali_adaptor_la_CXXFLAGS += $(WAYLAND_CFLAGS)
-libdali_adaptor_la_LIBADD += $(WAYLAND_LIBS)
+LIBDALI_ADAPTOR_LA_CXXFLAGS += -DWL_EGL_PLATFORM
+LIBDALI_ADAPTOR_LA_CXXFLAGS += $(WAYLAND_CFLAGS)
+LIBDALI_ADAPTOR_LA_LIBADD += $(WAYLAND_LIBS)
 else
-libdali_adaptor_la_CXXFLAGS += $(X11_CFLAGS)
-libdali_adaptor_la_LIBADD += $(X11_LIBS)
-libdali_adaptor_la_LIBADD += $(ECORE_X_LIBS)
+LIBDALI_ADAPTOR_LA_CXXFLAGS += $(X11_CFLAGS)
+LIBDALI_ADAPTOR_LA_LIBADD += $(X11_LIBS)
+LIBDALI_ADAPTOR_LA_LIBADD += $(ECORE_X_LIBS)
 endif
 
 if COMMON_PROFILE
-libdali_adaptor_la_CXXFLAGS += $(HAPTIC_CFLAGS)
+LIBDALI_ADAPTOR_LA_CXXFLAGS += $(HAPTIC_CFLAGS)
 endif
 
 if MOBILE_PROFILE
-libdali_adaptor_la_CXXFLAGS += \
+LIBDALI_ADAPTOR_LA_CXXFLAGS += \
                       $(DEVICED_CFLAGS) \
                       $(EFL_ASSIST_CFLAGS) \
                       $(NATIVE_BUFFER_CFLAGS) \
                       $(NATIVE_BUFFER_POOL_CFLAGS)
 
-libdali_adaptor_la_LIBADD += \
+LIBDALI_ADAPTOR_LA_LIBADD += \
                       $(EFL_ASSIST_LIBS) \
                       $(NATIVE_BUFFER_LIBS) \
                       $(NATIVE_BUFFER_POOL_LIBS)
 endif
 
 if WEARABLE_PROFILE
-libdali_adaptor_la_CXXFLAGS += \
+LIBDALI_ADAPTOR_LA_CXXFLAGS += \
                       $(HAPTIC_CFLAGS) \
                       $(EFL_ASSIST_CFLAGS) \
                       $(SCREENCONNECTORPROVIDER_CFLAGS) \
                       $(APPCORE_WATCH_CFLAGS)
 
-libdali_adaptor_la_LIBADD += \
+LIBDALI_ADAPTOR_LA_LIBADD += \
                       $(SCREENCONNECTORPROVIDER_LIBS) \
                       $(APPCORE_WATCH_LIBS)
 endif
 
 if TV_PROFILE
-libdali_adaptor_la_CXXFLAGS += $(HAPTIC_CFLAGS)
-libdali_adaptor_la_LIBADD +=
+LIBDALI_ADAPTOR_LA_CXXFLAGS += $(HAPTIC_CFLAGS)
+LIBDALI_ADAPTOR_LA_LIBADD +=
 endif
 
 if IVI_PROFILE
-libdali_adaptor_la_CXXFLAGS += \
+LIBDALI_ADAPTOR_LA_CXXFLAGS += \
                       $(DEVICED_CFLAGS) \
                       $(EFL_ASSIST_CFLAGS) \
                       $(NATIVE_BUFFER_CFLAGS) \
                       $(NATIVE_BUFFER_POOL_CFLAGS)
 
-libdali_adaptor_la_LIBADD += \
+LIBDALI_ADAPTOR_LA_LIBADD += \
                       $(EFL_ASSIST_LIBS) \
                       $(NATIVE_BUFFER_LIBS) \
                       $(NATIVE_BUFFER_POOL_LIBS)
 endif
 
 if UBUNTU_PROFILE
-libdali_adaptor_la_LIBADD += -ljpeg
+LIBDALI_ADAPTOR_LA_LIBADD += -ljpeg
 CFLAGS += -fPIC
 endif
 
@@ -567,6 +570,30 @@ bin_SCRIPTS = ../../../adaptors/scripts/dalireslog.sh
 packagedoxydir = $(devincludepath)/dali/doc
 packagedoxy_HEADERS = $(package_doxy_files)
 
+
+
+if ENABLE_CXX03_ABI
+
+lib_LTLIBRARIES = libdali-adaptor.la
+
+libdali_adaptor_la_SOURCES = $(LIBDALI_ADAPTOR_LA_SOURCES)
+libdali_adaptor_la_includes = $(LIBDALI_ADAPTOR_LA_INCLUDES)
+libdali_adaptor_la_CFLAGS = $(LIBDALI_ADAPTOR_LA_CFLAGS)
+libdali_adaptor_la_CXXFLAGS = $(LIBDALI_ADAPTOR_LA_CXXFLAGS)
+libdali_adaptor_la_LIBADD = $(LIBDALI_ADAPTOR_LA_LIBADD)
+
+else
+
+lib_LTLIBRARIES = libdali-adaptor-cxx11.la
+
+libdali_adaptor_cxx11_la_SOURCES = $(LIBDALI_ADAPTOR_LA_SOURCES)
+libdali_adaptor_cxx11_la_includes = $(LIBDALI_ADAPTOR_LA_INCLUDES)
+libdali_adaptor_cxx11_la_CFLAGS = $(LIBDALI_ADAPTOR_LA_CFLAGS)
+libdali_adaptor_cxx11_la_CXXFLAGS = $(LIBDALI_ADAPTOR_LA_CXXFLAGS)
+libdali_adaptor_cxx11_la_LIBADD = $(LIBDALI_ADAPTOR_LA_LIBADD)
+
+endif
+
 # linking test
 noinst_PROGRAMS = linker.test
 
@@ -595,11 +622,36 @@ linker_test_CXXFLAGS += \
   -I../../../adaptors/integration-api/x11
 endif
 
-
-linker_test_DEPENDENCIES = libdali-adaptor.la
 linker_test_LDADD = \
   $(DALICORE_LIBS) \
   $(VCONF_LIBS) \
-  libdali-adaptor.la \
   $(HARFBUZZ_LIBS) \
   -L${prefix}/lib
+
+if ENABLE_CXX03_ABI
+
+linker_test_LDADD += libdali-adaptor.la
+linker_test_DEPENDENCIES = libdali-adaptor.la
+
+if ENABLE_RENAME_SO
+#rename
+install: install-am
+       rm -rf $(libdir)/libdali-adaptor.so
+       rm -rf $(libdir)/libdali-adaptor-cxx03.so
+       ln -s $(libdir)/libdali-adaptor.so.0.0.* $(libdir)/libdali-adaptor-cxx03.so
+endif
+
+else
+
+linker_test_LDADD += libdali-adaptor-cxx11.la
+linker_test_DEPENDENCIES = libdali-adaptor-cxx11.la
+
+if ENABLE_RENAME_SO
+#rename
+install: install-am
+       rm -rf $(libdir)/libdali-adaptor-cxx11.so
+       rm -rf $(libdir)/libdali-adaptor.so
+       ln -s $(libdir)/libdali-adaptor-cxx11.so.0.0.* $(libdir)/libdali-adaptor.so
+endif
+
+endif

diff --git a/build/tizen/adaptor/configure.ac b/build/tizen/adaptor/configure.ac
index 2e5000c..2bd1a7c 100644 (file)
--- a/build/tizen/adaptor/configure.ac
+++ b/build/tizen/adaptor/configure.ac
@@ -35,7 +35,6 @@ FREETYPE_REQUIRED=9.16.3
 # 17.1.11 = Freetype version 2.5.2
 FREETYPE_BITMAP_SUPPORT_VERSION=17.1.11
 
-PKG_CHECK_MODULES(DALICORE, dali-core)
 PKG_CHECK_MODULES(EXIF, libexif)
 PKG_CHECK_MODULES(FREETYPE, [freetype2 >= $FREETYPE_REQUIRED])
 PKG_CHECK_MODULES(FREETYPE_BITMAP_SUPPORT, [freetype2 >= $FREETYPE_BITMAP_SUPPORT_VERSION], [ freetype_bitmap_support=yes  ], [ freetype_bitmap_support=no ] )
@@ -67,7 +66,11 @@ fi
 AC_SUBST(DALI_ELDBUS_AVAILABLE)
 
 
+if test "x$enable_cxx03_abi" = "xyes"; then
+PKG_CHECK_MODULES(TPKP_CURL, tpkp-curl-deprecated, [ tpkp_curl_available=yes ], [ tpkp_curl_available=no ] )
+else
 PKG_CHECK_MODULES(TPKP_CURL, tpkp-curl, [ tpkp_curl_available=yes ], [ tpkp_curl_available=no ] )
+fi
 
 if test "x$tpkp_curl_available" = "xyes"; then
   DALI_ADAPTOR_CFLAGS="$DALI_ADAPTOR_CFLAGS -DTPK_CURL_ENABLED "
@@ -171,6 +174,18 @@ AC_ARG_ENABLE(wayland,
               enable_wayland=yes,
               enable_wayland=no)
 
+AC_ARG_ENABLE([cxx03_abi],
+              [AC_HELP_STRING([--enable-cxx03-abi],
+                              [Specify abi for the build])],
+              [enable_cxx03_abi=$enableval],
+              [enable_cxx03_abi=no])
+
+AC_ARG_ENABLE([rename_so],
+              [AC_HELP_STRING([--enable-rename-so],
+                              [Specify whether so file is renamed or not])],
+              [enable_rename_so=$enableval],
+              [enable_rename_so=yes])
+
 DALI_ADAPTOR_CFLAGS="$DALI_ADAPTOR_CFLAGS -DDALI_PROFILE_${enable_profile}"
 DALI_PROFILE_CFLAGS=" -DDALI_PROFILE_${enable_profile}"
 AM_CONDITIONAL([COMMON_PROFILE], [test x$enable_profile = xCOMMON])
@@ -182,6 +197,8 @@ AM_CONDITIONAL([UBUNTU_PROFILE], [test x$enable_profile = xUBUNTU])
 AM_CONDITIONAL([WAYLAND], [test x$enable_wayland = xyes])
 AM_CONDITIONAL([USE_APPFW], [test x$enable_appfw = xyes])
 AM_CONDITIONAL([USE_APPFW_EFL_BASE], [test x$enable_tizen_major_version = x3])
+AM_CONDITIONAL([ENABLE_CXX03_ABI], [test x$enable_cxx03_abi = xyes])
+AM_CONDITIONAL([ENABLE_RENAME_SO], [test x$enable_rename_so = xyes])
 
 # Platforms with highp shader support can use vector based text
 AM_CONDITIONAL([ENABLE_VECTOR_BASED_TEXT_RENDERING], [test x$enable_profile = xUBUNTU])
@@ -205,6 +222,12 @@ if test "x$enable_profile" = "xLITE"; then
 PKG_CHECK_MODULES(OPENGLES20, gles20)
 fi
 
+if test "x$enable_cxx03_abi" = "xyes"; then
+PKG_CHECK_MODULES(DALICORE, dali-core-cxx03)
+else
+PKG_CHECK_MODULES(DALICORE, dali-core)
+fi
+
 if test "x$enable_profile" = "xWEARABLE"; then
 PKG_CHECK_MODULES(OPENGLES20, glesv2)
 PKG_CHECK_MODULES(SCREENCONNECTORPROVIDER, screen_connector_provider)
@@ -228,6 +251,10 @@ if test "x$enable_profile" = "xUBUNTU"; then
 PKG_CHECK_MODULES(OPENGLES20, glesv2 egl)
 else
 
+if test "x$enable_cxx03_abi" = "xyes"; then
+ DALI_ADAPTOR_CFLAGS="$DALI_ADAPTOR_CFLAGS -D_GLIBCXX_USE_CXX11_ABI=0"
+fi
+
 PKG_CHECK_MODULES(DLOG, dlog)
 PKG_CHECK_MODULES(TTS, tts)
 PKG_CHECK_MODULES(VCONF, vconf)
@@ -316,11 +343,13 @@ AC_SUBST(tizenPlatformConfigSupported)
 devincludepath=${includedir}
 AC_SUBST(devincludepath)
 
-AC_CONFIG_FILES([
- Makefile
- dali-adaptor.pc
- dali-adaptor-integration.pc
-])
+AC_CONFIG_FILES([Makefile])
+
+if test "x$enable_cxx03_abi" = "xyes"; then
+AC_CONFIG_FILES([dali-adaptor-cxx03.pc dali-adaptor-integration-cxx03.pc])
+else
+AC_CONFIG_FILES([dali-adaptor.pc dali-adaptor-integration.pc])
+fi
 
 if test "x$freetype_bitmap_support" = "xyes"; then
 DALI_ADAPTOR_CFLAGS="$DALI_ADAPTOR_CFLAGS -DFREETYPE_BITMAP_SUPPORT"

diff --git a/build/tizen/adaptor/dali-adaptor-cxx03.pc.in b/build/tizen/adaptor/dali-adaptor-cxx03.pc.in
new file mode 100644 (file)
index 0000000..edf75d5
--- /dev/null
+++ b/build/tizen/adaptor/dali-adaptor-cxx03.pc.in
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+apiversion=@DALI_ADAPTOR_VERSION@
+libdir=@libdir@
+includedir=@devincludepath@
+
+Name: dali-adaptor-cxx03
+Description: DALi adaptor using ecore
+Version: ${apiversion}
+Requires: dali-core-cxx03
+Libs: -L${libdir} -ldali-adaptor-cxx03
+Cflags: -I${includedir}/dali

diff --git a/build/tizen/adaptor/dali-adaptor-integration-cxx03.pc.in b/build/tizen/adaptor/dali-adaptor-integration-cxx03.pc.in
new file mode 100644 (file)
index 0000000..db22442
--- /dev/null
+++ b/build/tizen/adaptor/dali-adaptor-integration-cxx03.pc.in
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+apiversion=@DALI_ADAPTOR_VERSION@
+libdir=@libdir@
+includedir=@devincludepath@
+
+Name: dali-adaptor-integration-cxx03
+Description: Integration APIs for dali-adaptor
+Version: ${apiversion}
+Requires: dali-adaptor-cxx03
+Libs: -L${libdir}
+Cflags: -I${includedir}/dali/public-api/adaptor-framework/ -I${includedir}/dali/devel-api/adaptor-framework/ -I${includedir}/dali/integration-api/adaptors/

diff --git a/build/tizen/plugins/Makefile.am b/build/tizen/plugins/Makefile.am
index 5944acd..7e690be 100644 (file)
--- a/build/tizen/plugins/Makefile.am
+++ b/build/tizen/plugins/Makefile.am
@@ -25,6 +25,8 @@ plugin_sounds_dir = ../../../plugins/sounds
 
 lib_LTLIBRARIES =
 
+if ENABLE_CXX03_ABI
+
 if USE_FEEDBACK
 lib_LTLIBRARIES += libdali-feedback-plugin.la
 endif
@@ -35,17 +37,32 @@ lib_LTLIBRARIES += libdali-video-player-plugin.la
 endif
 endif
 
+else
+
+if USE_FEEDBACK
+lib_LTLIBRARIES += libdali-feedback-plugin-cxx11.la
+endif
+
+if WAYLAND
+
+if USE_VIDEOPLAYER
+lib_LTLIBRARIES += libdali-video-player-plugin-cxx11.la
+endif
+endif
+endif
+
 if USE_FEEDBACK
 dalisounddir = ${dataReadOnlyDir}/plugins/sounds/
 dalisound_DATA = ${dali_plugin_sound_files}
 
 # Feedback
-libdali_feedback_plugin_la_SOURCES = \
+LIBDALI_FEEDBACK_PLUGIN_LA_SOURCES = \
                      $(feedback_plugin_src_files)
 
+
 libdali_feedback_plugin_la_DEPENDENCIES =
 
-libdali_feedback_plugin_la_CXXFLAGS = -DDALI_COMPILATION \
+LIBDALI_FEEDBACK_PLUGIN_LA_CXXFLAGS = -DDALI_COMPILATION \
                       -DDALI_SOUND_DIR="\"${dalisounddir}\"" \
                       $(DLOG_CFLAGS) \
                       $(DALICORE_CFLAGS) \
@@ -59,14 +76,14 @@ libdali_feedback_plugin_la_CXXFLAGS = -DDALI_COMPILATION \
                       -I../../../adaptors/devel-api/adaptor-framework \
                       -Werror -Wall
 
-libdali_feedback_plugin_la_LIBADD = \
+LIBDALI_FEEDBACK_PLUGIN_LA_LIBADD = \
                       $(DLOG_LIBS) \
                       $(MMFSOUND_LIBS)
 
-libdali_feedback_plugin_la_LDFLAGS = \
+LIBDALI_FEEDBACK_PLUGIN_LA_LDFLAGS = \
                       -rdynamic
 
-libdali_feedback_plugin_la_LIBADD += \
+LIBDALI_FEEDBACK_PLUGIN_LA_LIBADD += \
                       $(FEEDBACK_LIBS)
 
 endif
@@ -75,12 +92,12 @@ endif
 if WAYLAND
 if USE_VIDEOPLAYER
 
-libdali_video_player_plugin_la_SOURCES = \
+LIBDALI_VIDEO_PLAYER_PLUGIN_LA_SOURCES = \
                      $(video_player_plugin_src_files)
 
-libdali_video_player_plugin_la_DEPENDENCIES =
+libdali_video_player_plugin_la__DEPENDENCIES =
 
-libdali_video_player_plugin_la_CXXFLAGS = -DDALI_COMPILATION \
+LIBDALI_VIDEO_PLAYER_PLUGIN_LA_CXXFLAGS = -DDALI_COMPILATION \
                       -DDALI_ADAPTOR_COMPILATION \
                       $(DLOG_CFLAGS) \
                       $(DALICORE_CFLAGS) \
@@ -96,13 +113,83 @@ libdali_video_player_plugin_la_CXXFLAGS = -DDALI_COMPILATION \
                       -I../../../plugins/video-player \
                       -Werror -Wall
 
-libdali_video_player_plugin_la_LIBADD = \
+LIBDALI_VIDEO_PLAYER_PLUGIN_LA_LIBADD = \
                       $(DLOG_LIBS) \
                       $(ECORE_WAYLAND_LIBS) \
                       $(CAPI_MEDIA_PLAYER_LIBS)
 
-libdali_video_player_plugin_la_LDFLAGS = \
+LIBDALI_VIDEO_PLAYER_PLUGIN_LA_LDFLAGS = \
                       -rdynamic
 
 endif # USE_VIDEOPLAYER
 endif # WAYLAND
+
+if ENABLE_CXX03_ABI
+
+if USE_FEEDBACK
+libdali_feedback_plugin_la_SOURCES = $(LIBDALI_FEEDBACK_PLUGIN_LA_SOURCES)
+libdali_feedback_plugin_la_LIBADD = $(LIBDALI_FEEDBACK_PLUGIN_LA_LIBADD)
+libdali_feedback_plugin_la_CXXFLAGS = $(LIBDALI_FEEDBACK_PLUGIN_LA_CXXFLAGS)
+libdali_feedback_plugin_la_LDFLAGS = $(LIBDALI_FEEDBACK_PLUGIN_LA_LDFLAGS)
+
+if ENABLE_RENAME_SO
+#rename
+install: install-am
+       rm -rf $(libdir)/libdali_feedback_plugin.so
+       rm -rf $(libdir)/libdali_feedback_plugin-cxx03.so
+       ln -s $(libdir)/libdali_feedback_plugin.so.0.0.* $(libdir)/libdali_feedback_plugin-cxx03.so
+endif
+endif
+
+if WAYLAND
+if USE_VIDEOPLAYER
+libdali_video_player_plugin_la_SOURCES = $(LIBDALI_VIDEO_PLAYER_PLUGIN_LA_SOURCES)
+libdali_video_player_plugin_la_CXXFLAGS = $(LIBDALI_VIDEO_PLAYER_PLUGIN_LA_CXXFLAGS)
+libdali_video_player_plygin_la_LIBADD = $(LIBDALI_VIDEO_PLAYER_PLUGIN_LA_LIBADD)
+libdali_video_player_plugin_la_LDFLAGS = $(LIBDALI_VIDEO_PLAYER_PLUGIN_LA_LDFLAGS)
+
+if ENABLE_RENAME_SO
+#rename
+install: install-am
+       rm -rf $(libdir)/libdali_video_player_plugin.so
+       rm -rf $(libdir)/libdali_video_player_plugin-cxx03.so
+       ln -s $(libdir)/libdali_video_player_plugin.so.0.0.* $(libdir)/libdali_video_player_plugin-cxx03.so
+endif
+endif
+endif
+
+else # CXX03
+
+if USE_FEEDBACK
+libdali_feedback_plugin_cxx11_la_SOURCES = $(LIBDALI_FEEDBACK_PLUGIN_LA_SOURCES)
+libdali_feedback_plugin_cxx11_la_LIBADD = $(LIBDALI_FEEDBACK_PLUGIN_LA_LIBADD)
+libdali_feedback_plugin_cxx11_la_CXXFLAGS = $(LIBDALI_FEEDBACK_PLUGIN_LA_CXXFLAGS)
+libdali_feedback_plugin_cxx11_la_LDFLAGS = $(LIBDALI_FEEDBACK_PLUGIN_LA_LDFLAGS)
+
+if ENABLE_RENAME_SO
+#rename
+install: install-am
+       rm -rf $(libdir)/libdali_feedback_plugin-cxx11.so
+       rm -rf $(libdir)/libdali_feedback_plugin.so
+       ln -s $(libdir)/libdali_feedback_plugin-cxx11.so.0.0.* $(libdir)/libdali_feedback_plugin.so
+endif
+endif
+
+if WAYLAND
+if USE_VIDEOPLAYER
+libdali_video_player_plugin_cxx11_la_SOURCES = $(LIBDALI_VIDEO_PLAYER_PLUGIN_LA_SOURCES)
+libdali_video_player_plugin_cxx11_la_CXXFLAGS = $(LIBDALI_VIDEO_PLAYER_PLUGIN_LA_CXXFLAGS)
+libdali_video_player_plygin_cxx11_la_LIBADD = $(LIBDALI_VIDEO_PLAYER_PLUGIN_LA_LIBADD)
+libdali_video_player_plugin_cxx11_la_LDFLAGS = $(LIBDALI_VIDEO_PLAYER_PLUGIN_LA_LDFLAGS)
+
+if ENABLE_RENAME_SO
+#rename
+install: install-am
+       rm -rf $(libdir)/libdali_video_player_plugin-cxx11.so
+       rm -rf $(libdir)/libdali_video_player_plugin.so
+       ln -s $(libdir)/libdali_video_player_plugin-cxx11.so.0.0.* $(libdir)/libdali_video_player_plugin.so
+endif
+endif
+endif
+
+endif # CXX03

diff --git a/build/tizen/plugins/configure.ac b/build/tizen/plugins/configure.ac
index 3bd8eb9..fc950ba 100644 (file)
--- a/build/tizen/plugins/configure.ac
+++ b/build/tizen/plugins/configure.ac
@@ -25,6 +25,13 @@ AM_CONDITIONAL([WAYLAND], [test x$enable_wayland = xyes])
 AM_CONDITIONAL([USE_FEEDBACK], [test x$enable_feedback = xyes])
 AM_CONDITIONAL([USE_VIDEOPLAYER], [test x$enable_videoplayer = xyes])
 
+AM_CONDITIONAL([ENABLE_CXX03_ABI], [test x$enable_cxx03_abi = xyes])
+AM_CONDITIONAL([ENABLE_RENAME_SO], [test x$enable_rename_so = xyes])
+
+if test "x$enable_cxx03_abi" = "xyes"; then
+ DALI_ADAPTOR_CFLAGS="$DALI_ADAPTOR_CFLAGS -D_GLIBCXX_USE_CXX11_ABI=0"
+fi
+
 if test "x$enable_wayland" = "xyes"; then
 if test "x$enable_videoplayer" = "xyes"; then
 if test "x$enable_profile" != "xUBUNTU"; then

diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec
index a467049..64235fc 100644 (file)
--- a/packaging/dali-adaptor.spec
+++ b/packaging/dali-adaptor.spec
@@ -37,6 +37,10 @@ Requires:       giflib
 BuildRequires:  pkgconfig(libtzplatform-config)
 %endif
 
+%if 0%{?tizen_version_major} < 4
+%define disable_cxx03_build 1
+%endif
+
 # Get the profile from tizen_profile_name if tizen version is 2.x and tizen_profile_name exists.
 
 %if "%{tizen_version_major}" == "2" && 0%{?tizen_profile_name:1}
@@ -54,13 +58,18 @@ BuildRequires:  pkgconfig(screen_connector_provider)
 BuildRequires:  pkgconfig(gles20)
 BuildRequires:  pkgconfig(glesv2)
 
+%if !0%{?disable_cxx03_build}
+BuildRequires:  dali-devel-cxx03
+BuildRequires:  dali-integration-devel-cxx03
+%endif
+BuildRequires:  dali-devel
+BuildRequires:  dali-integration-devel
+
 BuildRequires:  pkgconfig
 BuildRequires:  gawk
 BuildRequires:  giflib-devel
 BuildRequires:  pkgconfig(fontconfig)
 BuildRequires:  libjpeg-turbo-devel
-BuildRequires:  dali-devel
-BuildRequires:  dali-integration-devel
 BuildRequires:  pkgconfig(vconf)
 BuildRequires:  tts-devel
 BuildRequires:  pkgconfig(dlog)
@@ -90,6 +99,9 @@ BuildRequires:  pkgconfig(ecore-wayland)
 BuildRequires:  pkgconfig(libtbm)
 
 # tpkp-curl (certificate pinning for libcurl functions) is only available in Tizen 3.0
+%if !0%{?disable_cxx03_build}
+BuildRequires:  pkgconfig(tpkp-curl-deprecated)
+%endif
 BuildRequires:  pkgconfig(tpkp-curl)
 
 ####### BUILDING FOR X11#######
@@ -134,6 +146,16 @@ Recommends: %{name}-profile_common = %{version}-%{release}
 The DALi Tizen Adaptor provides a Tizen specific implementation of the dali-core
 platform abstraction and application shell
 
+%if !0%{?disable_cxx03_build}
+%package cxx03
+Summary:       The DALi Tizen Adaptor with cxx03 abi
+Provides:      %{name}-cxx03 = %{version}-%{release}
+
+%description cxx03
+The DALi Tizen Adaptor provides a Tizen specific implementation of the dali-core
+platform abstraction and application shell
+%endif
+
 ###########################################
 # Dali adapter for profiles
 ###########################################
@@ -210,6 +232,84 @@ Conflicts:      %{name}-profile_ivi
 The DALi Tizen Adaptor for common.
 %endif
 
+%if !0%{?disable_cxx03_build}
+###########################################
+# Dali adapter for profiles for cxx03 ABI
+###########################################
+
+# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
+# if mobile || "undefined"
+%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "common"
+%package profile_mobile-cxx03
+Summary:       The DALi Tizen Adaptor for mobile with cxx03 abi
+Provides:      %{name}-cxx03-compat = %{version}-%{release}
+Conflicts:     %{name}-profile_tv-cxx03
+Conflicts:     %{name}-profile_wearable-cxx03
+Conflicts:     %{name}-profile_ivi-cxx03
+Conflicts:     %{name}-profile_common-cxx03
+%description profile_mobile-cxx03
+The DALi Tizen Adaptor for mobile.
+%endif
+
+# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
+# if tv ||"undefined"
+%if "%{?profile}" != "wearable" && "%{?profile}" != "common" && "%{?profile}" != "ivi" && "%{?profile}" != "mobile"
+%package profile_tv-cxx03
+Summary:       The DALi Tizen Adaptor for tv with cxx03 abi
+Provides:      %{name}-cxx03-compat = %{version}-%{release}
+Conflicts:     %{name}-profile_mobile-cxx03
+Conflicts:     %{name}-profile_wearable-cxx03
+Conflicts:     %{name}-profile_ivi-cxx03
+Conflicts:     %{name}-profile_common-cxx03
+%description profile_tv-cxx03
+The DALi Tizen Adaptor for tv.
+%endif
+
+# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
+# if wearable || "undefined"
+%if "%{?profile}" != "mobile" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "common"
+%package profile_wearable-cxx03
+Summary:       The DALi Tizen Adaptor for wearable with cxx03 abi
+Provides:      %{name}-cxx03-compat = %{version}-%{release}
+Conflicts:     %{name}-profile_mobile-cxx03
+Conflicts:     %{name}-profile_tv-cxx03
+Conflicts:     %{name}-profile_ivi-cxx03
+Conflicts:     %{name}-profile_common-cxx03
+%description profile_wearable-cxx03
+The DALi Tizen Adaptor for wearable.
+%endif
+
+# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
+# if ivi ||"undefined"
+%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "common" && "%{?profile}" != "mobile"
+%package profile_ivi-cxx03
+Summary:       The DALi Tizen Adaptor for ivi with cxx03 abi
+Provides:      %{name}-cxx03-compat = %{version}-%{release}
+Conflicts:     %{name}-profile_mobile-cxx03
+Conflicts:     %{name}-profile_wearable-cxx03
+Conflicts:     %{name}-profile_tv-cxx03
+Conflicts:     %{name}-profile_common-cxx03
+%description profile_ivi-cxx03
+The DALi Tizen Adaptor for ivi.
+%endif
+
+# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
+# if common ||"undefined"
+%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "mobile"
+# Currently Tizen Common we use does not have wayland extensions like xdg-shell
+%package profile_common-cxx03
+%define tizen_2_2_compatibility 0
+Summary:  The DALi Tizen Adaptor for common with cxx03 abi
+Provides:      %{name}-cxx03-compat = %{version}-%{release}
+Conflicts:     %{name}-profile_mobile-cxx03
+Conflicts:     %{name}-profile_wearable-cxx03
+Conflicts:     %{name}-profile_tv-cxx03
+Conflicts:     %{name}-profile_ivi-cxx03
+%description profile_common-cxx03
+The DALi Tizen Adaptor for common.
+%endif
+%endif
+
 ##############################
 # devel
 ##############################
@@ -233,6 +333,31 @@ Requires:   %{name} = %{version}-%{release}
 %description integration-devel
 Integration development package for the Adaptor - headers for integrating with an adaptor library.
 
+%if !0%{?disable_cxx03_build}
+##############################
+# devel cxx03
+##############################
+%package devel-cxx03
+Summary:    Development components for the DALi Tizen Adaptor with cxx03 abi
+Group:      Development/Building
+Requires:   %{name}-cxx03 = %{version}-%{release}
+Requires:   %{name}-integration-devel-cxx03 = %{version}-%{release}
+
+%description devel-cxx03
+Development components for the DALi Tizen Adaptor - public headers and package configs
+
+##############################
+# integration-devel cxx03
+##############################
+%package integration-devel-cxx03
+Summary:    Integration development package for the Adaptor with cxx03 abi
+Group:      Development/Building
+Requires:   %{name}-cxx03 = %{version}-%{release}
+
+%description integration-devel-cxx03
+Integration development package for the Adaptor - headers for integrating with an adaptor library.
+%endif
+
 ##############################
 # Dali Feedback Plugin
 ##############################
@@ -255,6 +380,31 @@ Group:      System/Libraries
 VideoPlayer plugin to play a video file for Dali
 %endif
 
+%if !0%{?disable_cxx03_build}
+##############################
+# Dali Feedback Plugin cxx03
+##############################
+
+%package dali-feedback-plugin-cxx03
+Summary:    Plugin to play haptic and audio feedback for Dali with cxx03 abi
+Group:      System/Libraries
+Requires:   %{name}-cxx03 = %{version}-%{release}
+%description dali-feedback-plugin-cxx03
+Feedback plugin to play haptic and audio feedback for Dali
+
+##############################
+# Dali VideoPlayer Plugin
+##############################
+%if %{with wayland}
+
+%package dali-video-player-plugin-cxx03
+Summary:    Plugin to play a video file for Dali with cxx03 abi
+Group:      System/Libraries
+%description dali-video-player-plugin-cxx03
+VideoPlayer plugin to play a video file for Dali
+%endif
+%endif
+
 ##############################
 # Preparation
 ##############################
@@ -326,7 +476,9 @@ TIZEN_PLATFORM_CONFIG_SUPPORTED="%{tizen_platform_config_supported}" ; export TI
 %endif
 
 # Default to GLES 2.0 if not specified.
-%{!?target_gles_version: %define target_gles_version 20}
+%if 0%{?target_gles_version} == 0
+%define target_gles_version 20
+%endif
 
 # Set up the build via configure.
 #######################################################################
@@ -352,7 +504,8 @@ TIZEN_PLATFORM_CONFIG_SUPPORTED="%{tizen_platform_config_supported}" ; export TI
            --enable-debug \
 %endif
            --enable-appfw=yes \
-           $configure_flags --libdir=%{_libdir}
+           $configure_flags --libdir=%{_libdir} \
+           --enable-rename-so=no
 
 # Build.
 make %{?jobs:-j%jobs}
@@ -363,8 +516,12 @@ popd
 
 pushd %{buildroot}%{_libdir}
 for FILE in libdali-adap*.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE.mobile"; done
+for FILE in libdali-*plugin*-cxx11.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE"; done 
+mv pkgconfig/dali-adaptor*pc %{_builddir}/%{name}-%{version}/build/tizen/
 popd
 
+make clean
+
 %endif
 
 #######################################################################
@@ -390,7 +547,8 @@ popd
            --enable-debug \
 %endif
            --enable-appfw=yes \
-           $configure_flags --libdir=%{_libdir}
+           $configure_flags --libdir=%{_libdir} \
+           --enable-rename-so=no
 
 # Build.
 make %{?jobs:-j%jobs}
@@ -401,8 +559,11 @@ popd
 
 pushd %{buildroot}%{_libdir}
 for FILE in libdali-adap*.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE.tv"; done
+for FILE in libdali-*plugin*-cxx11.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE"; done 
+mv pkgconfig/dali-adaptor*pc %{_builddir}/%{name}-%{version}/build/tizen/
 popd
 
+make clean
 %endif
 
 #######################################################################
@@ -428,7 +589,8 @@ popd
            --enable-debug \
 %endif
            --enable-appfw=yes \
-           $configure_flags --libdir=%{_libdir}
+           $configure_flags --libdir=%{_libdir} \
+           --enable-rename-so=no
 
 # Build.
 make %{?jobs:-j%jobs}
@@ -439,8 +601,11 @@ popd
 
 pushd %{buildroot}%{_libdir}
 for FILE in libdali-adap*.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE.wearable"; done
+for FILE in libdali-*plugin*-cxx11.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE"; done 
+mv pkgconfig/dali-adaptor*pc %{_builddir}/%{name}-%{version}/build/tizen/
 popd
 
+make clean
 %endif
 
 #######################################################################
@@ -466,7 +631,8 @@ popd
            --enable-debug \
 %endif
            --enable-appfw=yes \
-           $configure_flags --libdir=%{_libdir}
+           $configure_flags --libdir=%{_libdir} \
+           --enable-rename-so=no
 
 # Build.
 make %{?jobs:-j%jobs}
@@ -476,9 +642,13 @@ pushd %{_builddir}/%{name}-%{version}/build/tizen
 popd
 
 pushd %{buildroot}%{_libdir}
-for FILE in libdali-adap*.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE.ivi"; done
+for FILE in libdali-adaptor*.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE.ivi"; done
+for FILE in libdali-*plugin*-cxx11.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE"; done 
+
+mv pkgconfig/dali-adaptor*pc %{_builddir}/%{name}-%{version}/build/tizen/
 popd
 
+make clean
 %endif
 
 #######################################################################
@@ -505,12 +675,240 @@ popd
            --enable-debug \
 %endif
            --enable-appfw=yes \
-           $configure_flags --libdir=%{_libdir}
+           $configure_flags --libdir=%{_libdir} \
+           --enable-rename-so=no
+
+# Build.
+make %{?jobs:-j%jobs}
+
+pushd %{_builddir}/%{name}-%{version}/build/tizen
+%make_install DALI_DATA_RW_DIR="%{dali_data_rw_dir}" DALI_DATA_RO_DIR="%{dali_data_ro_dir}"
+popd
+
+pushd %{buildroot}%{_libdir}
+for FILE in libdali-adap*.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE"; done
+for FILE in libdali-*plugin*-cxx11.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE"; done 
+
+mv pkgconfig/dali-adaptor*pc %{_builddir}/%{name}-%{version}/build/tizen/
+popd
+
+make clean
+
+%endif
+
+%if !0%{?disable_cxx03_build}
+#######################################################################
+#BUILD for cxx03 ABI
+#######################################################################
+
+# Set up the build via configure.
+#######################################################################
+# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
+# if mobile || "undefined"
+%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "common"
+
+%configure --prefix=$PREFIX --with-jpeg-turbo --enable-gles=%{target_gles_version} \
+           --enable-shaderbincache=DISABLE --enable-profile=MOBILE \
+           --enable-tizen-major-version=%{tizen_version_major} \
+%if 0%{?tizen_version_major} >= 3
+           --enable-feedback \
+%endif
+           --enable-videoplayer \
+           --enable-cxx03-abi=yes  \
+%if 0%{?tizen_2_2_compatibility}
+           --with-tizen-2-2-compatibility \
+%endif
+%if %{with wayland}
+           --enable-efl=no \
+%else
+           --enable-efl=yes \
+%endif
+%if 0%{?enable_debug}
+           --enable-debug \
+%endif
+           --enable-appfw=yes \
+           $configure_flags --libdir=%{_libdir} \
+           --enable-rename-so=no
+
+# Build.
+make %{?jobs:-j%jobs}
+
+pushd %{_builddir}/%{name}-%{version}/build/tizen
+%make_install DALI_DATA_RW_DIR="%{dali_data_rw_dir}" DALI_DATA_RO_DIR="%{dali_data_ro_dir}"
+popd
+
+pushd %{buildroot}%{_libdir}
+for FILE in libdali-adap*.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE.mobile"; done
+for FILE in libdali-*plugin.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE"; done 
+popd
+
+make clean
+
+%endif
+
+#######################################################################
+# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
+# if tv ||"undefined"
+%if "%{?profile}" != "wearable" && "%{?profile}" != "common" && "%{?profile}" != "ivi" && "%{?profile}" != "mobile"
+
+%configure --prefix=$PREFIX --with-jpeg-turbo --enable-gles=%{target_gles_version} \
+           --enable-shaderbincache=DISABLE --enable-profile=TV \
+           --enable-tizen-major-version=%{tizen_version_major} \
+%if 0%{?tizen_version_major} >= 3
+           --enable-feedback \
+%endif
+           --enable-videoplayer \
+           --enable-cxx03-abi=yes  \
+%if 0%{?tizen_2_2_compatibility}
+           --with-tizen-2-2-compatibility \
+%endif
+%if %{with wayland}
+           --enable-efl=no \
+%else
+           --enable-efl=yes \
+%endif
+%if 0%{?enable_debug}
+           --enable-debug \
+%endif
+           --enable-appfw=yes \
+           $configure_flags --libdir=%{_libdir} \
+           --enable-rename-so=no
+
+# Build.
+make %{?jobs:-j%jobs}
+
+pushd %{_builddir}/%{name}-%{version}/build/tizen
+%make_install DALI_DATA_RW_DIR="%{dali_data_rw_dir}" DALI_DATA_RO_DIR="%{dali_data_ro_dir}"
+popd
+
+pushd %{buildroot}%{_libdir}
+for FILE in libdali-adap*.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE.tv"; done
+for FILE in libdali-*plugin.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE"; done 
+popd
+
+make clean
+%endif
+
+#######################################################################
+# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
+# if wearable || "undefined"
+%if "%{?profile}" != "mobile" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "common"
+
+%configure --prefix=$PREFIX --with-jpeg-turbo --enable-gles=%{target_gles_version} \
+           --enable-shaderbincache=DISABLE --enable-profile=WEARABLE \
+           --enable-tizen-major-version=%{tizen_version_major} \
+%if 0%{?tizen_version_major} >= 3
+           --enable-feedback \
+%endif
+           --enable-videoplayer \
+           --enable-cxx03-abi=yes \
+%if 0%{?tizen_2_2_compatibility}
+           --with-tizen-2-2-compatibility \
+%endif
+%if %{with wayland}
+           --enable-efl=no \
+%else
+           --enable-efl=yes \
+%endif
+%if 0%{?enable_debug}
+           --enable-debug \
+%endif
+           --enable-appfw=yes \
+           $configure_flags --libdir=%{_libdir} \
+           --enable-rename-so=no
+
+# Build.
+make %{?jobs:-j%jobs}
+
+pushd %{_builddir}/%{name}-%{version}/build/tizen
+%make_install DALI_DATA_RW_DIR="%{dali_data_rw_dir}" DALI_DATA_RO_DIR="%{dali_data_ro_dir}"
+popd
+
+pushd %{buildroot}%{_libdir}
+for FILE in libdali-adap*.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE.wearable"; done
+for FILE in libdali-*plugin.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE"; done 
+popd
+
+make clean
+%endif
+
+#######################################################################
+# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
+# if ivi ||"undefined"
+%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "common" && "%{?profile}" != "mobile"
+
+%configure --prefix=$PREFIX --with-jpeg-turbo --enable-gles=%{target_gles_version} \
+           --enable-shaderbincache=DISABLE --enable-profile=IVI \
+           --enable-tizen-major-version=%{tizen_version_major} \
+%if 0%{?tizen_version_major} >= 3
+           --enable-feedback \
+%endif
+           --enable-videoplayer \
+           --enable-cxx03-abi=yes  \
+%if 0%{?tizen_2_2_compatibility}
+           --with-tizen-2-2-compatibility \
+%endif
+%if %{with wayland}
+           --enable-efl=no \
+%else
+           --enable-efl=yes \
+%endif
+%if 0%{?enable_debug}
+           --enable-debug \
+%endif
+           --enable-appfw=yes \
+           $configure_flags --libdir=%{_libdir} \
+           --enable-rename-so=no
 
 # Build.
 make %{?jobs:-j%jobs}
+
+pushd %{_builddir}/%{name}-%{version}/build/tizen
+%make_install DALI_DATA_RW_DIR="%{dali_data_rw_dir}" DALI_DATA_RO_DIR="%{dali_data_ro_dir}"
+popd
+
+pushd %{buildroot}%{_libdir}
+for FILE in libdali-adap*.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE.ivi"; done
+for FILE in libdali-*plugin.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE"; done 
+popd
+
+make clean
+%endif
+
+#######################################################################
+# common ( build dali_videoplayer_plugin for common uses )
+# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
+# if common ||"undefined"
+%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "mobile"
+
+%configure --prefix=$PREFIX --with-jpeg-turbo --enable-gles=%{target_gles_version} \
+           --enable-shaderbincache=DISABLE --enable-profile=COMMON \
+           --enable-tizen-major-version=%{tizen_version_major} \
+%if 0%{?tizen_version_major} >= 3
+           --enable-feedback \
+%endif
+           --enable-videoplayer \
+           --enable-cxx03-abi=yes  \
+%if 0%{?tizen_2_2_compatibility}
+           --with-tizen-2-2-compatibility \
+%endif
+%if %{with wayland}
+           --enable-efl=no \
+%else
+           --enable-efl=yes \
 %endif
+%if 0%{?enable_debug}
+           --enable-debug \
+%endif
+           --enable-appfw=yes \
+           $configure_flags --libdir=%{_libdir} \
+           --enable-rename-so=no
+
+# Build.
+make %{?jobs:-j%jobs}
 
+%endif
+%endif
 
 ##############################
 # Installation
@@ -532,6 +930,63 @@ rm -rf %{buildroot}%{_libdir}/libdali-adap*.so*
 # wearable || tv || ivi || mobile || unified
 %if "%{?profile}" != "common"
 for FILE in libdali-*.so*; do mv "$FILE" "%{buildroot}%{_libdir}/$FILE"; done
+mv dali-adaptor*.pc %{buildroot}%{_libdir}/pkgconfig/
+%endif
+popd
+
+################################################
+#rename 
+###############################################
+pushd %{buildroot}%{_libdir}
+
+# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
+# if common ||"undefined"
+#%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "mobile"
+rm -rf libdali-adaptor*.so
+%if !0%{?disable_cxx03_build}
+ln -s libdali-adaptor.so.0.0.0 libdali-adaptor-cxx03.so
+%endif
+ln -s libdali-adaptor-cxx11.so.0.0.0 libdali-adaptor.so
+#%endif
+
+# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
+# if wearable || "undefined"
+%if "%{?profile}" != "mobile" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "common"
+rm -rf libdali-adaptor*.so.wearable
+%if !0%{?disable_cxx03_build}
+ln -s libdali-adaptor.so.0.0.*.wearable libdali-adaptor-cxx03.so.wearable
+%endif
+ln -s libdali-adaptor-cxx11.so.0.0.*.wearable libdali-adaptor.so.wearable
+%endif
+
+# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
+# if tv ||"undefined"
+%if "%{?profile}" != "wearable" && "%{?profile}" != "common" && "%{?profile}" != "ivi" && "%{?profile}" != "mobile"
+rm -rf libdali-adaptor*.so.tv
+%if !0%{?disable_cxx03_build}
+ln -s libdali-adaptor.so.0.0.*.tv libdali-adaptor-cxx03.so.tv
+%endif
+ln -s libdali-adaptor-cxx11.so.0.0.*.tv libdali-adaptor.so.tv
+%endif
+
+# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
+# if ivi ||"undefined"
+%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "common" && "%{?profile}" != "mobile"
+rm -rf libdali-adaptor*.so.ivi
+%if !0%{?disable_cxx03_build}
+ln -s libdali-adaptor.so.0.0.*.ivi libdali-adaptor-cxx03.so.ivi
+%endif
+ln -s libdali-adaptor-cxx11.so.0.0.*.ivi libdali-adaptor.so.ivi
+%endif
+
+# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
+# if mobile || "undefined"
+%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "common"
+rm -rf libdali-adaptor*.so.mobile
+%if !0%{?disable_cxx03_build}
+ln -s libdali-adaptor.so.0.0.*.mobile libdali-adaptor-cxx03.so.mobile
+%endif
+ln -s libdali-adaptor-cxx11.so.0.0.*.mobile libdali-adaptor.so.mobile
 %endif
 popd
 
@@ -588,7 +1043,7 @@ exit 0
 %if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "common"
 %post profile_mobile
 pushd %{_libdir}
-for FILE in libdali-adap*.so*.mobile; do ln -sf "$FILE" "${FILE%.mobile}"; done
+for FILE in libdali-adaptor-cxx11.so*.mobile; do ln -sf "$FILE" "${FILE%.mobile}"; done
 popd
 /sbin/ldconfig
 exit 0
@@ -605,7 +1060,7 @@ exit 0
 %if "%{?profile}" != "wearable" && "%{?profile}" != "common" && "%{?profile}" != "ivi" && "%{?profile}" != "mobile"
 %post profile_tv
 pushd %{_libdir}
-for FILE in libdali-adap*.so*.tv; do ln -sf "$FILE" "${FILE%.tv}"; done
+for FILE in libdali-adaptor-cxx11.so*.tv; do ln -sf "$FILE" "${FILE%.tv}"; done
 popd
 /sbin/ldconfig
 exit 0
@@ -622,7 +1077,7 @@ exit 0
 %if "%{?profile}" != "mobile" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "common"
 %post profile_wearable
 pushd %{_libdir}
-for FILE in libdali-adap*.so*.wearable; do ln -sf "$FILE" "${FILE%.wearable}"; done
+for FILE in libdali-adaptor-cxx11.so*.wearable; do ln -sf "$FILE" "${FILE%.wearable}"; done
 popd
 /sbin/ldconfig
 exit 0
@@ -639,7 +1094,7 @@ exit 0
 %if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "common" && "%{?profile}" != "mobile"
 %post profile_ivi
 pushd %{_libdir}
-for FILE in libdali-adap*.so*.ivi; do ln -sf "$FILE" "${FILE%.ivi}"; done
+for FILE in libdali-adaptor-cxx11.so*.ivi; do ln -sf "$FILE" "${FILE%.ivi}"; done
 popd
 /sbin/ldconfig
 exit 0
@@ -649,6 +1104,76 @@ exit 0
 exit 0
 %endif
 
+%if !0%{?disable_cxx03_build}
+##############################
+#cxx03 ABI
+#############################
+# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
+# if mobile || "undefined"
+%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "common"
+%post profile_mobile-cxx03
+pushd %{_libdir}
+for FILE in libdali-adaptor.so*.mobile; do ln -sf "$FILE" "${FILE%.mobile}"; done
+popd
+/sbin/ldconfig
+exit 0
+
+%postun profile_mobile-cxx03
+/sbin/ldconfig
+exit 0
+%endif
+
+##############################
+
+# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
+# if tv ||"undefined"
+%if "%{?profile}" != "wearable" && "%{?profile}" != "common" && "%{?profile}" != "ivi" && "%{?profile}" != "mobile"
+%post profile_tv-cxx03
+pushd %{_libdir}
+for FILE in libdali-adaptor.so*.tv; do ln -sf "$FILE" "${FILE%.tv}"; done
+popd
+/sbin/ldconfig
+exit 0
+
+%postun profile_tv-cxx03
+/sbin/ldconfig
+exit 0
+%endif
+
+##############################
+
+# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
+# if wearable || "undefined"
+%if "%{?profile}" != "mobile" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "common"
+%post profile_wearable-cxx03
+pushd %{_libdir}
+for FILE in libdali-adaptor.so*.wearable; do ln -sf "$FILE" "${FILE%.wearable}"; done
+popd
+/sbin/ldconfig
+exit 0
+
+%postun profile_wearable-cxx03
+/sbin/ldconfig
+exit 0
+%endif
+
+##############################
+
+# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
+# if ivi ||"undefined"
+%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "common" && "%{?profile}" != "mobile"
+%post profile_ivi-cxx03
+pushd %{_libdir}
+for FILE in libdali-adaptor.so*.ivi; do ln -sf "$FILE" "${FILE%.ivi}"; done
+popd
+/sbin/ldconfig
+exit 0
+
+%postun profile_ivi-cxx03
+/sbin/ldconfig
+exit 0
+%endif
+%endif
 
 ##############################
 # Files in Binary Packages
@@ -664,9 +1189,30 @@ exit 0
 
 # This is for backward-compatibility. This does not deteriorate 4.0 Configurability
 # if common ||"undefined"
+#%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "mobile"
+%defattr(-,root,root,-)
+%{_libdir}/libdali-adaptor-cxx11.so.0*
+%{_libdir}/libdali-adaptor.so
+%exclude %{_libdir}/libdali-adap*.so*.mobile
+%exclude %{_libdir}/libdali-adap*.so*.wearable
+%exclude %{_libdir}/libdali-adap*.so*.tv
+%exclude %{_libdir}/libdali-adap*.so*.ivi
+#%endif
+
+%if !0%{?disable_cxx03_build}
+%files cxx03
+%manifest dali-adaptor.manifest
+%defattr(-,root,root,-)
+%defattr(-,app,app,-)
+%dir %{user_shader_cache_dir}
+%{_bindir}/*
+%license LICENSE
+# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
+# if common ||"undefined"
 %if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "mobile"
 %defattr(-,root,root,-)
-%{_libdir}/libdali-adap*.so*
+%{_libdir}/libdali-adaptor.so.0*
+%{_libdir}/libdali-adaptor-cxx03.so
 %exclude %{_libdir}/libdali-adap*.so*.mobile
 %exclude %{_libdir}/libdali-adap*.so*.wearable
 %exclude %{_libdir}/libdali-adap*.so*.tv
@@ -674,7 +1220,7 @@ exit 0
 %endif
 
 %if %{with wayland}
-%files dali-video-player-plugin
+%files dali-video-player-plugin-cxx03
 %manifest dali-adaptor.manifest
 %defattr(-,root,root,-)
 %{_libdir}/libdali-video-player-plugin.so*
@@ -682,12 +1228,33 @@ exit 0
 %endif
 
 %if 0%{?tizen_version_major} >= 3
-%files dali-feedback-plugin
+%files dali-feedback-plugin-cxx03
 %manifest dali-adaptor.manifest
 %defattr(-,root,root,-)
 %{_libdir}/libdali-feedback-plugin.so*
 %{dali_plugin_sound_files}/*
 %endif
+%endif
+
+#################################################
+
+%if %{with wayland}
+%files dali-video-player-plugin
+%manifest dali-adaptor.manifest
+%defattr(-,root,root,-)
+%{_libdir}/libdali-video-player-plugin-cxx11.so*
+%license LICENSE
+%endif
+
+%if 0%{?tizen_version_major} >= 3
+%files dali-feedback-plugin
+%manifest dali-adaptor.manifest
+%defattr(-,root,root,-)
+%{_libdir}/libdali-feedback-plugin-cxx11.so*
+%{dali_plugin_sound_files}/*
+%endif
+
+#################################################
 
 # This is for backward-compatibility. This does not deteriorate 4.0 Configurability
 # if common ||"undefined"
@@ -702,7 +1269,8 @@ exit 0
 %files profile_mobile
 %manifest dali-adaptor.manifest
 %defattr(-,root,root,-)
-%{_libdir}/libdali-adap*.so*.mobile
+%{_libdir}/libdali-adaptor.so.mobile
+%{_libdir}/libdali-adaptor-cxx11.so.0*.mobile
 %endif
 
 # This is for backward-compatibility. This does not deteriorate 4.0 Configurability
@@ -711,7 +1279,8 @@ exit 0
 %files profile_tv
 %manifest dali-adaptor.manifest
 %defattr(-,root,root,-)
-%{_libdir}/libdali-adap*.so*.tv
+%{_libdir}/libdali-adaptor.so.tv
+%{_libdir}/libdali-adaptor-cxx11.so.0*.tv
 %endif
 
 # This is for backward-compatibility. This does not deteriorate 4.0 Configurability
@@ -720,7 +1289,8 @@ exit 0
 %files profile_wearable
 %manifest dali-adaptor.manifest
 %defattr(-,root,root,-)
-%{_libdir}/libdali-adap*.so*.wearable
+%{_libdir}/libdali-adaptor.so.wearable
+%{_libdir}/libdali-adaptor-cxx11.so.0*.wearable
 %endif
 
 # This is for backward-compatibility. This does not deteriorate 4.0 Configurability
@@ -729,7 +1299,8 @@ exit 0
 %files profile_ivi
 %manifest dali-adaptor.manifest
 %defattr(-,root,root,-)
-%{_libdir}/libdali-adap*.so*.ivi
+%{_libdir}/libdali-adaptor.so.ivi
+%{_libdir}/libdali-adaptor-cxx11.so.0*.ivi
 %endif
 
 
@@ -745,3 +1316,70 @@ exit 0
 %defattr(-,root,root,-)
 %{dev_include_path}/dali/integration-api/adaptors/*
 %{_libdir}/pkgconfig/dali-adaptor-integration.pc
+
+%if !0%{?disable_cxx03_build}
+################################################
+# cxx03 ABI
+################################################
+
+# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
+# if common ||"undefined"
+%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "mobile"
+%files profile_common-cxx03
+# default .so files are housed in the main pkg.
+%endif
+
+# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
+# if mobile || "undefined"
+%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "common"
+%files profile_mobile-cxx03
+%manifest dali-adaptor.manifest
+%defattr(-,root,root,-)
+%{_libdir}/libdali-adaptor-cxx03.so.mobile
+%{_libdir}/libdali-adaptor.so.0*mobile
+%endif
+
+# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
+# if tv ||"undefined"
+%if "%{?profile}" != "wearable" && "%{?profile}" != "common" && "%{?profile}" != "ivi" && "%{?profile}" != "mobile"
+%files profile_tv-cxx03
+%manifest dali-adaptor.manifest
+%defattr(-,root,root,-)
+%{_libdir}/libdali-adaptor-cxx03.so.tv
+%{_libdir}/libdali-adaptor.so.0*.tv
+%endif
+
+# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
+# if wearable || "undefined"
+%if "%{?profile}" != "mobile" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "common"
+%files profile_wearable-cxx03
+%manifest dali-adaptor.manifest
+%defattr(-,root,root,-)
+%{_libdir}/libdali-adaptor-cxx03.so.wearable
+%{_libdir}/libdali-adaptor.so.0*.wearable
+%endif
+
+# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
+# if ivi ||"undefined"
+%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "common" && "%{?profile}" != "mobile"
+%files profile_ivi-cxx03
+%manifest dali-adaptor.manifest
+%defattr(-,root,root,-)
+%{_libdir}/libdali-adaptor-cxx03.so.ivi
+%{_libdir}/libdali-adaptor.so.0*.ivi
+%endif
+
+
+%files devel-cxx03
+%defattr(-,root,root,-)
+%{dev_include_path}/dali/dali.h
+%{dev_include_path}/dali/public-api/*
+%{dev_include_path}/dali/devel-api/*
+%{dev_include_path}/dali/doc/*
+%{_libdir}/pkgconfig/dali-adaptor-cxx03.pc
+
+%files integration-devel-cxx03
+%defattr(-,root,root,-)
+%{dev_include_path}/dali/integration-api/adaptors/*
+%{_libdir}/pkgconfig/dali-adaptor-integration-cxx03.pc
+%endif