OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 19-Mar-2008 21:18:28
Branch: HEAD Handle: 2008031920182700
Modified files:
openpkg-src/asterisk asterisk.patch asterisk.spec asterisk.txt
Log:
finally get Zaptel support working
Summary:
Revision Changes Path
1.32 +12 -4 openpkg-src/asterisk/asterisk.patch
1.52 +13 -5 openpkg-src/asterisk/asterisk.spec
1.31 +11 -14 openpkg-src/asterisk/asterisk.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
============================================================================
$ cvs diff -u -r1.31 -r1.32 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 19 Mar 2008 08:37:59 -0000
1.31
+++ openpkg-src/asterisk/asterisk.patch 19 Mar 2008 20:18:27 -0000
1.32
@@ -174,9 +174,17 @@
ast_verb(0, "SSL certificate ok\n");
Index: menuselect-tree
---- menuselect-tree.orig 2008-03-04 18:52:08 +0100
-+++ menuselect-tree 2008-03-18 22:07:33 +0100
-@@ -612,9 +612,9 @@
+--- menuselect-tree.orig 2008-03-18 18:05:36 +0100
++++ menuselect-tree 2008-03-19 21:04:40 +0100
+@@ -262,7 +262,6 @@
+ </member>
+ <member name="chan_zap" displayname="Zapata Telephony"
remove_on_change="channels/chan_zap.o channels/chan_zap.so">
+ <depend>res_smdi</depend>
+- <depend>zaptel_vldtmf</depend>
+ <depend>zaptel</depend>
+ <depend>tonezone</depend>
+ <use>pri</use>
+@@ -616,9 +615,9 @@
<member name="CORE-SOUNDS-EN-ULAW" displayname="English, mu-Law
format">
</member>
<member name="CORE-SOUNDS-EN-ALAW" displayname="English, a-Law
format">
@@ -187,7 +195,7 @@
</member>
<member name="CORE-SOUNDS-EN-G729" displayname="English, G.729
format">
</member>
-@@ -666,6 +666,7 @@
+@@ -676,6 +675,7 @@
<member name="EXTRA-SOUNDS-EN-ULAW" displayname="English,
mu-Law format">
</member>
<member name="EXTRA-SOUNDS-EN-ALAW" displayname="English, a-Law
format">
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.spec
============================================================================
$ cvs diff -u -r1.51 -r1.52 asterisk.spec
--- openpkg-src/asterisk/asterisk.spec 19 Mar 2008 17:16:44 -0000
1.51
+++ openpkg-src/asterisk/asterisk.spec 19 Mar 2008 20:18:27 -0000
1.52
@@ -248,6 +248,9 @@
-e 's;lua5.1/lua.h;lua/lua.h;' \
-e 's;ffmpeg/avcodec.h;libavcodec/avcodec.h;' \
configure
+ cflags="%{l_cflags -O}"
+ cppflags="%{l_cppflags ncurses lua .}"
+ ldflags="%{l_ldflags}"
libs=""
%if "%{with_ogg}" == "yes"
libs="$libs -logg -lm"
@@ -258,10 +261,14 @@
%if "%{with_ldap}" == "yes"
libs="$libs -lldap -llber -lssl -lcrypto"
%endif
+%if "%{with_zaptel}" == "yes"
+ cppflags="$cppflags -I$zaptel_prefix/include"
+ ldflags="$ldflags -L$zaptel_prefix/lib"
+%endif
CC="%{l_cc}" \
- CFLAGS="%{l_cflags -O}" \
- CPPFLAGS="%{l_cppflags ncurses lua .}" \
- LDFLAGS="%{l_ldflags}" \
+ CFLAGS="$cflags" \
+ CPPFLAGS="$cppflags" \
+ LDFLAGS="$ldflags" \
LIBS="$libs" \
./configure \
--prefix=%{l_prefix} \
@@ -300,8 +307,10 @@
%endif
%if "%{with_zaptel}" == "yes"
--with-zaptel=$zaptel_prefix \
+ --with-tonezone=$zaptel_prefix \
%else
--without-zaptel \
+ --without-tonezone \
%endif
%if "%{with_avcodec}" == "yes"
--with-avcodec=%{l_prefix} \
@@ -339,14 +348,13 @@
--without-osptk \
--without-pri \
--without-suppserv \
- --without-tonezone \
--without-vpb \
--without-sdl \
--without-x11 \
--without-gtk \
--without-gtk2
%{l_make} %{l_mflags} \
- CC="%{l_cc} %{l_cflags -O} -I. -I./include -I../include
-I../../include %{l_cppflags ncurses lua .}"
+ CC="%{l_cc} $cflags -I. -I./include -I../include -I../../include
$cppflags"
# build addon modules
( cd asterisk-addons-*
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.txt
============================================================================
$ cvs diff -u -r1.30 -r1.31 asterisk.txt
--- openpkg-src/asterisk/asterisk.txt 19 Mar 2008 15:12:27 -0000 1.30
+++ openpkg-src/asterisk/asterisk.txt 19 Mar 2008 20:18:27 -0000 1.31
@@ -46,18 +46,12 @@
[modules]
autoload = yes
noload = chan_iax2.so ; not yet wished
-noload = chan_agent.so ; not yet wished
noload = chan_mgcp.so ; not yet wished
noload = chan_skinny.so ; not yet wished
-noload = pbx_dundi.so ; not yet wished
-noload = app_queue.so ; not yet wished
-noload = cdr_custom.so ; not yet wished
-noload = pbx_ael.so ; not yet wished
-noload = res_phoneprov.so ; not yet wished
-noload = res_smdi.so ; not yet wished
-noload = app_meetme.so ; not yet wished
noload = chan_ooh323.so ; not yet wished
-load = app_conference.so ; wished
+noload = chan_gtalk.so ; not yet wished
+noload = app_conference.so ; not yet wished
+load = app_meetme.so ; wished
load = res_musiconhold.so ; wished
[global]
@@ -408,8 +402,8 @@
serveremail = [EMAIL PROTECTED]
attach = yes
maxmsg = 20
-maxmessage = 180
-minmessage = 3
+maxsecs = 180
+minsecs = 3
maxgreet = 60
skipms = 3000
maxsilence = 10
@@ -481,10 +475,13 @@
</file>
<file name="zapata.conf">
;;
-;; zapata.conf -- Asterisk Zap channel configuration
+;; zapata.conf -- Asterisk Zaptel channel configuration
;;
-; (an empty configuration is ok, but required even for dummy Zaptel
support)
+; (an empty configuration is ok, but required even for Zaptel "ztdummy"
only)
+[trunkgroups]
+[channels]
+
</file>
<file name="capi.conf">
;;
@@ -596,7 +593,7 @@
stutter = 350+440/750,440/750
; Germany
-: (according to http://www.itu.int/ITU-T/inr/forms/files/tones-0203.pdf)
+; (according to http://www.itu.int/ITU-T/inr/forms/files/tones-0203.pdf)
[de]
description = Germany (DE)
ringcadence = 1000,4000
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
