[oe-commits] org.oe.dev merge of '8015a13e63ef13c856f4a5a5f4e9b1fa3f143fa8'

[coredump2 commit]

merge of '8015a13e63ef13c856f4a5a5f4e9b1fa3f143fa8'
     and '85ea4469c6c02accbb588d6edee46fd9a00ad12d'

Author: coredump2 at openembedded.org
Branch: org.openembedded.dev
Revision: 5dd5189350edcf858d3515d9f2de3fc66e980106
ViewMTN: http://monotone.openembedded.org/revision/info/5dd5189350edcf858d3515d9f2de3fc66e980106
Files:
1
packages/avahi/avahi.inc
packages/gettext/gettext_0.14.1.bb
packages/speech-dispatcher/speech-dispatcher_0.6.5.bb
Diffs:

#
# mt diff -r8015a13e63ef13c856f4a5a5f4e9b1fa3f143fa8 -r5dd5189350edcf858d3515d9f2de3fc66e980106
#
# 
# 
# patch "packages/avahi/avahi.inc"
#  from [301235b5768fb7ab4d745a6a87896f738baadc10]
#    to [3e4dfba2b48cd49083cfa3aa95d9a06656feebda]
# 
# patch "packages/gettext/gettext_0.14.1.bb"
#  from [ae084090fcdd110056d5ce81e5ee0a81bd15fffa]
#    to [7293581921c029392be4691314f4f9b6d79c1d09]
# 
============================================================
--- packages/avahi/avahi.inc	301235b5768fb7ab4d745a6a87896f738baadc10
+++ packages/avahi/avahi.inc	3e4dfba2b48cd49083cfa3aa95d9a06656feebda
@@ -6,7 +6,7 @@ PR = "r5"
 LICENSE = "GPL"
 PR = "r5"
 
-DEPENDS = "expat libdaemon dbus glib-2.0"
+DEPENDS = "expat virtual/libintl libdaemon dbus glib-2.0"
 
 # uclibc has no nss
 RRECOMMENDS_avahi-daemon_append_linux = "libnss-mdns"
@@ -22,10 +22,14 @@ RDEPENDS_append = ""
 RDEPENDS_append = ""
 
 # TODO: build and enable all the extra stuff avahi offers
-EXTRA_OECONF = "--with-distro=debian --disable-gdbm ${AVAHI_GTK} --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 ${AVAHI_PYTHON}"
+EXTRA_OECONF = "--with-distro=debian  --disable-nls --disable-gdbm ${AVAHI_GTK} --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 ${AVAHI_PYTHON}"
 AVAHI_PYTHON = "--disable-python"
 AVAHI_GTK = "--disable-gtk"
 
+LDFLAGS_append_linux-uclibc = " -lintl"
+LDFLAGS_append_linux-uclibcgnueabi = " -lintl "
+LDFLAGS_append_uclinux-uclibc = " -lintl"
+
 PACKAGES =+ "avahi-daemon avahi-discover libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-ui avahi-discover-standalone avahi-autoipd avahi-utils"
 
 FILES_libavahi-common = "${libdir}/libavahi-common.so.*"
============================================================
--- packages/gettext/gettext_0.14.1.bb	ae084090fcdd110056d5ce81e5ee0a81bd15fffa
+++ packages/gettext/gettext_0.14.1.bb	7293581921c029392be4691314f4f9b6d79c1d09
@@ -1,8 +1,8 @@ LICENSE = "GPL"
 DESCRIPTION = "The GNU internationalization library."
 HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html"
 SECTION = "libs"
 LICENSE = "GPL"
-PR = "r6"
+PR = "r7"
 PROVIDES = "virtual/libintl"
 
 SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
@@ -28,6 +28,20 @@ do_configure_prepend() {
 	install -m 0644 ${STAGING_DATADIR}/aclocal/libtool.m4 ${S}/config/m4/
 }
 
+# these lack the .x behind the .so, but shouldn't be in the -dev package
+# Otherwise you get the following results:
+# 7.4M    glibc/images/ep93xx/Angstrom-console-image-glibc-ipk-2008.1-test-20080104-ep93xx.rootfs.tar.gz
+# 25M     uclibc/images/ep93xx/Angstrom-console-image-uclibc-ipk-2008.1-test-20080104-ep93xx.rootfs.tar.gz
+# because gettext depends on gettext-dev, which pulls in more -dev packages:
+# 15228   KiB /ep93xx/libstdc++-dev_4.2.2-r2_ep93xx.ipk
+# 1300    KiB /ep93xx/uclibc-dev_0.9.29-r8_ep93xx.ipk
+# 140     KiB /armv4t/gettext-dev_0.14.1-r6_armv4t.ipk
+# 4       KiB /ep93xx/libgcc-s-dev_4.2.2-r2_ep93xx.ipk
+
+PACKAGES =+ "libgettextlib libgettextsrc"
+FILES_libgettextlib = "${libdir}/libgettextlib-*.so*"
+FILES_libgettextsrc = "${libdir}/libgettextsrc-*.so*"
+
 do_stage () {
 	autotools_stage_includes
 	oe_libinstall -so -C gettext-tools/lib libgettextlib ${STAGING_LIBDIR}/


#
# mt diff -r85ea4469c6c02accbb588d6edee46fd9a00ad12d -r5dd5189350edcf858d3515d9f2de3fc66e980106
#
# 
# 
# patch "packages/speech-dispatcher/speech-dispatcher_0.6.5.bb"
#  from [aeea26005ee0a1b7bbc4d481def4b1c19ff8dec0]
#    to [4c119ef83390203d6cbc5962db26ac4ec8ed6733]
# 
============================================================
--- packages/speech-dispatcher/speech-dispatcher_0.6.5.bb	aeea26005ee0a1b7bbc4d481def4b1c19ff8dec0
+++ packages/speech-dispatcher/speech-dispatcher_0.6.5.bb	4c119ef83390203d6cbc5962db26ac4ec8ed6733
@@ -5,12 +5,13 @@ RPROVIDES += "speechd"
 DEPENDS = "flite libdotconf glib-2.0"
 RPROVIDES += "speechd"
 
-PR = "r0"
+PR = "r1"
 
 inherit autotools
 
 SRC_URI = "http://www.freebsoft.org/pub/projects/speechd/${PN}-${PV}.tar.gz \
-           file://srcMakefile.am.patch;patch=1 "
+           file://srcMakefile.am.patch;patch=1 \
+	   file://confSpeechd.conf_00.patch;patch=1"
 
 LEAD_SONAME = "libspeechd.so"
 
@@ -18,15 +19,20 @@ do_install() {
         install -d ${D}${bindir}
         install -d ${D}${includedir}
         install -d ${D}${libdir}/${PN}-modules
+	install -d ${D}${sysconfdir}
+	install -d ${D}${sysconfdir}/modules
 
         oe_libinstall -so -C src/audio libsdaudio ${D}${libdir}
         oe_libinstall -so -C src/c/api libspeechd ${D}${libdir}
         
         install -m 0644 ${S}/src/c/api/libspeechd.h    ${D}${includedir}
-        install -m 0755 ${S}/src/c/clients/say/spd-say ${D}${bindir}
+        install -m 0755 ${S}/src/c/clients/say/.libs/spd-say ${D}${bindir}
         install -m 0755 ${S}/src/c/clients/spdsend/spdsend ${D}${bindir}
-        install -m 0755 ${S}/src/server/speech-dispatcher  ${D}${bindir}
-        install -m 0755 ${S}/src/modules/sd_*   ${D}${libdir}/${PN}-modules/
+        install -m 0755 ${S}/src/server/.libs/speech-dispatcher  ${D}${bindir}
+        install -m 0755 ${S}/src/modules/.libs/sd_*   ${D}${libdir}/${PN}-modules/
+	
+	install -m 0644 ${S}/config/speechd.conf ${D}${sysconfdir}
+	install -m 0644 ${S}/config/modules/*.conf ${D}${sysconfdir}/modules
 }
 
 do_stage() {