diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-11-15 14:21:12 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-11-15 14:21:12 +0000 |
| commit | f8e955ce1273510dd52eb2f9fa59b74d5ad89a89 (patch) | |
| tree | 4080576b9068eeb2456e974a68f59ba4a8ed02cd | |
| parent | e881f1ce27495bb0e280c76e711cc7208c3a9ebc (diff) | |
| parent | 3515feb8a17b9d84bee4d11191842223ce6f76a6 (diff) | |
merge of '353324dd9a65b594eaee01782ae8aa085ae87b9a'
and '5a50d1d54a36230e32c94701cae6d541b1ff2707'
| -rw-r--r-- | packages/matchbox-common/matchbox-common_0.9.1.bb | 10 | ||||
| -rw-r--r-- | packages/matchbox-wm/matchbox-wm_1.2.bb | 4 | ||||
| -rw-r--r-- | packages/navit/navit_cvs.bb | 19 |
3 files changed, 29 insertions, 4 deletions
diff --git a/packages/matchbox-common/matchbox-common_0.9.1.bb b/packages/matchbox-common/matchbox-common_0.9.1.bb index fa6e989b16..ca68003b94 100644 --- a/packages/matchbox-common/matchbox-common_0.9.1.bb +++ b/packages/matchbox-common/matchbox-common_0.9.1.bb @@ -2,13 +2,13 @@ DESCRIPTION = "Matchbox window manager common files" SECTION = "x11/wm" LICENSE = "GPL" DEPENDS = "libmatchbox" -PR = "r3" +PR = "r4" SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz \ file://no-utilities-category.patch;patch=1 \ file://add-media-category.patch;patch=1" -inherit autotools pkgconfig +inherit autotools pkgconfig update-alternatives EXTRA_OECONF = "--enable-pda-folders" @@ -17,4 +17,10 @@ FILES_${PN} = "\ ${datadir}/matchbox/vfolders \ ${datadir}/pixmaps" +ALTERNATIVE_NAME = "x-window-manager" +ALTERNATIVE_LINK = "${bindir}/x-window-manager" +ALTERNATIVE_PATH = "${bindir}/matchbox-window-manager" +ALTERNATIVE_PRIORITY = "11" + + PACKAGE_ARCH = "all" diff --git a/packages/matchbox-wm/matchbox-wm_1.2.bb b/packages/matchbox-wm/matchbox-wm_1.2.bb index bf3587696f..bf57441815 100644 --- a/packages/matchbox-wm/matchbox-wm_1.2.bb +++ b/packages/matchbox-wm/matchbox-wm_1.2.bb @@ -3,7 +3,7 @@ require matchbox-wm.inc DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf gconf-native " RDEPENDS = "" -PR="r2" +PR="r3" SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/1.2/matchbox-window-manager-${PV}.tar.bz2 \ file://gconf-2.m4 \ @@ -23,7 +23,7 @@ FILES_${PN} = "${bindir}/* \ ALTERNATIVE_NAME = "x-window-manager" ALTERNATIVE_LINK = "${bindir}/x-window-manager" -ALTERNATIVE_PATH = "${bindir}/matchbox-session" +ALTERNATIVE_PATH = "${bindir}/matchbox-window-manager" ALTERNATIVE_PRIORITY = "10" EXTRA_OECONF = " \ diff --git a/packages/navit/navit_cvs.bb b/packages/navit/navit_cvs.bb new file mode 100644 index 0000000000..8f158d4f79 --- /dev/null +++ b/packages/navit/navit_cvs.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Navit is a car navigation system with routing engine." +LICENSE = "GPL" +DEPENDS = "glib-2.0 gtk+" +PV = "0.0.2+cvs${SRCDATE}" +PR = "r0" + +inherit autotools +S = "${WORKDIR}/navit" + +SRC_URI = "cvs://anonymous@navit.cvs.sourceforge.net/cvsroot/navit;module=navit \ + " + +EXTRA_OECONF = "--disable-binding-python --disable-gui-sdl --disable-samplemap --enable-avoid-float --enable-avoid-unaligned" +#--enable-shared + +EXTRA_AUTORECONF = " -I m4" + +FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug" + |