[oe-commits] org.oe.dev merge of '3c5eeab152463150e763af8e2364e135eabc995b'

[koen commit]

merge of '3c5eeab152463150e763af8e2364e135eabc995b'
     and '927230fdadc85c2a14f2f4ee848fe29c94d9ffe1'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 1bd6f243021681ac1d7725b2a9985d67913f2cf1
ViewMTN: http://monotone.openembedded.org/revision/info/1bd6f243021681ac1d7725b2a9985d67913f2cf1
Files:
1
packages/guile/guile_1.8.5.bb
packages/cdk
packages/cdk/cdk_5.0-20060507.bb
packages/images/fso-image.bb
Diffs:

#
# mt diff -r3c5eeab152463150e763af8e2364e135eabc995b -r1bd6f243021681ac1d7725b2a9985d67913f2cf1
#
#
#
# patch "packages/guile/guile_1.8.5.bb"
#  from [c0a78b97b73fb09255824c0c15c37be62f7235d7]
#    to [05082e8e04e004b6041183ba494181980cffcc06]
#
============================================================
--- packages/guile/guile_1.8.5.bb	c0a78b97b73fb09255824c0c15c37be62f7235d7
+++ packages/guile/guile_1.8.5.bb	05082e8e04e004b6041183ba494181980cffcc06
@@ -5,10 +5,12 @@ LICENSE = "GPL"
 DEPENDS = "guile-native"
 LICENSE = "GPL"
 
+PR = "r1"
+
 SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \
            file://configure-fix.patch;patch=1 "
 
-inherit autotools
+inherit autotools binconfig
 
 acpaths = "-I ${S}/guile-config"
 


#
# mt diff -r927230fdadc85c2a14f2f4ee848fe29c94d9ffe1 -r1bd6f243021681ac1d7725b2a9985d67913f2cf1
#
#
#
# add_dir "packages/cdk"
# 
# add_file "packages/cdk/cdk_5.0-20060507.bb"
#  content [584699c732956758b85c607cb75443279138dcba]
# 
# patch "packages/images/fso-image.bb"
#  from [b99075ca5c8d2c0969bc4bce5dfb6ef65323fc46]
#    to [c1ef8880079b495bdb218a51113abbbd36449724]
#
============================================================
--- packages/cdk/cdk_5.0-20060507.bb	584699c732956758b85c607cb75443279138dcba
+++ packages/cdk/cdk_5.0-20060507.bb	584699c732956758b85c607cb75443279138dcba
@@ -0,0 +1,21 @@
+DESCRIPTION = "Curses Development Kit"
+HOMEPAGE = "http://invisible-island.net/cdk/"
+SECTION = "devel/libs"
+LICENSE = "MIT"
+
+SRC_URI = "ftp://invisible-island.net/cdk/cdk-${PV}.tgz"
+
+inherit autotools
+
+EXTRA_OEMAKE += 'DOCUMENT_DIR="${D}${datadir}/doc/cdk"'
+
+# FIXME
+do_configure() {
+	gnu-configize
+	oe_runconf
+}
+
+do_stage() {
+	autotools_stage_all
+}
+
============================================================
--- packages/images/fso-image.bb	b99075ca5c8d2c0969bc4bce5dfb6ef65323fc46
+++ packages/images/fso-image.bb	c1ef8880079b495bdb218a51113abbbd36449724
@@ -57,6 +57,7 @@ AUDIO_INSTALL = "\
   alsa-oss \
   alsa-state \
   alsa-utils-aplay \
+  alsa-utils-amixer \
   gst-meta-audio \
   gst-plugin-mad \
   gst-plugin-modplug \