meta-tizen: update weston and weston-common

Change-Id: If8423582ccf155fdf146ebcd7948f09488cc8b64
(From meta-tizen rev: a3278883cfaf98b1e8a12bcc52501e4a2162a6c1)

Signed-off-by: Ronan Le Martret <ronan@fridu.net>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

diff --git a/meta-tizen/meta-tizen-common-base/recipes-graphics/weston/weston.inc b/meta-tizen/meta-tizen-common-base/recipes-graphics/weston/weston.inc
index b062515..6e4a5a7 100644 (file)
--- a/meta-tizen/meta-tizen-common-base/recipes-graphics/weston/weston.inc
+++ b/meta-tizen/meta-tizen-common-base/recipes-graphics/weston/weston.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Wayland Compositor Infrastructure"
 HOMEPAGE = "http://weston.freedesktop.org/"
 SECTION = "Graphics & UI Framework/Wayland Window System"
 LICENSE = "MIT"
-PV = "1.5.0"
+PV = "1.6.0"
 
 SRC_URI = ""
 
@@ -42,6 +42,7 @@ DEPENDS += "expat"
 DEPENDS += "udev"
 DEPENDS += "libvpx"
 DEPENDS += "xz"
+DEPENDS += "libinput"
 DEPENDS_append_class-native = " automake-native"
 DEPENDS_append_class-target = " automake-native"
 DEPENDS += "mesa"
@@ -121,6 +122,7 @@ do_install() {
  install -m 755 weston-simple-touch ${D}${prefix}/bin
  install -m 755 weston-simple-shm ${D}${prefix}/bin
  install -m 755 weston-simple-egl ${D}${prefix}/bin
+ install -m 755 weston-simple-damage ${D}${prefix}/bin
  install -m 755 weston-nested-client ${D}${prefix}/bin
  install -m 755 weston-nested ${D}${prefix}/bin
  install -m 755 weston-flower ${D}${prefix}/bin
@@ -128,7 +130,9 @@ do_install() {
  install -m 755 weston-cliptest ${D}${prefix}/bin
  install -m 755 weston-dnd ${D}${prefix}/bin
  install -m 755 weston-editor ${D}${prefix}/bin
+ install -m 755 weston-stacking ${D}${prefix}/bin
  install -m 755 weston-smoke ${D}${prefix}/bin
+ install -m 755 weston-scaler ${D}${prefix}/bin
  install -m 755 weston-resizor ${D}${prefix}/bin
  install -m 755 weston-eventdemo ${D}${prefix}/bin
  install -m 755 weston-clickdot ${D}${prefix}/bin
@@ -186,6 +190,7 @@ weston-clients_files = ""
 weston-clients_files += "${prefix}/bin/weston-simple-touch"
 weston-clients_files += "${prefix}/bin/weston-simple-shm"
 weston-clients_files += "${prefix}/bin/weston-simple-egl"
+weston-clients_files += "${prefix}/bin/weston-simple-damage"
 weston-clients_files += "${prefix}/bin/weston-nested-client"
 weston-clients_files += "${prefix}/bin/weston-nested"
 weston-clients_files += "${prefix}/bin/weston-flower"
@@ -193,7 +198,9 @@ weston-clients_files += "${prefix}/bin/weston-image"
 weston-clients_files += "${prefix}/bin/weston-cliptest"
 weston-clients_files += "${prefix}/bin/weston-dnd"
 weston-clients_files += "${prefix}/bin/weston-editor"
+weston-clients_files += "${prefix}/bin/weston-stacking"
 weston-clients_files += "${prefix}/bin/weston-smoke"
+weston-clients_files += "${prefix}/bin/weston-scaler"
 weston-clients_files += "${prefix}/bin/weston-resizor"
 weston-clients_files += "${prefix}/bin/weston-eventdemo"
 weston-clients_files += "${prefix}/bin/weston-clickdot"

diff --git a/meta-tizen/meta-tizen-common-base/recipes-graphics/weston/weston_git.bb b/meta-tizen/meta-tizen-common-base/recipes-graphics/weston/weston_git.bb
index 7bfeace..401b3ca 100644 (file)
--- a/meta-tizen/meta-tizen-common-base/recipes-graphics/weston/weston_git.bb
+++ b/meta-tizen/meta-tizen-common-base/recipes-graphics/weston/weston_git.bb
@@ -4,7 +4,7 @@ PRIORITY = "10"
 
 LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
-SRC_URI += "git://review.tizen.org/platform/upstream/weston;tag=1a5eb4a432485c9c78b937f45115da36979921cf;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/upstream/weston;tag=e54320a932898e57be56b7e2ecdfde45f9f234ce;nobranch=1"
 
 BBCLASSEXTEND += " native "
 

diff --git a/meta-tizen/meta-tizen-common-demo/recipes-graphics/weston-common/weston-common-extraconf.inc b/meta-tizen/meta-tizen-common-demo/recipes-graphics/weston-common/weston-common-extraconf.inc
index c6d1fee..53f322e 100644 (file)
--- a/meta-tizen/meta-tizen-common-demo/recipes-graphics/weston-common/weston-common-extraconf.inc
+++ b/meta-tizen/meta-tizen-common-demo/recipes-graphics/weston-common/weston-common-extraconf.inc
@@ -18,29 +18,30 @@ GROUPADD_PARAM_${PN} += "--system -o weston-launch"
 do_install_append() {
     install -m 755 uid.sh ${D}/etc/profile.d
 
-    mkdir -p ${D}/lib/systemd/user/default.target.wants
-    ln -sf ../weston-user.service ${D}/lib/systemd/user/default.target.wants/weston-user.service
+    mkdir -p ${D}${prefix}/lib/systemd/user/default.target.requires
+    ln -sf ../weston-user.service ${D}${prefix}/lib/systemd/user/default.target.requires/weston-user.service
 
-    mkdir -p ${D}/lib/systemd/system/multi-user.target.wants
-    ln -sf ../user-session-launch@.service ${D}/lib/systemd/system/multi-user.target.wants/user-session-launch@seat0-5001.service
-    ln -sf ../user-session-launch@.service ${D}/lib/systemd/system/multi-user.target.wants/user-session-launch@seat0-5002.service
-    ln -sf ../user-session-launch@.service ${D}/lib/systemd/system/multi-user.target.wants/user-session-launch@seat0-5003.service
-    ln -sf ../user-session-launch@.service ${D}/lib/systemd/system/multi-user.target.wants/user-session-launch@seat0-9999.service
-    ln -sf ../user-session@.service ${D}/lib/systemd/system/multi-user.target.wants/user-session@5001.service
-    ln -sf ../user-session@.service ${D}/lib/systemd/system/multi-user.target.wants/user-session@5002.service
-    ln -sf ../user-session@.service ${D}/lib/systemd/system/multi-user.target.wants/user-session@5003.service
-    ln -sf ../user-session@.service ${D}/lib/systemd/system/multi-user.target.wants/user-session@9999.service
+    mkdir -p ${D}/lib/systemd/system/graphical.target.wants
+    ln -sf ../user-session-launch@.service ${D}/lib/systemd/system/graphical.target.wants/user-session-launch@seat0-5001.service
+    ln -sf ../user-session-launch@.service ${D}/lib/systemd/system/graphical.target.wants/user-session-launch@seat0-5002.service
+    ln -sf ../user-session-launch@.service ${D}/lib/systemd/system/graphical.target.wants/user-session-launch@seat0-5003.service
+    ln -sf ../user-session-launch@.service ${D}/lib/systemd/system/graphical.target.wants/user-session-launch@seat0-9999.service
+    ln -sf ../user-session@.service ${D}/lib/systemd/system/graphical.target.wants/user-session@5001.service
+    ln -sf ../user-session@.service ${D}/lib/systemd/system/graphical.target.wants/user-session@5002.service
+    ln -sf ../user-session@.service ${D}/lib/systemd/system/graphical.target.wants/user-session@5003.service
+    ln -sf ../user-session@.service ${D}/lib/systemd/system/graphical.target.wants/user-session@9999.service
 }
 
 pkg_preinst_${PN}() {
     #!/bin/sh -e
 
     # setup display manager service
-    mkdir -p /lib/systemd/system/graphical.target.wants/
-    ln -sf ../display-manager.path  /lib/systemd/system/graphical.target.wants/
+    mkdir -p $D${systemd_unitdir}/system/graphical.target.wants/
+    ln -sf ../display-manager.path  $D${systemd_unitdir}/system/graphical.target.wants/
     # setup display manager access (inside user session)
-    mkdir -p /lib/systemd/user/default.target.requires/
-    ln -sf ../weston-user.service  /lib/systemd/user/default.target.requires/
+    mkdir -p $D${prefix}/lib/systemd/user/default.target.requires/
+    ln -sf ../weston-user.service  $D${prefix}/lib/systemd/user/default.target.requires/
+
 }
 
 pkg_postinst_${PN} () {
@@ -51,16 +52,19 @@ pkg_postinst_${PN} () {
         find $D/home/$user/ -type d -exec chsmack -a User {} \;
         chown -R $user:users $D/home/$user/
     done
+    
+    SERVICE_PATH=$D/lib/systemd/system/user-session-launch@.service
+    grep -q display-manager.path $SERVICE_PATH || sed -i 's@systemd-logind.service@systemd-logind.service display-manager.path@g' $SERVICE_PATH
 }
 
-weston-common_files += "/lib/systemd/user/default.target.wants/weston-user.service"
+weston-common_files += "${prefix}/lib/systemd/user/default.target.requires/weston-user.service"
 weston-common_files += "/home/*"
 
-FILES_${PN} += "/lib/systemd/system/multi-user.target.wants/user-session-launch@seat0-5001.service"
-FILES_${PN} += "/lib/systemd/system/multi-user.target.wants/user-session-launch@seat0-5002.service"
-FILES_${PN} += "/lib/systemd/system/multi-user.target.wants/user-session-launch@seat0-5003.service"
-FILES_${PN} += "/lib/systemd/system/multi-user.target.wants/user-session-launch@seat0-9999.service"
-FILES_${PN} += "/lib/systemd/system/multi-user.target.wants/user-session@5001.service"
-FILES_${PN} += "/lib/systemd/system/multi-user.target.wants/user-session@5002.service"
-FILES_${PN} += "/lib/systemd/system/multi-user.target.wants/user-session@5003.service"
-FILES_${PN} += "/lib/systemd/system/multi-user.target.wants/user-session@9999.service"
+FILES_${PN} += "/lib/systemd/system/graphical.target.wants/user-session-launch@seat0-5001.service"
+FILES_${PN} += "/lib/systemd/system/graphical.target.wants/user-session-launch@seat0-5002.service"
+FILES_${PN} += "/lib/systemd/system/graphical.target.wants/user-session-launch@seat0-5003.service"
+FILES_${PN} += "/lib/systemd/system/graphical.target.wants/user-session-launch@seat0-9999.service"
+FILES_${PN} += "/lib/systemd/system/graphical.target.wants/user-session@5001.service"
+FILES_${PN} += "/lib/systemd/system/graphical.target.wants/user-session@5002.service"
+FILES_${PN} += "/lib/systemd/system/graphical.target.wants/user-session@5003.service"
+FILES_${PN} += "/lib/systemd/system/graphical.target.wants/user-session@9999.service"

diff --git a/meta-tizen/meta-tizen-common-demo/recipes-graphics/weston-common/weston-common.inc b/meta-tizen/meta-tizen-common-demo/recipes-graphics/weston-common/weston-common.inc
index d8c9919..67a74a6 100644 (file)
--- a/meta-tizen/meta-tizen-common-demo/recipes-graphics/weston-common/weston-common.inc
+++ b/meta-tizen/meta-tizen-common-demo/recipes-graphics/weston-common/weston-common.inc
@@ -173,8 +173,8 @@ pkg_preinst_${PN}() {
     groupmod -A display input
     groupmod -A display video
     # setup display manager service
-    mkdir -p ${systemd_unitdir}/system/graphical.target.wants/
-    ln -sf ../display-manager.path  ${systemd_unitdir}/system/graphical.target.wants/
+    mkdir -p $D${systemd_unitdir}/system/graphical.target.wants/
+    ln -sf ../display-manager.path  $D${systemd_unitdir}/system/graphical.target.wants/
     # setup display manager access (inside user session)
     mkdir -p $D${prefix}/lib/systemd/user/default.target.requires/
     ln -sf ../weston-user.service  $D${prefix}/lib/systemd/user/default.target.requires/
@@ -184,7 +184,7 @@ pkg_preinst_${PN}() {
 pkg_postrm_${PN}() {
     #!/bin/sh -e
 
-    rm -f ${systemd_unitdir}/system/graphical.target.wants/display-manager.path
+    rm -f $D${systemd_unitdir}/system/graphical.target.wants/display-manager.path
     rm -f $D${prefix}/lib/systemd/user/default.target.requires/weston-user.service
 
 }

diff --git a/meta-tizen/meta-tizen-common-demo/recipes-graphics/weston-common/weston-common_git.bb b/meta-tizen/meta-tizen-common-demo/recipes-graphics/weston-common/weston-common_git.bb
index f4aabac..0019813 100644 (file)
--- a/meta-tizen/meta-tizen-common-demo/recipes-graphics/weston-common/weston-common_git.bb
+++ b/meta-tizen/meta-tizen-common-demo/recipes-graphics/weston-common/weston-common_git.bb
@@ -4,7 +4,7 @@ PRIORITY = "10"
 
 LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
-SRC_URI += "git://review.tizen.org/profile/common/weston-common;tag=0e6dd7341730320a5e5f93f6829b396c9a3bf779;nobranch=1"
+SRC_URI += "git://review.tizen.org/profile/common/weston-common;tag=9d65c22f3814f85b6365dd81a5768dcff0bf60a2;nobranch=1"
 
 BBCLASSEXTEND += " native "