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

Change-Id: Iae421e27c096c883fe2c566fa5f616f92e84a9fb

diff --git a/build/scripts/dali_env b/build/scripts/dali_env
index b55670c..c573c24 100755 (executable)
--- a/build/scripts/dali_env
+++ b/build/scripts/dali_env
@@ -43,6 +43,7 @@ my @system_packages = (
     "libdrm-dev",
     "libgif-dev",
     "libturbojpeg",
+    "libturbojpeg0-dev",
     "libfribidi-dev",
     "libharfbuzz-dev",
     "doxygen",
@@ -211,11 +212,15 @@ sub check_system_package
     my $package;
     foreach $package (@_)
     {
-        my @x=split(/\s+/, `dpkg -l $package|grep $package`);
+        my @x=split(/\s+/, `dpkg -l $package 2> /dev/null|grep $package`);
         if($x[0] ne "ii")
         {
-            print "Attempting to install $package\n";
-            system("sudo apt-get -y --force-yes install $package");
+            # Check if the package is available to install, exit-code is 0 if the package is found.
+            if(system("apt-cache show $package > /dev/null 2>&1") == 0)
+            {
+                print "Attempting to install $package\n";
+                system("sudo apt-get -y --force-yes install $package");
+            }
         }
     }
 }
@@ -257,9 +262,12 @@ sub check_source_packages
         }
         elsif ($pkg eq "gtest")
         {
-            print "Attempting to build $pkg\n";
-            # from https://www.eriksmistad.no/getting-started-with-google-test-on-ubuntu/
-            run_command("cd /usr/src/gtest; sudo cmake CMakeLists.txt; sudo make; sudo cp *.a /usr/lib; cd -;");
+            if(! -e "/usr/lib/libgtest.a")
+            {
+                print "Attempting to build $pkg\n";
+                # from https://www.eriksmistad.no/getting-started-with-google-test-on-ubuntu/
+                run_command("cd /usr/src/gtest; sudo cmake CMakeLists.txt; sudo make; sudo cp *.a /usr/lib; cd -;");
+            }
         }
     }
 }

diff --git a/dali/public-api/actors/actor.h b/dali/public-api/actors/actor.h
index adb5a77..4e46b70 100644 (file)
--- a/dali/public-api/actors/actor.h
+++ b/dali/public-api/actors/actor.h
@@ -30,6 +30,8 @@
 #include <dali/public-api/object/property-index-ranges.h>
 #include <dali/public-api/signals/dali-signal.h>
 
+#undef SIZE_WIDTH // Defined in later versions of cstdint but is used in this header
+
 namespace Dali
 {
 /**

diff --git a/dali/public-api/dali-core-version.cpp b/dali/public-api/dali-core-version.cpp
index 96e95df..f20c6e1 100644 (file)
--- a/dali/public-api/dali-core-version.cpp
+++ b/dali/public-api/dali-core-version.cpp
@@ -27,8 +27,8 @@ namespace Dali
 {
 
 const uint32_t CORE_MAJOR_VERSION = 1;
-const uint32_t CORE_MINOR_VERSION = 3;
-const uint32_t CORE_MICRO_VERSION = 54;
+const uint32_t CORE_MINOR_VERSION = 4;
+const uint32_t CORE_MICRO_VERSION = 0;
 const char * const CORE_BUILD_DATE    = __DATE__ " " __TIME__;
 
 #ifdef DEBUG_ENABLED

diff --git a/dali/public-api/rendering/frame-buffer.h b/dali/public-api/rendering/frame-buffer.h
index b80630c..456d3d7 100644 (file)
--- a/dali/public-api/rendering/frame-buffer.h
+++ b/dali/public-api/rendering/frame-buffer.h
@@ -60,17 +60,17 @@ public:
       DEPTH         = 1 << 0,                     ///< Depth buffer is created                          @SINCE_1_1.45
       STENCIL       = 1 << 1,                     ///< Stencil buffer is created                        @SINCE_1_1.45
       DEPTH_STENCIL = DEPTH | STENCIL,            ///< Depth and stencil buffer will be created         @SINCE_1_1.45
-      COLOR         = 1 << 2,                     ///< Color texture will be created                    @SINCE_1_3.54
-      COLOR_DEPTH   = COLOR | DEPTH,              ///< Color texture and depth buffer will be created   @SINCE_1_3.54
-      COLOR_STENCIL = COLOR | STENCIL,            ///< Color texture and stencil buffer will be created @SINCE_1_3.54
-      COLOR_DEPTH_STENCIL = COLOR_DEPTH | STENCIL ///< Color, depth and stencil buffer will be created  @SINCE_1_3.54
+      COLOR         = 1 << 2,                     ///< Color texture will be created                    @SINCE_1_4.0
+      COLOR_DEPTH   = COLOR | DEPTH,              ///< Color texture and depth buffer will be created   @SINCE_1_4.0
+      COLOR_STENCIL = COLOR | STENCIL,            ///< Color texture and stencil buffer will be created @SINCE_1_4.0
+      COLOR_DEPTH_STENCIL = COLOR_DEPTH | STENCIL ///< Color, depth and stencil buffer will be created  @SINCE_1_4.0
     };
   };
 
   /**
    * @brief Creates a new FrameBuffer with only COLOR texture attached on it
    *
-   * @SINCE_1_3.54
+   * @SINCE_1_4.0
    *
    * @note Call GetColorTexture() to get the COLOR texture
    *
@@ -83,7 +83,7 @@ public:
   /**
    * @brief Creates a new FrameBuffer with the specified attachments
    *
-   * @SINCE_1_3.54
+   * @SINCE_1_4.0
    *
    * @param[in] width The width of the FrameBuffer and the attachments
    * @param[in] height The height of the FrameBuffer and the attachments
@@ -93,7 +93,7 @@ public:
   static FrameBuffer New( uint32_t width, uint32_t height, Attachment::Mask attachments );
 
   /**
-   * @DEPRECATED_1_3.54 use New( uint32_t width, uint32_t height ) or New( uint32_t width, uint32_t height, Attachment::Mask attachments ) instead
+   * @DEPRECATED_1_4.0 use New( uint32_t width, uint32_t height ) or New( uint32_t width, uint32_t height, Attachment::Mask attachments ) instead
    * @brief Creates a new FrameBuffer object.
    *
    * @SINCE_1_1.43

diff --git a/packaging/dali.spec b/packaging/dali.spec
index 87362d6..a08e360 100644 (file)
--- a/packaging/dali.spec
+++ b/packaging/dali.spec
@@ -1,6 +1,6 @@
 Name:       dali
 Summary:    DALi 3D Engine
-Version:    1.3.54
+Version:    1.4.0
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0 and BSD-3-Clause and MIT