From 53beaa604a965588f6455cd1981ed3a84662a4ff Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 27 Mar 2013 17:53:31 +0000 Subject: weston: upgrade to 1.0.6 (From OE-Core rev: 58924fe567963c0e6cead3e75a2cfd5b2252aefd) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-graphics/wayland/weston_1.0.3.bb | 55 --------------------------- meta/recipes-graphics/wayland/weston_1.0.6.bb | 55 +++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 55 deletions(-) delete mode 100644 meta/recipes-graphics/wayland/weston_1.0.3.bb create mode 100644 meta/recipes-graphics/wayland/weston_1.0.6.bb (limited to 'meta/recipes-graphics') diff --git a/meta/recipes-graphics/wayland/weston_1.0.3.bb b/meta/recipes-graphics/wayland/weston_1.0.3.bb deleted file mode 100644 index f769312f32..0000000000 --- a/meta/recipes-graphics/wayland/weston_1.0.3.bb +++ /dev/null @@ -1,55 +0,0 @@ -SUMMARY = "Weston, a Wayland compositor" -DESCRIPTION = "Weston is the reference implementation of a Wayland compositor" -HOMEPAGE = "http://wayland.freedesktop.org" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=275efac2559a224527bd4fd593d38466 \ - file://src/compositor.c;endline=23;md5=aa98a8db03480fe7d500d0b1f4b8850c" - -SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ - file://weston.png \ - file://weston.desktop" -SRC_URI[md5sum] = "f82ac2e013e6b6a6303ac4ba7b64c7f2" -SRC_URI[sha256sum] = "3136a7d2f654ea3e946d4217f7e25321248ad2921f1f4e2504dda58968e04853" - -inherit autotools pkgconfig - -DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 mtdev jpeg" -DEPENDS += "wayland mesa virtual/egl" - -EXTRA_OECONF = "--disable-android-compositor --enable-setuid-install" -EXTRA_OECONF += "--disable-tablet-shell --disable-xwayland" -EXTRA_OECONF += "--enable-simple-clients --enable-clients --disable-simple-egl-clients" - -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms wayland', '', d)} \ - ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ - ${@base_contains('DISTRO_FEATURES', 'opengles2', 'gles', '', d)} \ - " -# Weston on KMS -PACKAGECONFIG[kms] = "--enable-drm-compositor --enable-weston-launch,--disable-drm-compositor --disable-weston-launch,drm udev mesa libpam" -# Weston on Wayland (nested Weston) -PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-wayland-compositor,mesa" -# Weston on X11 -PACKAGECONFIG[x11] = "--enable-x11-compositor,--disable-x11-compositor,virtual/libx11 libxcb libxcb libxcursor cairo" - -PACKAGECONFIG[gles] = "--with-cairo-glesv2,,virtual/libgles2" - -do_install_append() { - # Weston doesn't need the .la files to load modules, so wipe them - rm -f ${D}/${libdir}/weston/*.la - - for feature in ${DISTRO_FEATURES}; do - # If X11, ship a desktop file to launch it - if [ "$feature" = "x11" ]; then - install -d ${D}${datadir}/applications - install ${WORKDIR}/weston.desktop ${D}${datadir}/applications - - install -d ${D}${datadir}/icons/hicolor/48x48/apps - install ${WORKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps - fi - done -} - -FILES_${PN} += "${datadir}/applications ${datadir}/icons" - -RDEPENDS_${PN} += "xkeyboard-config" -RRECOMMENDS_${PN} = "liberation-fonts" diff --git a/meta/recipes-graphics/wayland/weston_1.0.6.bb b/meta/recipes-graphics/wayland/weston_1.0.6.bb new file mode 100644 index 0000000000..cb41e05c46 --- /dev/null +++ b/meta/recipes-graphics/wayland/weston_1.0.6.bb @@ -0,0 +1,55 @@ +SUMMARY = "Weston, a Wayland compositor" +DESCRIPTION = "Weston is the reference implementation of a Wayland compositor" +HOMEPAGE = "http://wayland.freedesktop.org" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=275efac2559a224527bd4fd593d38466 \ + file://src/compositor.c;endline=23;md5=aa98a8db03480fe7d500d0b1f4b8850c" + +SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ + file://weston.png \ + file://weston.desktop" +SRC_URI[md5sum] = "63202129d66d5514e572814da5dfa1f7" +SRC_URI[sha256sum] = "c833bc4dc8667561d2639b57220541531c039aa9332ce2a7022a3c466eb894f1" + +inherit autotools pkgconfig + +DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 mtdev jpeg" +DEPENDS += "wayland mesa virtual/egl" + +EXTRA_OECONF = "--disable-android-compositor --enable-setuid-install" +EXTRA_OECONF += "--disable-tablet-shell --disable-xwayland" +EXTRA_OECONF += "--enable-simple-clients --enable-clients --disable-simple-egl-clients" + +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms wayland', '', d)} \ + ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ + ${@base_contains('DISTRO_FEATURES', 'opengles2', 'gles', '', d)} \ + " +# Weston on KMS +PACKAGECONFIG[kms] = "--enable-drm-compositor --enable-weston-launch,--disable-drm-compositor --disable-weston-launch,drm udev mesa libpam" +# Weston on Wayland (nested Weston) +PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-wayland-compositor,mesa" +# Weston on X11 +PACKAGECONFIG[x11] = "--enable-x11-compositor,--disable-x11-compositor,virtual/libx11 libxcb libxcb libxcursor cairo" + +PACKAGECONFIG[gles] = "--with-cairo-glesv2,,virtual/libgles2" + +do_install_append() { + # Weston doesn't need the .la files to load modules, so wipe them + rm -f ${D}/${libdir}/weston/*.la + + for feature in ${DISTRO_FEATURES}; do + # If X11, ship a desktop file to launch it + if [ "$feature" = "x11" ]; then + install -d ${D}${datadir}/applications + install ${WORKDIR}/weston.desktop ${D}${datadir}/applications + + install -d ${D}${datadir}/icons/hicolor/48x48/apps + install ${WORKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps + fi + done +} + +FILES_${PN} += "${datadir}/applications ${datadir}/icons" + +RDEPENDS_${PN} += "xkeyboard-config" +RRECOMMENDS_${PN} = "liberation-fonts" -- cgit v1.2.3-54-g00ecf