aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYong-iL Joh <yong-il.joh@windriver.com>2016-01-28 18:44:16 +0900
committerYong-iL Joh <yong-il.joh@windriver.com>2016-01-28 18:44:16 +0900
commit58708cd15fb57aa805b5ba1f2a99bf37160b184c (patch)
tree0ff71d8c767b899fda1bcc8109c33e771084284e
parentbff314122594f3baa24040c13a6a15152fa6570c (diff)
downloadmeta-ivi-58708cd15fb57aa805b5ba1f2a99bf37160b184c.tar.gz
meta-ivi-58708cd15fb57aa805b5ba1f2a99bf37160b184c.tar.bz2
meta-ivi-58708cd15fb57aa805b5ba1f2a99bf37160b184c.zip
wayland-ivi-extension: trying to enable ivi-input-controller.so
Signed-off-by: Yong-iL Joh <yong-il.joh@windriver.com>
-rw-r--r--meta-ivi/recipes-graphics/wayland/wayland-ivi-extension/remove_compile-host-path_issue.patch17
-rw-r--r--meta-ivi/recipes-graphics/wayland/wayland-ivi-extension_1.9.0.bb8
2 files changed, 25 insertions, 0 deletions
diff --git a/meta-ivi/recipes-graphics/wayland/wayland-ivi-extension/remove_compile-host-path_issue.patch b/meta-ivi/recipes-graphics/wayland/wayland-ivi-extension/remove_compile-host-path_issue.patch
new file mode 100644
index 0000000..6849d2a
--- /dev/null
+++ b/meta-ivi/recipes-graphics/wayland/wayland-ivi-extension/remove_compile-host-path_issue.patch
@@ -0,0 +1,17 @@
+--- git/ivi-input-modules/ivi-input-controller/CMakeLists.txt.orig 2016-01-28 18:19:37.297557498 +0900
++++ git/ivi-input-modules/ivi-input-controller/CMakeLists.txt 2016-01-28 18:20:01.249558101 +0900
+@@ -37,14 +37,12 @@
+ ${IVI_CONTROLLER_INCLUDE_DIRS}
+ ${WAYLAND_SERVER_INCLUDE_DIRS}
+ ${WESTON_INCLUDE_DIRS}
+- ${WESTON_INCLUDE_DIRS}/weston
+ ${PIXMAN_INCLUDE_DIRS}
+ )
+
+ link_directories(
+ ${WAYLAND_SERVER_LIBRARY_DIRS}
+ ${WESTON_LIBRARY_DIRS}
+- ${WESTON_LIBDIR}/weston
+ ${PIXMAN_LIBRARY_DIRS}
+ )
+
diff --git a/meta-ivi/recipes-graphics/wayland/wayland-ivi-extension_1.9.0.bb b/meta-ivi/recipes-graphics/wayland/wayland-ivi-extension_1.9.0.bb
index f804e52..21864e9 100644
--- a/meta-ivi/recipes-graphics/wayland/wayland-ivi-extension_1.9.0.bb
+++ b/meta-ivi/recipes-graphics/wayland/wayland-ivi-extension_1.9.0.bb
@@ -14,5 +14,13 @@ S = "${WORKDIR}/git"
inherit cmake autotools
+EXTRA_OECMAKE := "-DWITH_ILM_INPUT=1"
+
FILES_${PN} += "${libdir}/weston/*"
FILES_${PN}-dbg += "${libdir}/weston/.debug/*"
+
+# for testing
+SRC_URI_append += "file://remove_compile-host-path_issue.patch "
+DEPENDS += " gtest"
+EXTRA_OECMAKE += " -DBUILD_ILM_API_TESTS=1 -DINSTALL_ILM_API_TESTS=1"
+FILES_${PN} += " ${bindir}/*"