summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorZhai Edwin <edwin.zhai@intel.com>2012-01-04 22:30:51 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-05 22:19:22 +0000
commitc226ccb90624c6234c2a37a7d2c1adfeb2e98f51 (patch)
treeaa0c29b35749d0d3519f74bf870c8f1d4bf1f219 /meta/recipes-graphics
parent198f2ac06e60245750a2c6561b8c8e2eaa93f6be (diff)
downloadpoky-c226ccb90624c6234c2a37a7d2c1adfeb2e98f51.tar.gz
matchbox-wm: Remove x-session-manager handling
Windows manager should be independent on session manager, especially when we have multiple session manager like mini-x and matchbox session. This commit remove session-manager stuff in matchbox-wm, as matchbox-session already has duplicated code. Also adjust alternative priority for mini-X to make it higher priority over matchbox-session. (From OE-Core rev: c3400040fdce8c049b51a8acb06eb2e92f9426d1) Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb9
-rw-r--r--meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb9
-rw-r--r--meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb2
3 files changed, 5 insertions, 15 deletions
diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb b/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb
index 84b966a743..26283266ae 100644
--- a/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb
+++ b/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb
@@ -2,7 +2,7 @@ SECTION = "x11/wm"
2DESCRIPTION = "Matchbox window manager" 2DESCRIPTION = "Matchbox window manager"
3LICENSE = "GPLv2.0+" 3LICENSE = "GPLv2.0+"
4DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes xdamage libxrender startup-notification expat" 4DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes xdamage libxrender startup-notification expat"
5PR = "r4" 5PR = "r5"
6 6
7SRC_URI = "http://matchbox-project.org/sources/matchbox-window-manager/1.2/matchbox-window-manager-${PV}.tar.bz2 \ 7SRC_URI = "http://matchbox-project.org/sources/matchbox-window-manager/1.2/matchbox-window-manager-${PV}.tar.bz2 \
8 file://configure_fix.patch \ 8 file://configure_fix.patch \
@@ -11,7 +11,7 @@ SRC_URI = "http://matchbox-project.org/sources/matchbox-window-manager/1.2/match
11 11
12S = "${WORKDIR}/matchbox-window-manager-${PV}" 12S = "${WORKDIR}/matchbox-window-manager-${PV}"
13 13
14inherit autotools pkgconfig update-alternatives 14inherit autotools pkgconfig
15 15
16FILES_${PN} = "${bindir}/* \ 16FILES_${PN} = "${bindir}/* \
17 ${datadir}/matchbox \ 17 ${datadir}/matchbox \
@@ -20,11 +20,6 @@ FILES_${PN} = "${bindir}/* \
20 ${datadir}/themes/Default/matchbox \ 20 ${datadir}/themes/Default/matchbox \
21 ${datadir}/themes/MBOpus/matchbox" 21 ${datadir}/themes/MBOpus/matchbox"
22 22
23ALTERNATIVE_NAME = "x-session-manager"
24ALTERNATIVE_LINK = "${bindir}/x-session-manager"
25ALTERNATIVE_PATH = "${bindir}/matchbox-session"
26ALTERNATIVE_PRIORITY = "10"
27
28EXTRA_OECONF = " --enable-startup-notification \ 23EXTRA_OECONF = " --enable-startup-notification \
29 --disable-xrm \ 24 --disable-xrm \
30 --enable-expat \ 25 --enable-expat \
diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb b/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb
index 5550dc2b89..ef9cf761f7 100644
--- a/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb
+++ b/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb
@@ -12,7 +12,7 @@ DEPENDS = "libmatchbox virtual/libx11 libxext libxrender startup-notification ex
12 12
13SRCREV = "f4394eaed475de6e627d373c5b35ee2cf87072e3" 13SRCREV = "f4394eaed475de6e627d373c5b35ee2cf87072e3"
14PV = "1.2+git${SRCPV}" 14PV = "1.2+git${SRCPV}"
15PR = "r0" 15PR = "r1"
16 16
17SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager;protocol=git \ 17SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager;protocol=git \
18 file://configure_fix.patch;maxrev=1818 \ 18 file://configure_fix.patch;maxrev=1818 \
@@ -20,12 +20,7 @@ SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager;protocol=git \
20 20
21S = "${WORKDIR}/git" 21S = "${WORKDIR}/git"
22 22
23inherit autotools pkgconfig update-alternatives 23inherit autotools pkgconfig
24
25ALTERNATIVE_NAME = "x-session-manager"
26ALTERNATIVE_LINK = "${bindir}/x-session-manager"
27ALTERNATIVE_PATH = "${bindir}/matchbox-session"
28ALTERNATIVE_PRIORITY = "10"
29 24
30FILES_${PN} = "${bindir}/* \ 25FILES_${PN} = "${bindir}/* \
31 ${datadir}/matchbox \ 26 ${datadir}/matchbox \
diff --git a/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb b/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb
index 3818d16a3d..981865090b 100644
--- a/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb
+++ b/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb
@@ -16,7 +16,7 @@ inherit update-alternatives
16ALTERNATIVE_NAME = "x-session-manager" 16ALTERNATIVE_NAME = "x-session-manager"
17ALTERNATIVE_LINK = "${bindir}/x-session-manager" 17ALTERNATIVE_LINK = "${bindir}/x-session-manager"
18ALTERNATIVE_PATH = "${bindir}/mini-x-session" 18ALTERNATIVE_PATH = "${bindir}/mini-x-session"
19ALTERNATIVE_PRIORITY = "10" 19ALTERNATIVE_PRIORITY = "50"
20 20
21do_install() { 21do_install() {
22 install -d ${D}/${bindir} 22 install -d ${D}/${bindir}