fix weston
authorRonan Le Martret <ronan@fridu.net>
Mon, 1 Dec 2014 14:46:25 +0000 (15:46 +0100)
committerRonan Le Martret <ronan@fridu.net>
Mon, 1 Dec 2014 17:07:51 +0000 (18:07 +0100)
Change-Id: I2b192ae3ced7158f454e46922408e647614221da

meta-tizen-common-base/recipes-graphics/weston/weston-extraconf.inc
meta-tizen-common-base/recipes-graphics/weston/weston.inc

index 974dd1f..d4ea6cb 100644 (file)
@@ -24,6 +24,8 @@ EXTRA_OECONF += "   \
 
 EXTRA_OECONF += "   --disable-rdp-compositor "
                     
+EXTRA_OECONF += "   --disable-dbus"
+
 do_configure_prepend() {
     sed -i 's/PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner)//' configure.ac
 }
@@ -31,11 +33,9 @@ do_configure_prepend() {
 pkg_preinst_${PN}() {
 }
 
-FILES_${PN} += "${prefix}/lib/weston/weston-keyboard"
-FILES_${PN} += "${prefix}/lib/weston/weston-desktop-shell"
+export libexecdir="${prefix}/libexec"
+
 FILES_${PN} += "${prefix}/lib/weston/cms-static.so"
-FILES_${PN} += "${prefix}/lib/weston/weston-screenshooter"
-FILES_${PN} += "${prefix}/lib/weston/weston-simple-im"
 
 FILES_${PN} += "${prefix}/bin/weston-scaler"
 FILES_${PN} += "${prefix}/bin/weston-stacking"
index 6e4a5a7..a59358a 100644 (file)
@@ -141,8 +141,6 @@ do_install() {
  install -m 755 weston-fullscreen ${D}${prefix}/bin
  
  
- install -d ${D}${prefix}/lib/systemd/user
- install -m 644 ${S}/packaging/weston.target ${D}${prefix}/lib/systemd/user/weston.target
  # The weston.service unit file must be provided by the weston-startup
  # virtual package, i.e. "Provide: weston-startup".  The weston-startup
  # virtual package requirement is intended to force Tizen profile
@@ -183,7 +181,6 @@ weston_files += "${prefix}/lib/weston/headless-backend.so"
 weston_files += "${prefix}/lib/weston/wayland-backend.so"
 weston_files += "${prefix}/lib/weston/gl-renderer.so"
 weston_files += "${prefix}/share/weston"
-weston_files += "${prefix}/lib/systemd/user/weston.target"
 MANIFESTFILES_${PN} = "weston.manifest"
 
 weston-clients_files = ""