[dali_1.9.11] Merge branch 'devel/master'

Change-Id: I67d58dd607652f784d41afc584b817d7f94632a7

diff --git a/build/android/app/src/main/cpp/CMakeLists.txt b/build/android/app/src/main/cpp/CMakeLists.txt
index fff12ab..c75ce8d 100644 (file)
--- a/build/android/app/src/main/cpp/CMakeLists.txt
+++ b/build/android/app/src/main/cpp/CMakeLists.txt
@@ -35,9 +35,9 @@ ELSE()
 ENDIF()
 
 IF(EXISTS "${DALI_ENV_DIR}")
-  PKG_CHECK_MODULES(DALI_CORE dali-core REQUIRED NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH)
-  PKG_CHECK_MODULES(DALI_ADAPTOR dali-adaptor REQUIRED NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH)
-  PKG_CHECK_MODULES(DALI_TOOLKIT dali-toolkit REQUIRED NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH)
+  PKG_CHECK_MODULES(DALI_CORE dali2-core REQUIRED NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH)
+  PKG_CHECK_MODULES(DALI_ADAPTOR dali2-adaptor REQUIRED NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH)
+  PKG_CHECK_MODULES(DALI_TOOLKIT dali2-toolkit REQUIRED NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH)
 ELSE()
   MESSAGE(WARNING "${DALI_ENV_DIR} not found!")
 ENDIF()

diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt
index 5899745..473ac76 100644 (file)
--- a/build/tizen/CMakeLists.txt
+++ b/build/tizen/CMakeLists.txt
@@ -166,9 +166,9 @@ ENDFOREACH(flag)
 MESSAGE("Installed style resources ${LOCAL_STYLE_IMAGES_LIST} to ${STYLE_DIR}/images")
 
 IF( ENABLE_PKG_CONFIGURE )
-  SET(PKG_LIST dali-core
-               dali-adaptor
-               dali-toolkit)
+  SET(PKG_LIST dali2-core
+               dali2-adaptor
+               dali2-toolkit)
 
   INCLUDE(FindPkgConfig)
   pkg_check_modules(REQUIRED_PKGS REQUIRED ${PKG_LIST})
@@ -200,9 +200,9 @@ IF( WIN32 ) # WIN32 includes x64 as well according to the cmake doc.
   FIND_PACKAGE( unofficial-cairo REQUIRED )
 
   FIND_PACKAGE( dali-windows-dependencies REQUIRED )
-  FIND_PACKAGE( dali-core REQUIRED )
-  FIND_PACKAGE( dali-adaptor REQUIRED )
-  FIND_PACKAGE( dali-toolkit REQUIRED )
+  FIND_PACKAGE( dali2-core REQUIRED )
+  FIND_PACKAGE( dali2-adaptor REQUIRED )
+  FIND_PACKAGE( dali2-toolkit REQUIRED )
 
   # Set up the include dir
   SET( INCLUDE_DIR $ENV{includedir} )
@@ -238,9 +238,9 @@ IF( WIN32 ) # WIN32 includes x64 as well according to the cmake doc.
     unofficial::angle::libGLESv2
     unofficial::cairo::cairo
     dali-windows-dependencies::dali-windows-dependencies
-    dali-core::dali-core
-    dali-adaptor::dali-adaptor
-    dali-toolkit::dali-toolkit
+    dali2-core::dali2-core
+    dali2-adaptor::dali2-adaptor
+    dali2-toolkit::dali2-toolkit
   )
 ELSEIF( UNIX )
   SET( REQUIRED_LIBS

diff --git a/packaging/com.samsung.dali-demo.spec b/packaging/com.samsung.dali-demo.spec
index c09a7d8..13212ff 100755 (executable)
--- a/packaging/com.samsung.dali-demo.spec
+++ b/packaging/com.samsung.dali-demo.spec
@@ -2,7 +2,7 @@
 
 Name:       com.samsung.dali-demo
 Summary:    The OpenGLES Canvas Core Demo
-Version:    1.9.10
+Version:    1.9.11
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0
@@ -18,9 +18,9 @@ BuildRequires:  pkgconfig(capi-appfw-application)
 BuildRequires:  pkgconfig(capi-media-player)
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  gettext-tools
-BuildRequires:  pkgconfig(dali-core)
-BuildRequires:  pkgconfig(dali-adaptor)
-BuildRequires:  pkgconfig(dali-toolkit)
+BuildRequires:  pkgconfig(dali2-core)
+BuildRequires:  pkgconfig(dali2-adaptor)
+BuildRequires:  pkgconfig(dali2-toolkit)
 BuildRequires:  pkgconfig(libtzplatform-config)
 
 %description