aboutsummaryrefslogtreecommitdiffstats
path: root/meta-ivi-common/recipes-graphics/wayland
diff options
context:
space:
mode:
Diffstat (limited to 'meta-ivi-common/recipes-graphics/wayland')
-rw-r--r--meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension/0001-Fix-ivi-application-lib-install.patch30
-rw-r--r--meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension_1.11.0.bb4
-rwxr-xr-xmeta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension_1.11.0.bbappend10
3 files changed, 4 insertions, 40 deletions
diff --git a/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension/0001-Fix-ivi-application-lib-install.patch b/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension/0001-Fix-ivi-application-lib-install.patch
deleted file mode 100644
index 4140ce576..000000000
--- a/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension/0001-Fix-ivi-application-lib-install.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 1e13c6d494a8b542c2a7f8251afc7aec401e3ad8 Mon Sep 17 00:00:00 2001
-From: Ronan Le Martret <ronan.lemartret@iot.bzh>
-Date: Tue, 7 Feb 2017 17:13:47 +0100
-Subject: [PATCH] Fix ivi-application lib install
-
- * libivi-application.so must be a link to
- libivi-application.so.X.X.XX
- * fix yocto package QA
-
-Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
----
- protocol/CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/protocol/CMakeLists.txt b/protocol/CMakeLists.txt
-index 613a1a6..09d5126 100644
---- a/protocol/CMakeLists.txt
-+++ b/protocol/CMakeLists.txt
-@@ -170,6 +170,8 @@ install(
- DESTINATION include/ilm
- )
-
-+SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES VERSION ${ILM_API_VERSION} SOVERSION ${ILM_API_VERSION})
-+
- #=============================================================================================
- # generate documentation for ivi-application API
- #=============================================================================================
---
-2.6.6
-
diff --git a/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension_1.11.0.bb b/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension_1.11.0.bb
index 581cc5b13..0ed8d9c7c 100644
--- a/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension_1.11.0.bb
+++ b/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension_1.11.0.bb
@@ -5,12 +5,12 @@ BUGTRACKER = "http://bugs.genivi.org/enter_bug.cgi?product=Wayland%20IVI%20Exten
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=1f1a56bb2dadf5f2be8eb342acf4ed79"
-SRCREV = "c9001582b10ce209c37b42dd560947c5aa8928b3"
+SRCREV = "3ebb7b74e60a35d549284e7f77183de66bef18e0"
SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=http \
"
S = "${WORKDIR}/git"
-DEPENDS = "weston virtual/libgles2 pixman"
+DEPENDS = "weston virtual/libgles2 pixman wayland-native"
inherit cmake
diff --git a/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension_1.11.0.bbappend b/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension_1.11.0.bbappend
index 6e0789f26..9508dc6d1 100755
--- a/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension_1.11.0.bbappend
+++ b/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension_1.11.0.bbappend
@@ -1,12 +1,6 @@
FILESEXTRAPATHS_prepend := ":${THISDIR}/wayland-ivi-extension:"
-
-SRC_URI_append = " \
- file://0001-Fix-ivi-application-lib-install.patch \
- "
-
-SRC_URI_append_wandboard = "file://wandboard_fix_build.patch"
-
+SRC_URI_append_wandboard = " file://wandboard_fix_build.patch"
# workaround paralellism issue:
-PARALLEL_MAKE = "" \ No newline at end of file
+PARALLEL_MAKE = ""