summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2008-01-15 00:41:33 +0000
committerMichael Lauer <mickey@vanille-media.de>2008-01-15 00:41:33 +0000
commite6fe69cb29fbe5f96d8e9506fe2b580aba5ebcd3 (patch)
tree6eb936a4f6ba17cec6dd3bc90174777b9e1521c6
parent920e841aa9653c915942db6fb22f4b45fc9d1dd3 (diff)
parent078a12528f103864e5f8bc02149ff17c802a990a (diff)
merge of '213c582b00d27a563e968bbcd4a9c276301fc7cc'
and '25cb2cebe575eb9cbee3dab1ae0fa81368eb3bc6'
-rw-r--r--classes/cmake.bbclass7
-rw-r--r--packages/musicbrainz/libmusicbrainz_3.0.1.bb4
-rw-r--r--packages/openmoko2/settingsgui_0.7+0.8-beta.bb11
-rw-r--r--packages/tasks/task-openmoko-feed.bb3
4 files changed, 22 insertions, 3 deletions
diff --git a/classes/cmake.bbclass b/classes/cmake.bbclass
new file mode 100644
index 0000000000..cec74349dc
--- /dev/null
+++ b/classes/cmake.bbclass
@@ -0,0 +1,7 @@
+inherit autotools
+
+cmake_do_configure() {
+ cmake . -DCMAKE_INSTALL_PREFIX:PATH=${prefix}
+}
+
+EXPORT_FUNCTIONS do_configure
diff --git a/packages/musicbrainz/libmusicbrainz_3.0.1.bb b/packages/musicbrainz/libmusicbrainz_3.0.1.bb
index 51717f052d..e01695eb3d 100644
--- a/packages/musicbrainz/libmusicbrainz_3.0.1.bb
+++ b/packages/musicbrainz/libmusicbrainz_3.0.1.bb
@@ -4,11 +4,11 @@ DESCRIPTION = "The MusicBrainz client is a library which can be built into other
It allows you to access the data held on the MusicBrainz server."
HOMEPAGE = "http://musicbrainz.org"
LICENSE = "LGPL"
-DEPENDS = "expat"
+DEPENDS = "expat neon"
SRC_URI = "http://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-${PV}.tar.gz"
-inherit autotools pkgconfig
+inherit cmake pkgconfig
do_stage() {
autotools_stage_all
diff --git a/packages/openmoko2/settingsgui_0.7+0.8-beta.bb b/packages/openmoko2/settingsgui_0.7+0.8-beta.bb
new file mode 100644
index 0000000000..502fad7309
--- /dev/null
+++ b/packages/openmoko2/settingsgui_0.7+0.8-beta.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "OpenMoko Settings GUI"
+AUTHOR = "Kristian M."
+SECTION = "openmoko/applications"
+RDEPENDS = "python-pygtk python-subprocess python-threading"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://mput.de/~kristian/.openmoko/settingsgui-0.8-beta.tar.bz2"
+S = "${WORKDIR}/settingsgui-0.8-beta"
+
+inherit distutils
diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb
index 49ab41054e..9c834142e3 100644
--- a/packages/tasks/task-openmoko-feed.bb
+++ b/packages/tasks/task-openmoko-feed.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "OpenMoko: Misc. Feed Items"
SECTION = "openmoko/base"
LICENSE = "MIT"
-PR = "r18"
+PR = "r19"
inherit task
@@ -27,6 +27,7 @@ RDEPENDS_task-openmoko-feed = "\
python python-pygtk python-pyserial python-efl \
ruby \
libsdl-x11 libsdl-mixer libsdl-net libsdl-ttf \
+ settingsgui \
synergy \
tzdata \
tor \