diff options
-rw-r--r-- | recipes-graphics/layer-management/layer-management-0.9.9/include-unistd-for-usleep-in-OpenGLES2App.patch | 18 | ||||
-rw-r--r-- | recipes-graphics/layer-management/layer-management-0.9.9/point-to-internal-CMakeVersions.patch | 13 | ||||
-rw-r--r-- | recipes-graphics/layer-management/layer-management_1.0.bb (renamed from recipes-graphics/layer-management/layer-management_0.9.9.bb) | 6 |
3 files changed, 1 insertions, 36 deletions
diff --git a/recipes-graphics/layer-management/layer-management-0.9.9/include-unistd-for-usleep-in-OpenGLES2App.patch b/recipes-graphics/layer-management/layer-management-0.9.9/include-unistd-for-usleep-in-OpenGLES2App.patch deleted file mode 100644 index 87a9379..0000000 --- a/recipes-graphics/layer-management/layer-management-0.9.9/include-unistd-for-usleep-in-OpenGLES2App.patch +++ /dev/null @@ -1,18 +0,0 @@ -Include unistd.h in OpenGLES2App.cpp as usleep is used in code - -Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com> -Upstream-status: Pending - -Index: git/LayerManagerExamples/EGLX11MockNavigation/src/OpenGLES2App.cpp -=================================================================== ---- git.orig/LayerManagerExamples/EGLX11MockNavigation/src/OpenGLES2App.cpp 2012-05-16 13:52:30.114057234 +0300 -+++ git/LayerManagerExamples/EGLX11MockNavigation/src/OpenGLES2App.cpp 2012-05-16 13:52:46.674056640 +0300 -@@ -28,6 +28,8 @@ - #include <math.h> - #include <sys/time.h> - -+#include <unistd.h> -+ - #define RUNTIME_IN_MS() (GetTickCount() - startTimeInMS) - - // Max width and height of the window diff --git a/recipes-graphics/layer-management/layer-management-0.9.9/point-to-internal-CMakeVersions.patch b/recipes-graphics/layer-management/layer-management-0.9.9/point-to-internal-CMakeVersions.patch deleted file mode 100644 index 5fd080f..0000000 --- a/recipes-graphics/layer-management/layer-management-0.9.9/point-to-internal-CMakeVersions.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: git/CMakeLists.txt -=================================================================== ---- git.orig/CMakeLists.txt 2012-02-16 13:02:02.257718578 +0200 -+++ git/CMakeLists.txt 2012-02-16 13:02:20.217968698 +0200 -@@ -22,7 +22,7 @@ - - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/") - --include(${CMAKE_MODULE_PATH}/CMakeVersions.txt) -+include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/CMakeVersions.txt) - - # set default build type, if not defined by user - if (NOT CMAKE_BUILD_TYPE) diff --git a/recipes-graphics/layer-management/layer-management_0.9.9.bb b/recipes-graphics/layer-management/layer-management_1.0.bb index 189bda4..b18fff5 100644 --- a/recipes-graphics/layer-management/layer-management_0.9.9.bb +++ b/recipes-graphics/layer-management/layer-management_1.0.bb @@ -7,12 +7,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=071e6b9a5eb9fc5868edf57ce153e5b9" DEPENDS = "virtual/egl dbus libxcomposite" -PR = "r2" - SRC_URI = " \ - git://git.projects.genivi.org/layer_management.git;protocol=git;tag=ivi-layer-management_version_0_9_9 \ - file://point-to-internal-CMakeVersions.patch \ - file://include-unistd-for-usleep-in-OpenGLES2App.patch \ + git://git.projects.genivi.org/layer_management.git;protocol=git;tag=1_0 \ file://layermanager.service \ " |