[Asterisk-Users] Patching asterisk for spandsp

[Gregory Junker]

I was able to patch the apps/Makefile from the v1-0 branch (use "-r 
v1-0" on the CVS command line) with Steve's patchfile, without issues. I 
included his patchfile for convenience. Which version of the source are 
you working with? Worst case, you can just look at the patch file too 
see what changes it makes (all it does is add build steps for the 
app_*xfax.c files), and edit the Makefile directly (and put up a patch 
to the list, out of courtesy, of course. ;) 
http://laughingmeme.org/archives/001753.html for doing patches, if you 
aren't familiar).

However, app_rxfax.c does need to be changed; there is a patchfile for 
that too (the "callerid" member changed to "cid" in the Asterisk API).

HTH
Greg

Eric Rees wrote:
> When I try to patch the Makefile for asterisk with the 
> Apps_makefile.patch from Spandsp I get the following error.
> 
> patching file Makefile
> Hunk #1 FAILED at 47.
> Hunk #2 FAILED at 76.
> 2 out of 2 hunks FAILED
> 
> Has anybody seen this.
> 
> _______________________________________________
> Asterisk-Users mailing list
> Asterisk-Users at lists.digium.com
> http://lists.digium.com/mailman/listinfo/asterisk-users
> To UNSUBSCRIBE or update options visit:
>    http://lists.digium.com/mailman/listinfo/asterisk-users
> 
-------------- next part --------------
--- app_rxfax.c	2004-11-22 15:28:42.000000000 -0500
+++ app_rxfax.c.new	2004-11-03 16:18:21.000000000 -0500
@@ -83,7 +83,7 @@
                       "FaxReceived", "Channel: %s\nExten: %s\nCallerID: %s\nRemoteStationID: %s\nLocalStationID: %s\nPagesTransferred: %i\nResolution: %i\nTransferRate: %i\nFileName: %s\n",
                       chan->name,
                       chan->exten,
-                      chan->callerid,
+                      chan->cid,
                       far_ident,
                       local_ident,
                       t.pages_transferred,
-------------- next part --------------
--- Makefile.orig	2004-10-02 02:14:37.029411336 +0800
+++ Makefile	2004-09-26 23:47:43.000000000 +0800
@@ -41,10 +41,13 @@
 
 APPS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi)
 APPS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi)
 APPS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo "app_osplookup.so" ; fi)
 
+APPS+=$(shell if [ -f /usr/include/spandsp.h ]; then echo "app_rxfax.so app_txfax.so" ; fi)
+APPS+=$(shell if [ -f /usr/local/include/spandsp.h ]; then echo "app_rxfax.so app_txfax.so" ; fi)
+
 CFLAGS+=-fPIC
 
 ifeq ($(USE_POSTGRES_VM_INTERFACE),1)
 CFLAGS+=-DUSEPOSTGRESVM
 endif
@@ -66,10 +69,16 @@
 
 install: all
 	for x in $(APPS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
 	rm -f $(DESTDIR)$(MODULES_DIR)/app_datetime.so
 
+app_rxfax.so : app_rxfax.o
+	$(CC) $(SOLINK) -o $@ $< -lspandsp -ltiff
+
+app_txfax.so : app_txfax.o
+	$(CC) $(SOLINK) -o $@ $< -lspandsp -ltiff
+
 app_voicemail.so : app_voicemail.o
 ifeq ($(USE_MYSQL_VM_INTERFACE),1)
 	$(CC) $(SOLINK) -o $@ $(MLFLAGS) $< -L/usr/lib/mysql -lmysqlclient -lz
 else
 ifeq ($(USE_POSTGRES_VM_INTERFACE),1)