[oe-commits] org.oe.dev merge of '169f0a9eb85b9f29ecde9111e22938b3acc6a71d'

[oe commit]

merge of '169f0a9eb85b9f29ecde9111e22938b3acc6a71d'
     and '71ca4b99ae3c9b849f6f910a221fa3cd4e13d0d6'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 5af64e0f29377b9ebbc655af469dd70d6a2f6dfb
ViewMTN: http://monotone.openembedded.org/revision/info/5af64e0f29377b9ebbc655af469dd70d6a2f6dfb
Files:
1
packages/tasks/task-openmoko-phone.bb
packages/libvorbis/libvorbis_1.2.0.bb
Diffs:

#
# mt diff -r169f0a9eb85b9f29ecde9111e22938b3acc6a71d -r5af64e0f29377b9ebbc655af469dd70d6a2f6dfb
#
# 
# 
# patch "packages/tasks/task-openmoko-phone.bb"
#  from [0c9c69c9ffea7cfbf2d1b2ac75951c5218d77da8]
#    to [e581df871797084f3feefe30f1c18d23db7cdc61]
# 
============================================================
--- packages/tasks/task-openmoko-phone.bb	0c9c69c9ffea7cfbf2d1b2ac75951c5218d77da8
+++ packages/tasks/task-openmoko-phone.bb	e581df871797084f3feefe30f1c18d23db7cdc61
@@ -1,8 +1,7 @@ LICENSE = "MIT"
 DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-PROVIDES = "task-openmoko-everything"
-PR = "r71"
+PR = "r72"
 
 inherit task
 


#
# mt diff -r71ca4b99ae3c9b849f6f910a221fa3cd4e13d0d6 -r5af64e0f29377b9ebbc655af469dd70d6a2f6dfb
#
# 
# 
# add_file "packages/libvorbis/libvorbis_1.2.0.bb"
#  content [bfa924d59a88e448f8484e94e5e5d7e031c148bc]
# 
============================================================
--- packages/libvorbis/libvorbis_1.2.0.bb	bfa924d59a88e448f8484e94e5e5d7e031c148bc
+++ packages/libvorbis/libvorbis_1.2.0.bb	bfa924d59a88e448f8484e94e5e5d7e031c148bc
@@ -0,0 +1,30 @@
+SECTION = "libs"
+DEPENDS = "libogg"
+DESCRIPTION = "Ogg Vorbis is a high-quality lossy audio codec \
+that is free of intellectual property restrictions. libvorbis \
+is the main vorbis codec library."
+LICENSE = "BSD"
+
+SRC_URI = "http://downloads.xiph.org/releases/vorbis/libvorbis-${PV}.tar.gz"
+
+inherit autotools  pkgconfig
+
+# vorbisfile.c reveals a problem in the gcc register spilling for the
+# thumb instruction set...
+FULL_OPTIMIZATION_thumb = "-O0"
+
+EXTRA_OECONF = "--with-ogg-libraries=${STAGING_LIBDIR} \
+	        --with-ogg-includes=${STAGING_INCDIR}"
+
+do_stage () {
+	oe_libinstall -a -so -C lib libvorbis ${STAGING_LIBDIR}
+	oe_libinstall -a -so -C lib libvorbisfile ${STAGING_LIBDIR}
+	oe_libinstall -a -so -C lib libvorbisenc ${STAGING_LIBDIR}
+
+	install -d ${STAGING_INCDIR}/vorbis
+	install -m 0644 include/vorbis/vorbisenc.h \
+			include/vorbis/vorbisfile.h \
+			include/vorbis/codec.h ${STAGING_INCDIR}/vorbis/
+	install -d ${STAGING_DATADIR}/aclocal
+	install -m 0644 vorbis.m4 ${STAGING_DATADIR}/aclocal/
+}