aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYong-iL Joh <yong-il.joh@windriver.com>2016-02-05 22:38:23 +0900
committerYong-iL Joh <yong-il.joh@windriver.com>2016-02-05 23:25:41 +0900
commita53c8781694e11d588dd3cc809ccf22f2f8b73e8 (patch)
treea0a538297a121c2a2edb0f0fb0abc97e045536a2
parent11ff4ea834832a4584753391ba12a3e9e78ba8a7 (diff)
downloadmeta-ivi-a53c8781694e11d588dd3cc809ccf22f2f8b73e8.tar.gz
meta-ivi-a53c8781694e11d588dd3cc809ccf22f2f8b73e8.tar.bz2
meta-ivi-a53c8781694e11d588dd3cc809ccf22f2f8b73e8.zip
weston: add xkeyboard-config as dependencies
remove workaround of libxkbcommon Signed-off-by: Yong-iL Joh <yong-il.joh@windriver.com>
-rw-r--r--meta-ivi-bsp/recipes-graphics/weston/weston_1.9.0.bbappend4
-rw-r--r--meta-ivi/recipes-graphics/wayland/weston_1.9.0.bbappend5
-rw-r--r--meta-ivi/recipes-graphics/xorg-lib/libxkbcommon/xkb-data.tar.gzbin49340 -> 0 bytes
-rw-r--r--meta-ivi/recipes-graphics/xorg-lib/libxkbcommon_%.bbappend16
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
deleted file mode 100644
index 85e06e3..0000000
--- a/meta-ivi/recipes-graphics/xorg-lib/libxkbcommon/xkb-data.tar.gz
+++ /dev/null
Binary files differ
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
-}