[oe-commits] org.oe.dev merge of '73811d7124650e66801380a8372e169d5ed3e6bf'

[mickeyl commit]

merge of '73811d7124650e66801380a8372e169d5ed3e6bf'
     and 'f76a52136a0ce25511ba98b2e3b3b6d52dd6af11'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 2ebd969d37262b0d97c7ff5323a3e723f3032598
ViewMTN: http://monotone.openembedded.org/revision/info/2ebd969d37262b0d97c7ff5323a3e723f3032598
Files:
1
packages/vala
packages/vala/vala-native_0.1.4.bb
packages/vala/vala_0.1.4.bb
packages/openmoko2/neod_svn.bb
conf/distro/angstrom-2007.1.conf
Diffs:

#
# mt diff -r73811d7124650e66801380a8372e169d5ed3e6bf -r2ebd969d37262b0d97c7ff5323a3e723f3032598
#
# 
# 
# add_dir "packages/vala"
# 
# add_file "packages/vala/vala-native_0.1.4.bb"
#  content [4debe02a0d283ef995a164e0a0c0f85ecb7d9f95]
# 
# add_file "packages/vala/vala_0.1.4.bb"
#  content [9e412029cf8a6022e68dbe0bc1d660f618d2012b]
# 
# patch "packages/openmoko2/neod_svn.bb"
#  from [6cc80a4570dfd74c4eefe208b331a5b8c8d049af]
#    to [92a5e00ba437275e36002f64963caa7aab304a17]
# 
============================================================
--- packages/vala/vala-native_0.1.4.bb	4debe02a0d283ef995a164e0a0c0f85ecb7d9f95
+++ packages/vala/vala-native_0.1.4.bb	4debe02a0d283ef995a164e0a0c0f85ecb7d9f95
@@ -0,0 +1,5 @@
+require vala_${PV}.bb
+
+inherit native
+DEPENDS = "glib-native-2.0"
+
============================================================
--- packages/vala/vala_0.1.4.bb	9e412029cf8a6022e68dbe0bc1d660f618d2012b
+++ packages/vala/vala_0.1.4.bb	9e412029cf8a6022e68dbe0bc1d660f618d2012b
@@ -0,0 +1,15 @@
+DESCRIPTION = "Vala is a C#-like language dedicated to ease GObject programming. Vala compiles to C"
+SECTION = "devel"
+DEPENDS = "glib-2.0"
+HOMEPAGE = "http://live.gnome.org/Vala"
+LICENSE = "LGPL"
+
+SRC_URI = "http://download.gnome.org/sources/vala/0.1/vala-${PV}.tar.bz2"
+S = "${WORKDIR}/vala-${PV}"
+
+inherit autotools lib_package
+
+do_stage() {
+	autotools_stage_all
+}
+
============================================================
--- packages/openmoko2/neod_svn.bb	6cc80a4570dfd74c4eefe208b331a5b8c8d049af
+++ packages/openmoko2/neod_svn.bb	92a5e00ba437275e36002f64963caa7aab304a17
@@ -1,7 +1,7 @@ DEPENDS = "gtk+ pulseaudio"
 DESCRIPTION = "Simple Neo1973 Daemon for Button Handling and Power Management"
 SECTION = "openmoko/daemons"
 DEPENDS = "gtk+ pulseaudio"
-RDEPENDS = "gpe-scap xrandr alsa-utils-amixer apm"
+RDEPENDS = "gpe-scap xrandr alsa-utils-amixer apm dbus-1"
 PV = "0.1.0+svnr${SRCREV}"
 PR = "r4"
 


#
# mt diff -rf76a52136a0ce25511ba98b2e3b3b6d52dd6af11 -r2ebd969d37262b0d97c7ff5323a3e723f3032598
#
# 
# 
# patch "conf/distro/angstrom-2007.1.conf"
#  from [5d6ed6b4b601b39ffd196b48f39254620f34fc34]
#    to [483bd2a92ce8f54e704feeca7f6698e99ec1b985]
# 
============================================================
--- conf/distro/angstrom-2007.1.conf	5d6ed6b4b601b39ffd196b48f39254620f34fc34
+++ conf/distro/angstrom-2007.1.conf	483bd2a92ce8f54e704feeca7f6698e99ec1b985
@@ -126,6 +126,7 @@ PREFERRED_VERSION_glibc-initial ?= "2.5"
 # PREFERRED_VERSION_gcc-cross-initial = "3.4.4+csl-arm-2005q3"
 
 #Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom
+require conf/distro/include/angstrom-2007-preferred-versions.inc
 require conf/distro/include/preferred-gpe-versions-2.8.inc
 require conf/distro/include/preferred-e-versions.inc
 require conf/distro/include/preferred-xorg-versions.inc
@@ -193,10 +194,6 @@ PREFERRED_PROVIDER_task-bootstrap = "tas
 #Silence a warning during parsing
 PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
 
-
-# Lock down almost every recipe:
-require conf/distro/include/angstrom-2007-preferred-versions.inc 
-
 #This is needed to get a correct PACKAGE_ARCH for packages that have PACKAGE_ARCH = ${MACHINE_ARCH}
 ARM_ABI ?= "${@['','oabi'][bb.data.getVar('MACHINE',d) in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
 require conf/distro/include/angstrom${ARM_ABI}.inc