Merge bk://oe-devel.bkbits.net/openembedded

into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/06/13 19:36:22+02:00 utwente.nl!koen
flite_1.2.bb:  add staging, courtesy Patrick Ohly

2005/06/13 19:02:57+02:00 utwente.nl!koen
osso-af-utils_0.4.bb:  remove staging

BKrev: 42adc4fbYHLg3a86GyK-T4zackeZJQ

diff --git a/packages/flite/flite_1.2.bb b/packages/flite/flite_1.2.bb
index e69de29..240de51 100644 (file)
--- a/packages/flite/flite_1.2.bb
+++ b/packages/flite/flite_1.2.bb
@@ -0,0 +1,40 @@
+SECTION = "console/utils"
+HOMEPAGE = "http://fife.speech.cs.cmu.edu/flite/"
+DESCRIPTION = "festival light speech synthesizer"
+PRIORITY = "optional"
+LICENSE = "flite"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+PR = "r1"
+
+SRC_URI = "http://www.speech.cs.cmu.edu/flite/packed/flite-${PV}/flite-${PV}-release.tar.bz2 \
+           file://fix-read-only-assignments.patch;patch=1"
+S = "${WORKDIR}/flite-${PV}-release"
+
+inherit autotools 
+
+EXTRA_OECONF = "--with-audio=oss --enable-shared"
+
+PACKAGES += "lib${PN} lib${PN}-vox8 lib${PN}-vox16"
+
+FILES_${PN} = "${bindir}"
+
+FILES_lib${PN} ="${libdir}/libflite.so.* \
+                 ${libdir}/libflite_cmu_time_awb.so.* \
+                ${libdir}/libflite_cmulex.so.* \
+                ${libdir}/libflite_usenglish.so.*"
+
+FILES_lib${PN}-vox8 = "${libdir}/libflite_cmu_us_kal.so.*"
+
+FILES_lib${PN}-vox16 = "${libdir}/libflite_cmu_us_kal16.so.*"
+
+LEAD_SONAME = "libflite.so"
+
+do_install() {
+        oe_runmake INSTALLBINDIR="${D}${bindir}" INSTALLLIBDIR="${D}${libdir}" INSTALLINCDIR="${D}${includedir}" install
+}
+
+
+do_stage () {
+        install -m 0644 ${S}/include/*.h ${STAGING_INCDIR}/
+        oe_runmake -C lib INSTALLLIBDIR="${STAGING_LIBDIR}" install
+}

diff --git a/packages/maemo/osso-af-utils_0.4.bb b/packages/maemo/osso-af-utils_0.4.bb
index e80711b..070d2e0 100644 (file)
--- a/packages/maemo/osso-af-utils_0.4.bb
+++ b/packages/maemo/osso-af-utils_0.4.bb
@@ -6,7 +6,3 @@ SRC_URI =       "http://stage.maemo.org:80/pool/maemo/ossw/source/o/osso-af-utils/osso
 
 inherit autotools pkgconfig
 
-do_stage() {
-       autotools_stage_includes
-
-}