I missed one of the two required upstream SVN commits to port app_fax.c to SpanDSP 0.0.6; this would have broken your build if it affected you.

(Portage version: 2.1.6.7/cvs/Linux x86_64)

2 files changed, 158 insertions, 7 deletions

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index 73511d52a7da..02e067db039e 100644
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/asterisk
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.190 2009/03/19 13:08:38 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.191 2009/03/20 14:00:58 chainsaw Exp $
+
+  20 Mar 2009; <chainsaw@gentoo.org>
+  files/1.6.0/asterisk-1.6.0.6-spandsp-api-change.patch:
+  I missed one of the two required upstream SVN commits to port app_fax.c to
+  SpanDSP 0.0.6; this would have broken your build if it affected you.
 
   19 Mar 2009; Brent Baude <ranger@gentoo.org> asterisk-1.2.31.1.ebuild:
   Marking asterisk-1.2.31.1 ppc for bug 250748
diff --git a/net-misc/asterisk/files/1.6.0/asterisk-1.6.0.6-spandsp-api-change.patch b/net-misc/asterisk/files/1.6.0/asterisk-1.6.0.6-spandsp-api-change.patch
index 8f05aab56a9b..9fcdf811d4b4 100644
--- a/net-misc/asterisk/files/1.6.0/asterisk-1.6.0.6-spandsp-api-change.patch
+++ b/net-misc/asterisk/files/1.6.0/asterisk-1.6.0.6-spandsp-api-change.patch
@@ -1,6 +1,15 @@
---- branches/1.6.0/apps/app_fax.c	2009/02/20 21:41:54	177762
-+++ branches/1.6.0/apps/app_fax.c	2009/02/20 21:56:39	177763
-@@ -161,6 +161,7 @@
+diff -uNr asterisk-1.6.0.6.ORIG/apps/app_fax.c asterisk-1.6.0.6/apps/app_fax.c
+--- asterisk-1.6.0.6.ORIG/apps/app_fax.c	2009-03-20 13:47:53.000000000 +0000
++++ asterisk-1.6.0.6/apps/app_fax.c	2009-03-20 13:48:56.000000000 +0000
+@@ -32,6 +32,7 @@
+ #ifdef HAVE_SPANDSP_EXPOSE_H
+ #include <spandsp/expose.h>
+ #endif
++#include <spandsp/version.h>
+ 
+ #include "asterisk/lock.h"
+ #include "asterisk/file.h"
+@@ -160,6 +161,7 @@
  	char buf[20];
  	fax_session *s = (fax_session *) user_data;
  	t30_stats_t stat;
@@ -8,7 +17,7 @@
  
  	ast_debug(1, "Fax phase E handler. result=%d\n", result);
  
-@@ -186,7 +187,12 @@
+@@ -185,7 +187,12 @@
  	pbx_builtin_setvar_helper(s->chan, "FAXSTATUS", "SUCCESS"); 
  	pbx_builtin_setvar_helper(s->chan, "FAXERROR", NULL); 
  	pbx_builtin_setvar_helper(s->chan, "REMOTESTATIONID", far_ident);
@@ -22,7 +31,7 @@
  	pbx_builtin_setvar_helper(s->chan, "FAXPAGES", buf);
  	snprintf(buf, sizeof(buf), "%d", stat.y_resolution);
  	pbx_builtin_setvar_helper(s->chan, "FAXRESOLUTION", buf);
-@@ -195,7 +201,7 @@
+@@ -194,7 +201,7 @@
  	
  	ast_debug(1, "Fax transmitted successfully.\n");
  	ast_debug(1, "  Remote station ID: %s\n", far_ident);
@@ -31,7 +40,7 @@
  	ast_debug(1, "  Image resolution:  %d x %d\n", stat.x_resolution, stat.y_resolution);
  	ast_debug(1, "  Transfer Rate:     %d\n", stat.bit_rate);
  	
-@@ -215,7 +221,7 @@
+@@ -214,7 +221,7 @@
  		      S_OR(s->chan->cid.cid_num, ""),
  		      far_ident,
  		      local_ident,
@@ -40,3 +49,140 @@
  		      stat.y_resolution,
  		      stat.bit_rate,
  		      s->file_name);
+@@ -313,6 +320,7 @@
+ 	int original_read_fmt = AST_FORMAT_SLINEAR;
+ 	int original_write_fmt = AST_FORMAT_SLINEAR;
+ 	fax_state_t fax;
++	t30_state_t *t30state;
+ 	struct ast_dsp *dsp = NULL;
+ 	int detect_tone = 0;
+ 	struct ast_frame *inf = NULL;
+@@ -321,6 +329,14 @@
+ 	struct timeval now, start, state_change;
+ 	enum ast_control_t38 t38control;
+ 
++#if SPANDSP_RELEASE_DATE >= 20081012
++        /* for spandsp shaphots 0.0.6 and higher */
++        t30state = &fax.t30;
++#else
++        /* for spandsp release 0.0.5 */
++        t30state = &fax.t30_state;
++#endif
++
+ 	original_read_fmt = s->chan->readformat;
+ 	if (original_read_fmt != AST_FORMAT_SLINEAR) {
+ 		res = ast_set_read_format(s->chan, AST_FORMAT_SLINEAR);
+@@ -344,16 +360,16 @@
+ 
+ 	/* Setup logging */
+ 	set_logging(&fax.logging);
+-	set_logging(&fax.t30_state.logging);
++	set_logging(&t30state->logging);
+ 
+ 	/* Configure terminal */
+-	set_local_info(&fax.t30_state, s);
+-	set_file(&fax.t30_state, s);
+-	set_ecm(&fax.t30_state, TRUE);
++	set_local_info(t30state, s);
++	set_file(t30state, s);
++	set_ecm(t30state, TRUE);
+ 
+ 	fax_set_transmit_on_idle(&fax, TRUE);
+ 
+-	t30_set_phase_e_handler(&fax.t30_state, phase_e_handler, s);
++	t30_set_phase_e_handler(t30state, phase_e_handler, s);
+ 
+ 	if (s->t38state == T38_STATE_UNAVAILABLE) {
+ 		ast_debug(1, "T38 is unavailable on %s\n", s->chan->name);
+@@ -418,9 +434,9 @@
+ 			}
+ 
+ 			/* Watchdog */
+-			if (last_state != fax.t30_state.state) {
++			if (last_state != t30state->state) {
+ 				state_change = ast_tvnow();
+-				last_state = fax.t30_state.state;
++				last_state = t30state->state;
+ 			}
+ 		} else if (inf->frametype == AST_FRAME_CONTROL && inf->subclass == AST_CONTROL_T38 &&
+ 				inf->datalen == sizeof(enum ast_control_t38)) {
+@@ -459,10 +475,10 @@
+ 	   by t30_terminate, display diagnostics and set status variables although no transmittion
+ 	   has taken place yet. */
+ 	if (res > 0) {
+-		t30_set_phase_e_handler(&fax.t30_state, NULL, NULL);
++		t30_set_phase_e_handler(t30state, NULL, NULL);
+ 	}
+ 
+-	t30_terminate(&fax.t30_state);
++	t30_terminate(t30state);
+ 	fax_release(&fax);
+ 
+ done:
+@@ -489,6 +505,19 @@
+ 	struct timeval now, start, state_change, last_frame;
+ 	enum ast_control_t38 t38control;
+ 
++	t30_state_t *t30state;
++	t38_core_state_t *t38state;
++
++#if SPANDSP_RELEASE_DATE >= 20081012
++	/* for spandsp shaphots 0.0.6 and higher */
++	t30state = &t38.t30;
++	t38state = &t38.t38_fe.t38;
++#else
++	/* for spandsp releases 0.0.5 */
++	t30state = &t38.t30_state;
++	t38state = &t38.t38;
++#endif
++
+ 	/* Initialize terminal */
+ 	memset(&t38, 0, sizeof(t38));
+ 	if (t38_terminal_init(&t38, s->caller_mode, t38_tx_packet_handler, s->chan) == NULL) {
+@@ -498,15 +527,15 @@
+ 
+ 	/* Setup logging */
+ 	set_logging(&t38.logging);
+-	set_logging(&t38.t30_state.logging);
+-	set_logging(&t38.t38.logging);
++	set_logging(&t30state->logging);
++	set_logging(&t38state->logging);
+ 
+ 	/* Configure terminal */
+-	set_local_info(&t38.t30_state, s);
+-	set_file(&t38.t30_state, s);
+-	set_ecm(&t38.t30_state, TRUE);
++	set_local_info(t30state, s);
++	set_file(t30state, s);
++	set_ecm(t30state, TRUE);
+ 
+-	t30_set_phase_e_handler(&t38.t30_state, phase_e_handler, s);
++	t30_set_phase_e_handler(t30state, phase_e_handler, s);
+ 
+ 	now = start = state_change = ast_tvnow();
+ 
+@@ -532,12 +561,12 @@
+ 		ast_debug(10, "frame %d/%d, len=%d\n", inf->frametype, inf->subclass, inf->datalen);
+ 
+ 		if (inf->frametype == AST_FRAME_MODEM && inf->subclass == AST_MODEM_T38) {
+-			t38_core_rx_ifp_packet(&t38.t38, inf->data, inf->datalen, inf->seqno);
++			t38_core_rx_ifp_packet(t38state, inf->data, inf->datalen, inf->seqno);
+ 
+ 			/* Watchdog */
+-			if (last_state != t38.t30_state.state) {
++			if (last_state != t30state->state) {
+ 				state_change = ast_tvnow();
+-				last_state = t38.t30_state.state;
++				last_state = t30state->state;
+ 			}
+ 		} else if (inf->frametype == AST_FRAME_CONTROL && inf->subclass == AST_CONTROL_T38 &&
+ 				inf->datalen == sizeof(enum ast_control_t38)) {
+@@ -567,7 +596,7 @@
+ 	if (inf)
+ 		ast_frfree(inf);
+ 
+-	t30_terminate(&t38.t30_state);
++	t30_terminate(t30state);
+ 	t38_terminal_release(&t38);
+ 
+ 	return res;