From 76eb025c76dfc754aa08cd2063f22938a72caf05 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Wed, 21 Mar 2007 13:35:51 +0000 Subject: openpbx.org: Update to use sox-native to create the sounds when building --- .../openpbx/openpbx.org-1.2-rc3/.mtn2git_empty | 0 .../openpbx/openpbx.org-1.2-rc3/bootstrap.patch | 37 ----------------- .../openpbx/openpbx.org-1.2-rc3/openssl.m4.patch | 46 ---------------------- .../openpbx/openpbx.org-1.2_rc3/.mtn2git_empty | 0 .../openpbx/openpbx.org-1.2_rc3/bootstrap.patch | 37 +++++++++++++++++ .../openpbx/openpbx.org-1.2_rc3/openssl.m4.patch | 46 ++++++++++++++++++++++ packages/openpbx/openpbx.org-perl.bb | 24 +++++++++++ packages/openpbx/openpbx.org_1.2_rc3.bb | 41 +++++++++++++------ 8 files changed, 137 insertions(+), 94 deletions(-) delete mode 100644 packages/openpbx/openpbx.org-1.2-rc3/.mtn2git_empty delete mode 100644 packages/openpbx/openpbx.org-1.2-rc3/bootstrap.patch delete mode 100644 packages/openpbx/openpbx.org-1.2-rc3/openssl.m4.patch create mode 100644 packages/openpbx/openpbx.org-1.2_rc3/.mtn2git_empty create mode 100644 packages/openpbx/openpbx.org-1.2_rc3/bootstrap.patch create mode 100644 packages/openpbx/openpbx.org-1.2_rc3/openssl.m4.patch create mode 100644 packages/openpbx/openpbx.org-perl.bb diff --git a/packages/openpbx/openpbx.org-1.2-rc3/.mtn2git_empty b/packages/openpbx/openpbx.org-1.2-rc3/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/openpbx/openpbx.org-1.2-rc3/bootstrap.patch b/packages/openpbx/openpbx.org-1.2-rc3/bootstrap.patch deleted file mode 100644 index 7f89772efa..0000000000 --- a/packages/openpbx/openpbx.org-1.2-rc3/bootstrap.patch +++ /dev/null @@ -1,37 +0,0 @@ -*** openpbx.org-1.2_rc3.old/bootstrap.sh Mon Feb 26 16:02:40 2007 ---- openpbx.org-1.2_rc3/bootstrap.sh Mon Feb 26 16:04:11 2007 -*************** -*** 89,104 **** - # Check for required version and die if unhappy - - if [ "x$UNAME" = "xFreeBSD" ]; then -! version_compare libtoolize 1 5 20 || exit 1 -! version_compare automake19 1 9 6 || exit 1 - version_compare autoconf259 2 59 || exit 1 - ACLOCAL=aclocal19 - AUTOHEADER=autoheader259 - AUTOMAKE=automake19 - AUTOCONF=autoconf259 - else -! version_compare libtoolize 1 5 20 || exit 1 -! version_compare automake 1 9 6 || exit 1 - version_compare autoconf 2 59 || exit 1 - ACLOCAL=aclocal - AUTOHEADER=autoheader ---- 89,104 ---- - # Check for required version and die if unhappy - - if [ "x$UNAME" = "xFreeBSD" ]; then -! version_compare libtoolize 1 5 10 || exit 1 -! version_compare automake19 1 9 3 || exit 1 - version_compare autoconf259 2 59 || exit 1 - ACLOCAL=aclocal19 - AUTOHEADER=autoheader259 - AUTOMAKE=automake19 - AUTOCONF=autoconf259 - else -! version_compare libtoolize 1 5 10 || exit 1 -! version_compare automake 1 9 3 || exit 1 - version_compare autoconf 2 59 || exit 1 - ACLOCAL=aclocal - AUTOHEADER=autoheader diff --git a/packages/openpbx/openpbx.org-1.2-rc3/openssl.m4.patch b/packages/openpbx/openpbx.org-1.2-rc3/openssl.m4.patch deleted file mode 100644 index 55d0d33832..0000000000 --- a/packages/openpbx/openpbx.org-1.2-rc3/openssl.m4.patch +++ /dev/null @@ -1,46 +0,0 @@ -*** openpbx.org-1.2_rc3.old/acmacros/openssl.m4 Tue Mar 6 15:21:39 2007 ---- openpbx.org-1.2_rc3/acmacros/openssl.m4 Tue Mar 6 15:23:18 2007 -*************** -*** 3,13 **** - # - AC_DEFUN([CHECK_SSL], - [AC_MSG_CHECKING(if ssl is wanted) -! # AC_ARG_WITH(ssl, -! # [ --with-ssl enable ssl [will check /usr/local/ssl -! # /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr /usr/sfw ] -! # ], -! #[ AC_MSG_RESULT(yes) - for dir in $withval /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr /usr/sfw; do - ssldir="$dir" - if test -f "$dir/include/openssl/ssl.h"; then ---- 3,13 ---- - # - AC_DEFUN([CHECK_SSL], - [AC_MSG_CHECKING(if ssl is wanted) -! AC_ARG_WITH(ssl, -! [ --with-ssl enable ssl [will check /usr/local/ssl -! /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr /usr/sfw ] -! ], -! [ AC_MSG_RESULT(yes) - for dir in $withval /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr /usr/sfw; do - ssldir="$dir" - if test -f "$dir/include/openssl/ssl.h"; then -*************** -*** 33,40 **** - AC_SUBST([HAVE_SSL]) - AC_SUBST([SSL_LIBS]) - AC_SUBST([SSL_CFLAGS]) -! #], -! #[ -! # AC_MSG_RESULT(no) -! #]) - ])dnl ---- 33,40 ---- - AC_SUBST([HAVE_SSL]) - AC_SUBST([SSL_LIBS]) - AC_SUBST([SSL_CFLAGS]) -! ], -! [ -! AC_MSG_RESULT(no) -! ]) - ])dnl diff --git a/packages/openpbx/openpbx.org-1.2_rc3/.mtn2git_empty b/packages/openpbx/openpbx.org-1.2_rc3/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/openpbx/openpbx.org-1.2_rc3/bootstrap.patch b/packages/openpbx/openpbx.org-1.2_rc3/bootstrap.patch new file mode 100644 index 0000000000..7f89772efa --- /dev/null +++ b/packages/openpbx/openpbx.org-1.2_rc3/bootstrap.patch @@ -0,0 +1,37 @@ +*** openpbx.org-1.2_rc3.old/bootstrap.sh Mon Feb 26 16:02:40 2007 +--- openpbx.org-1.2_rc3/bootstrap.sh Mon Feb 26 16:04:11 2007 +*************** +*** 89,104 **** + # Check for required version and die if unhappy + + if [ "x$UNAME" = "xFreeBSD" ]; then +! version_compare libtoolize 1 5 20 || exit 1 +! version_compare automake19 1 9 6 || exit 1 + version_compare autoconf259 2 59 || exit 1 + ACLOCAL=aclocal19 + AUTOHEADER=autoheader259 + AUTOMAKE=automake19 + AUTOCONF=autoconf259 + else +! version_compare libtoolize 1 5 20 || exit 1 +! version_compare automake 1 9 6 || exit 1 + version_compare autoconf 2 59 || exit 1 + ACLOCAL=aclocal + AUTOHEADER=autoheader +--- 89,104 ---- + # Check for required version and die if unhappy + + if [ "x$UNAME" = "xFreeBSD" ]; then +! version_compare libtoolize 1 5 10 || exit 1 +! version_compare automake19 1 9 3 || exit 1 + version_compare autoconf259 2 59 || exit 1 + ACLOCAL=aclocal19 + AUTOHEADER=autoheader259 + AUTOMAKE=automake19 + AUTOCONF=autoconf259 + else +! version_compare libtoolize 1 5 10 || exit 1 +! version_compare automake 1 9 3 || exit 1 + version_compare autoconf 2 59 || exit 1 + ACLOCAL=aclocal + AUTOHEADER=autoheader diff --git a/packages/openpbx/openpbx.org-1.2_rc3/openssl.m4.patch b/packages/openpbx/openpbx.org-1.2_rc3/openssl.m4.patch new file mode 100644 index 0000000000..55d0d33832 --- /dev/null +++ b/packages/openpbx/openpbx.org-1.2_rc3/openssl.m4.patch @@ -0,0 +1,46 @@ +*** openpbx.org-1.2_rc3.old/acmacros/openssl.m4 Tue Mar 6 15:21:39 2007 +--- openpbx.org-1.2_rc3/acmacros/openssl.m4 Tue Mar 6 15:23:18 2007 +*************** +*** 3,13 **** + # + AC_DEFUN([CHECK_SSL], + [AC_MSG_CHECKING(if ssl is wanted) +! # AC_ARG_WITH(ssl, +! # [ --with-ssl enable ssl [will check /usr/local/ssl +! # /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr /usr/sfw ] +! # ], +! #[ AC_MSG_RESULT(yes) + for dir in $withval /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr /usr/sfw; do + ssldir="$dir" + if test -f "$dir/include/openssl/ssl.h"; then +--- 3,13 ---- + # + AC_DEFUN([CHECK_SSL], + [AC_MSG_CHECKING(if ssl is wanted) +! AC_ARG_WITH(ssl, +! [ --with-ssl enable ssl [will check /usr/local/ssl +! /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr /usr/sfw ] +! ], +! [ AC_MSG_RESULT(yes) + for dir in $withval /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr /usr/sfw; do + ssldir="$dir" + if test -f "$dir/include/openssl/ssl.h"; then +*************** +*** 33,40 **** + AC_SUBST([HAVE_SSL]) + AC_SUBST([SSL_LIBS]) + AC_SUBST([SSL_CFLAGS]) +! #], +! #[ +! # AC_MSG_RESULT(no) +! #]) + ])dnl +--- 33,40 ---- + AC_SUBST([HAVE_SSL]) + AC_SUBST([SSL_LIBS]) + AC_SUBST([SSL_CFLAGS]) +! ], +! [ +! AC_MSG_RESULT(no) +! ]) + ])dnl 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" -- cgit v1.2.3 From 9ede5dc2c95dbe53ec5a00c0e22837263673e172 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Wed, 21 Mar 2007 13:37:00 +0000 Subject: sox: Add updated sox and new package sox-native --- packages/sox/sox-native_13.0.0.bb | 19 +++++++++++++++++++ packages/sox/sox_12.17.5.bb | 2 +- packages/sox/sox_13.0.0.bb | 18 ++++++++++++++++++ 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 packages/sox/sox-native_13.0.0.bb create mode 100644 packages/sox/sox_13.0.0.bb 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_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 +} -- cgit v1.2.3 From 6543facde736a0bcafa01b6610a2e1c293fe11b5 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Wed, 21 Mar 2007 13:38:11 +0000 Subject: sox: Add missing patch --- packages/sox/sox/src-Makefile.am.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 packages/sox/sox/src-Makefile.am.patch 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: -- cgit v1.2.3