diff options
-rw-r--r-- | meta-ivi-bsp/recipes-graphics/weston/weston_1.9.0.bbappend | 4 | ||||
-rw-r--r-- | meta-ivi/recipes-graphics/wayland/weston_1.9.0.bbappend | 5 | ||||
-rw-r--r-- | meta-ivi/recipes-graphics/xorg-lib/libxkbcommon/xkb-data.tar.gz | bin | 49340 -> 0 bytes | |||
-rw-r--r-- | meta-ivi/recipes-graphics/xorg-lib/libxkbcommon_%.bbappend | 16 |
4 files changed, 5 insertions, 20 deletions
diff --git a/meta-ivi-bsp/recipes-graphics/weston/weston_1.9.0.bbappend b/meta-ivi-bsp/recipes-graphics/weston/weston_1.9.0.bbappend index 2417d75..5672485 100644 --- a/meta-ivi-bsp/recipes-graphics/weston/weston_1.9.0.bbappend +++ b/meta-ivi-bsp/recipes-graphics/weston/weston_1.9.0.bbappend @@ -1,5 +1,3 @@ -PR = "r2" - EXTRA_OECONF_append_vexpressa9 = "\ WESTON_NATIVE_BACKEND=fbdev-backend.so \ " @@ -9,5 +7,5 @@ PKG_MESA_qemux86-64 = "mesa-megadriver " PKG_MESA_vexpressa9 = "mesa-megadriver " PKG_MESA ?= " " -RDEPENDS_${PN} = "${PKG_MESA} \ +RDEPENDS_${PN} += "${PKG_MESA} \ " diff --git a/meta-ivi/recipes-graphics/wayland/weston_1.9.0.bbappend b/meta-ivi/recipes-graphics/wayland/weston_1.9.0.bbappend index 0272ec7..ecb4099 100644 --- a/meta-ivi/recipes-graphics/wayland/weston_1.9.0.bbappend +++ b/meta-ivi/recipes-graphics/wayland/weston_1.9.0.bbappend @@ -1,4 +1,7 @@ -PR = "r2" +PR = "r3" + +DEPENDS += "xkeyboard-config" +RDEPENDS_${PN} += "xkeyboard-config" FILES_${PN} += "${libdir}/weston/* ${sysconfdir}/xdg" FILES_${PN}-dbg += "${libdir}/weston/.debug/*" diff --git a/meta-ivi/recipes-graphics/xorg-lib/libxkbcommon/xkb-data.tar.gz b/meta-ivi/recipes-graphics/xorg-lib/libxkbcommon/xkb-data.tar.gz Binary files differdeleted file mode 100644 index 85e06e3..0000000 --- a/meta-ivi/recipes-graphics/xorg-lib/libxkbcommon/xkb-data.tar.gz +++ /dev/null diff --git a/meta-ivi/recipes-graphics/xorg-lib/libxkbcommon_%.bbappend b/meta-ivi/recipes-graphics/xorg-lib/libxkbcommon_%.bbappend deleted file mode 100644 index 1a749a8..0000000 --- a/meta-ivi/recipes-graphics/xorg-lib/libxkbcommon_%.bbappend +++ /dev/null @@ -1,16 +0,0 @@ -PR = "r1" - -FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" -SRC_URI_append += "\ - file://xkb-data.tar.gz \ - " - -FILES_${PN} += "/usr/share/X11/xkb/*" - -do_install_append() { - for i in keycodes rules symbols types compat keycodes; do - install -d ${D}/usr/share/X11/xkb/$i - install -m 0644 ${WORKDIR}/xkb-data/${i}/* \ - ${D}/usr/share/X11/xkb/$i - done -} |