merge of '851b7587e1fa45e2c94b76c9b276389109102904'

     and 'd8b2a4bd8d91437fd8910dbfcd96ea93798e97d2'

9 files changed, 103 insertions, 12 deletions

diff --git a/packages/openpbx/openpbx.org-1.2-rc3/.mtn2git_empty b/packages/openpbx/openpbx.org-1.2_rc3/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/openpbx/openpbx.org-1.2-rc3/.mtn2git_empty
+++ b/packages/openpbx/openpbx.org-1.2_rc3/.mtn2git_empty
diff --git a/packages/openpbx/openpbx.org-1.2-rc3/bootstrap.patch b/packages/openpbx/openpbx.org-1.2_rc3/bootstrap.patch
index 7f89772efa..7f89772efa 100644
--- a/packages/openpbx/openpbx.org-1.2-rc3/bootstrap.patch
+++ b/packages/openpbx/openpbx.org-1.2_rc3/bootstrap.patch
diff --git a/packages/openpbx/openpbx.org-1.2-rc3/openssl.m4.patch b/packages/openpbx/openpbx.org-1.2_rc3/openssl.m4.patch
index 55d0d33832..55d0d33832 100644
--- a/packages/openpbx/openpbx.org-1.2-rc3/openssl.m4.patch
+++ b/packages/openpbx/openpbx.org-1.2_rc3/openssl.m4.patch
diff --git a/packages/openpbx/openpbx.org-perl.bb b/packages/openpbx/openpbx.org-perl.bb
new file mode 100644
index 0000000000..124dfcfc8b
--- /dev/null
+++ b/packages/openpbx/openpbx.org-perl.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "Openpbx::OGI Perl Gateway Interface Module"
+HOMEPAGE = "http://www.openpbx.org"
+SECTION = "libs"
+LICENSE = "GPL"
+DEPENDS = "install-native"
+RDEPENDS = "perl openpbx.org-ogi"
+PR = "r0"
+
+OPBXV = "openpbx.org-1.2_rc3"
+
+SRC_URI = "http://www.openpbx.org/releases/${OPBXV}.tar.gz"
+
+S = "${WORKDIR}/${OPBXV}/contrib/ogi-perl/openpbx-perl-${PV}"
+
+inherit cpan
+
+do_install_append () {
+  install -d ${D}${datadir}/openpbx.org/ogi/perl
+  install ${S}/examples/* ${D}${datadir}/openpbx.org/ogi/perl
+}
+
+PACKAGES =+ "${PN}-examples"
+
+FILES_${PN}-examples = "${datadir}/openpbx.org/ogi/perl"
diff --git a/packages/openpbx/openpbx.org_1.2_rc3.bb b/packages/openpbx/openpbx.org_1.2_rc3.bb
index 64778d0f7c..76c1f0c7bd 100644
--- a/packages/openpbx/openpbx.org_1.2_rc3.bb
+++ b/packages/openpbx/openpbx.org_1.2_rc3.bb
@@ -3,14 +3,16 @@ HOMEPAGE = "http://www.openpbx.org"
 #RDEPENDS = "ssmtp"
 SECTION = "voip"
 LICENSE = "GPL"
-DEPENDS = "openssl zlib tiff libcap spandsp speex readline js"
+DEPENDS = "openssl zlib tiff libcap spandsp speex readline js \
+           sox-native findutils-native"
 DEPENDS_${PN}-ldap = "openldap"
 RRECOMMENDS = "logrotate"
-RRECOMMENDS_${PN}-ogi = "perl perl-module-strict"
+RRECOMMENDS_${PN}-ogi = "perl perl-module-strict openpbx.org-perl"
 PV = "1.2_rc3"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://www.openpbx.org/releases/${P}.tar.gz \
+           svn://svn.openpbx.org/openpbx-sounds/trunk/sounds/en_US;module=MelanieTaylor;proto=svn \
            file://bootstrap.patch;patch=1 \
            file://openssl.m4.patch;patch=1 \
            file://logrotate \
@@ -45,17 +47,34 @@ do_install_append() {
     install -c -D -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/openpbx
     install -c -D -m 644 ${WORKDIR}/logrotate ${D}${sysconfdir}/logrotate.d/openpbx
     install -c -D -m 644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/openpbx
+    # And now for sounds...
+    for file in `find ${WORKDIR}/MelanieTaylor -name \*.wav`; do
+        echo $file
+        sox -V $file -t raw -s -r 8000 -c 1 -w `echo $file|sed -e s/\.wav$/.sln/` resample -ql;
+        sox -V $file -t raw -U -r 8000 -c 1 -b `echo $file|sed -e s/\.wav$/.ulaw/` resample -ql;
+        sox -V $file -t raw -A -r 8000 -c 1 -b `echo $file|sed -e s/\.wav$/.alaw/` resample -ql;
+        sox -V $file -t gsm -r 8000 -c 1 -b `echo $file|sed -e s/\.wav$/.gsm/` resample -ql;
+        relfile=`echo $file|sed -e s:^${WORKDIR}/MelanieTaylor/::`
+        relfile2=`echo $relfile|sed -e s:\.wav$::`
+        install -c -D -m 644 ${WORKDIR}/MelanieTaylor/$relfile2.sln ${D}${datadir}/openpbx.org/sounds/$relfile2.sln
+        install -c -D -m 644 ${WORKDIR}/MelanieTaylor/$relfile2.ulaw ${D}${datadir}/openpbx.org/sounds/$relfile2.ulaw
+        install -c -D -m 644 ${WORKDIR}/MelanieTaylor/$relfile2.alaw ${D}${datadir}/openpbx.org/sounds/$relfile2.alaw
+        install -c -D -m 644 ${WORKDIR}/MelanieTaylor/$relfile2.gsm ${D}${datadir}/openpbx.org/sounds/$relfile2.gsm
+    done
 }
 
-PACKAGES =+ "${PN}-fax ${PN}-ogi ${PN}-musiconhold ${PN}-ldap"
+PACKAGES = "${PN}-sounds ${PN}-fax ${PN}-ogi ${PN}-ldap ${PN}-doc ${PN}-dev ${PN}"
 
-FILES_${PN}-fax = "${libdir}/openpbx.org/modules/chan_fax.* \
-                   ${libdir}/openpbx.org/modules/app_rxfax.* \
-                   ${libdir}/openpbx.org/modules/app_txfax.* \
+FILES_${PN}-sounds = "${datadir}/openpbx.org/sounds/*"
+FILES_${PN}-dev = "${libdir}/openpbx.org/modules/*.la \
+                   ${libdir}/openpbx.org/*.la \
+                   ${includedir}/openpbx/*"
+FILES_${PN}-fax = "${libdir}/openpbx.org/modules/chan_fax.so \
+                   ${libdir}/openpbx.org/modules/app_rxfax.so \
+                   ${libdir}/openpbx.org/modules/app_txfax.so \
+                   ${libdir}/openpbx.org/modules/app_faxdetect.so \
                    ${sysconfdir}/openpbx.org/chan_fax.conf"
-FILES_${PN}-musiconhold = "${libdir}/openpbx.org/modules/res_musiconhold.* \
-                   ${sysconfdir}/openpbx.org/musiconhold.conf"
-FILES_${PN}-ogi = "${libdir}/openpbx.org/modules/res_ogi.* \
+FILES_${PN}-ogi = "${libdir}/openpbx.org/modules/res_ogi.so \
                    ${datadir}/openpbx.org/ogi/*"
 FILES_${PN}-ldap = "${libdir}/openpbx.org/modules/app_ldap.*"
 
@@ -67,7 +86,7 @@ pkg_postinst_prepend() {
 }
 
 CONFFILES_${PN}-fax += "${sysconfdir}/openpbx.org/chan_fax.conf"
-CONFFILES_${PN}-musiconhold += "${sysconfdir}/openpbx.org/musiconhold.conf"
+CONFFILES_${PN} += "${sysconfdir}/openpbx.org/musiconhold.conf"
 CONFFILES_${PN} += "${sysconfdir}/openpbx.org/adsi.conf"
 CONFFILES_${PN} += "${sysconfdir}/openpbx.org/adtranvofr.conf"
 CONFFILES_${PN} += "${sysconfdir}/openpbx.org/agents.conf"
diff --git a/packages/sox/sox-native_13.0.0.bb b/packages/sox/sox-native_13.0.0.bb
new file mode 100644
index 0000000000..9b4dd29433
--- /dev/null
+++ b/packages/sox/sox-native_13.0.0.bb
@@ -0,0 +1,19 @@
+include sox_${PV}.bb
+
+S = "${WORKDIR}/sox-${PV}"
+
+inherit native
+
+do_patch() {
+        true
+}
+
+do_stage() {
+	make bindir="${STAGING_BINDIR}" libdir="${STAGING_LIBDIR}" mandir="${STAGING_DIR}/${HOST_SYS}/man" includedir="${STAGING_INCDIR}" install
+	rm ${STAGING_BINDIR}/rec
+	ln -s ${STAGING_BINDIR}/play ${STAGING_BINDIR}/rec
+}
+
+do_install() {
+        true
+}
diff --git a/packages/sox/sox/src-Makefile.am.patch b/packages/sox/sox/src-Makefile.am.patch
new file mode 100644
index 0000000000..b5ffd398ae
--- /dev/null
+++ b/packages/sox/sox/src-Makefile.am.patch
@@ -0,0 +1,11 @@
+--- sox-13.0.0.old/src/Makefile.am	2007-03-18 22:19:52.296535098 -0400
++++ sox-13.0.0/src/Makefile.am	2007-03-18 22:21:48.968947731 -0400
+@@ -42,7 +42,7 @@
+ 	$(MAKE) -C libgsm
+ 
+ play rec: sox$(EXEEXT)
+-	./sox --help > /dev/null
++#	./sox --help > /dev/null
+ 	test -f .libs/lt-sox && ( $(RM) $@ && $(LN_S) .libs/lt-sox $@ ) || $(LN_S) sox$(EXEEXT) $@
+ 
+ install-exec-hook:
diff --git a/packages/sox/sox_12.17.5.bb b/packages/sox/sox_12.17.5.bb
index 6c70eaad7b..a3cd84e726 100644
--- a/packages/sox/sox_12.17.5.bb
+++ b/packages/sox/sox_12.17.5.bb
@@ -4,7 +4,7 @@
 
 DESCRIPTION="SoX is the Swiss Army knife of sound processing tools. \
 It converts audio files among various standard audio file formats \
-and can apply different effects and filters to the audio data."
+and can apply different effects and filters to the audio data." 
 LICENSE="GPL"
 HOMEPAGE="http://sox.sourceforge.net"
 
diff --git a/packages/sox/sox_13.0.0.bb b/packages/sox/sox_13.0.0.bb
new file mode 100644
index 0000000000..f5c554799d
--- /dev/null
+++ b/packages/sox/sox_13.0.0.bb
@@ -0,0 +1,18 @@
+DESCRIPTION="SoX is the Swiss Army knife of sound processing tools. \
+It converts audio files among various standard audio file formats \
+and can apply different effects and filters to the audio data." 
+HOMEPAGE = "http://sox.sourceforge.net"
+SECTION = "audio"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/sox/sox-${PV}.tar.gz \
+         file://src-Makefile.am.patch;patch=1"
+
+inherit autotools
+
+do_install() {
+	make bindir="${D}${bindir}" libdir="${D}${libdir}" mandir="${D}/${mandir}" includedir="${D}${includedir}" install
+	rm ${D}${bindir}/rec
+	ln -s /usr/bin/play ${D}${bindir}/rec
+}