Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/15 12:05:55+00:00 nexus.co.uk!pb
set PV and DEFAULT_PREFERENCE for libmatchbox

2005/01/15 12:05:11+00:00 nexus.co.uk!pb
set PV and DEFAULT_PREFERENCE for matchbox-desktop

2005/01/15 12:03:35+00:00 nexus.co.uk!pb
set PV and DEFAULT_PREFERENCE on matchbox-desktop

2005/01/15 11:58:32+00:00 nexus.co.uk!pb
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into stealth.nexus.co.uk:/home/pb/oe/oe

2005/01/15 11:58:05+00:00 nexus.co.uk!pb
set PV and DEFAULT_PREFERENCE for matchbox-wm_svn

BKrev: 41e90f2bkRFn1lZCnpfnXPjB11WU5A

diff --git a/packages/libmatchbox/libmatchbox_svn.bb b/packages/libmatchbox/libmatchbox_svn.bb
index e69de29..8aeac87 100644 (file)
--- a/packages/libmatchbox/libmatchbox_svn.bb
+++ b/packages/libmatchbox/libmatchbox_svn.bb
@@ -0,0 +1,32 @@
+SECTION = "x11/libs"
+DESCRIPTION = "Matchbox window manager core library"
+LICENSE = "GPL"
+DEPENDS = "x11 xext libxft pango jpeg libpng zlib libxsettings-client"
+PV = "1.5cvs${CVSDATE}"
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http\
+               file://check.m4"
+inherit autotools  pkgconfig
+
+EXTRA_OECONF = "--enable-jpeg --enable-pango --enable-xsettings"
+
+S = ${WORKDIR}/${PN}
+
+headers = "hash.h mbconfig.h mbdotdesktop.h mbexp.h \
+          mb.h mbmenu.h mbpixbuf.h mbtray.h mbutil.h"
+
+do_configure_prepend () {
+        mv ${WORKDIR}/check.m4 ${S}/
+}
+
+
+
+do_stage () {
+       install -d ${STAGING_INCDIR}/libmb
+       for h in ${headers}; do
+               install -m 0644 ${S}/libmb/$h ${STAGING_INCDIR}/libmb/
+       done
+
+       oe_libinstall -a -so -C libmb libmb ${STAGING_LIBDIR}
+}

diff --git a/packages/matchbox-desktop/matchbox-desktop_svn.bb b/packages/matchbox-desktop/matchbox-desktop_svn.bb
index e69de29..9634c49 100644 (file)
--- a/packages/matchbox-desktop/matchbox-desktop_svn.bb
+++ b/packages/matchbox-desktop/matchbox-desktop_svn.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "Matchbox Window Manager Desktop"
+LICENSE = "GPL"
+DEPENDS = "libmatchbox startup-notification"
+SECTION = "x11/wm"
+PV = "0.9cvs${CVSDATE}"
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
+
+EXTRA_OECONF = "--enable-startup-notification --enable-dnotify"
+
+S = ${WORKDIR}/${PN}
+
+inherit autotools pkgconfig
+
+FILES_${PN} = "${bindir} \
+              ${datadir}/applications \
+              ${libdir}/matchbox/desktop/*.so \
+              ${datadir}/matchbox-desktop \
+              ${datadir}/pixmaps \
+              ${sysconfdir}/matchbox"
+
+FILES_${PN}-dev = "${libdir}/matchbox-desktop \
+                  ${includedir}/matchbox-desktop \
+                  ${datadir}/matchbox/desktop/modules/*a"

diff --git a/packages/matchbox-panel/matchbox-panel_svn.bb b/packages/matchbox-panel/matchbox-panel_svn.bb
index e69de29..71fa656 100644 (file)
--- a/packages/matchbox-panel/matchbox-panel_svn.bb
+++ b/packages/matchbox-panel/matchbox-panel_svn.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "Matchbox Window Manager Panel"
+LICENSE = "GPL"
+DEPENDS = "libmatchbox x11 xext xpm apmd startup-notification virtual/kernel"
+SECTION = "x11/wm"
+PV = "0.9cvs${CVSDATE}"
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
+
+S = ${WORKDIR}/${PN}
+
+inherit autotools pkgconfig gettext
+
+EXTRA_OECONF = "--enable-startup-notification --enable-dnotify --enable-small-icons"
+
+FILES_${PN} = "${bindir} \
+              ${datadir}/applications \
+              ${datadir}/pixmaps"
+

diff --git a/packages/matchbox-wm/matchbox-wm_svn.bb b/packages/matchbox-wm/matchbox-wm_svn.bb
index e69de29..d9148d4 100644 (file)
--- a/packages/matchbox-wm/matchbox-wm_svn.bb
+++ b/packages/matchbox-wm/matchbox-wm_svn.bb
@@ -0,0 +1,29 @@
+SECTION = "x11/wm"
+DESCRIPTION = "Matchbox window manager"
+LICENSE = "GPL"
+DEPENDS = "libmatchbox x11 xext xcomposite libxfixes xdamage libxrender startup-notification expat gconf matchbox-common"
+RDEPENDS = "matchbox-common"
+PV = "0.9cvs${CVSDATE}"
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-window-manager;proto=http"
+
+S = "${WORKDIR}/matchbox-window-manager"
+
+inherit autotools  pkgconfig
+
+FILES_${PN} = "${bindir} \
+              ${datadir}/matchbox \
+              ${datadir}/themes/blondie/matchbox \
+              ${datadir}/themes/bluebox/matchbox \
+              ${datadir}/themes/borillo/matchbox"
+
+EXTRA_OECONF = "--enable-composite --enable-startup-notification --enable-expat"
+
+pkg_postinst() {
+update-alternatives --install /usr/bin/x-window-manager x-window-manager /usr/bin/matchbox-session 10
+}
+
+pkg_postrm() {
+update-alternatives --remove x-window-manager /usr/bin/matchbox-session
+}