aboutsummaryrefslogtreecommitdiffstats
path: root/meta-ivi/recipes-graphics/wayland
diff options
context:
space:
mode:
authorAndrei Gherzan <andrei.gherzan@windriver.com>2014-10-06 11:26:21 +0200
committerAndrei Gherzan <andrei.gherzan@windriver.com>2014-10-06 16:04:33 +0200
commit2e81da00c013752ce2e8e19ff9252c74176310f9 (patch)
treed963c7a355b6f6ff520ad51c9ded9386d8883430 /meta-ivi/recipes-graphics/wayland
parenta45ca362e7272235259e534d1eb8bb1ab475425f (diff)
downloadmeta-ivi-2e81da00c013752ce2e8e19ff9252c74176310f9.zip
meta-ivi-2e81da00c013752ce2e8e19ff9252c74176310f9.tar.gz
meta-ivi-2e81da00c013752ce2e8e19ff9252c74176310f9.tar.bz2
wayland-ivi-extension: Update from 1.2.0-rc7 to 1.2.0
Rebase use_sysroot_dir.patch. Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
Diffstat (limited to 'meta-ivi/recipes-graphics/wayland')
-rw-r--r--meta-ivi/recipes-graphics/wayland/wayland-ivi-extension/use_sysroot_dir.patch10
-rw-r--r--meta-ivi/recipes-graphics/wayland/wayland-ivi-extension_1.2.0.bb (renamed from meta-ivi/recipes-graphics/wayland/wayland-ivi-extension_1.2.0_rc7.bb)5
2 files changed, 6 insertions, 9 deletions
diff --git a/meta-ivi/recipes-graphics/wayland/wayland-ivi-extension/use_sysroot_dir.patch b/meta-ivi/recipes-graphics/wayland/wayland-ivi-extension/use_sysroot_dir.patch
index 8811879..17dbb9e 100644
--- a/meta-ivi/recipes-graphics/wayland/wayland-ivi-extension/use_sysroot_dir.patch
+++ b/meta-ivi/recipes-graphics/wayland/wayland-ivi-extension/use_sysroot_dir.patch
@@ -1,13 +1,13 @@
Index: git/weston-ivi-shell/CMakeLists.txt
===================================================================
---- git.orig/weston-ivi-shell/CMakeLists.txt 2014-04-04 00:15:43.000000000 +0300
-+++ git/weston-ivi-shell/CMakeLists.txt 2014-04-04 00:16:20.000000000 +0300
-@@ -44,7 +44,7 @@
+--- git.orig/weston-ivi-shell/CMakeLists.txt
++++ git/weston-ivi-shell/CMakeLists.txt
+@@ -49,7 +49,7 @@ link_directories(
${CAIRO_LIBRARY_DIRS}
${WESTON_LIBRARY_DIRS}
${PIXMAN_LIBRARY_DIRS}
- ${WESTON_LIBDIR}/weston
+ =${WESTON_LIBDIR}/weston
+ ${EGL_LIBRARY_DIRS}
+ ${GLES_LIBRARY_DIRS}
)
-
-
diff --git a/meta-ivi/recipes-graphics/wayland/wayland-ivi-extension_1.2.0_rc7.bb b/meta-ivi/recipes-graphics/wayland/wayland-ivi-extension_1.2.0.bb
index 73e5266..fdc7c50 100644
--- a/meta-ivi/recipes-graphics/wayland/wayland-ivi-extension_1.2.0_rc7.bb
+++ b/meta-ivi/recipes-graphics/wayland/wayland-ivi-extension_1.2.0.bb
@@ -7,17 +7,14 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=176cedb32f48dd58f07e0c1c717b3ea4"
DEPENDS = "weston"
-PV = "1.2.0-rc7+git${SRCPV}"
-
SRC_URI = "git://git.projects.genivi.org/wayland-ivi-extension.git \
file://use_sysroot_dir.patch \
file://fix_compositor_include.patch \
"
-SRCREV = "6ee4b2e418bd6c0c9fd21ff7195faff3875da1e8"
+SRCREV = "278437417d1ac0958a800eecfebd2a388d6d9ca7"
S = "${WORKDIR}/git"
inherit cmake autotools
FILES_${PN} += "${libdir}/weston/*"
FILES_${PN}-dbg += "${libdir}/weston/.debug/*"
-