ports/129970: [PATCH] net/asterisk12: [chase libspeex changes]

[Tod McQuillin]

>Number:         129970
>Category:       ports
>Synopsis:       [PATCH] net/asterisk12: [chase libspeex changes]
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Dec 27 08:10:04 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Tod McQuillin
>Release:        FreeBSD 6.4-STABLE i386
>Organization:
>Environment:
System: FreeBSD plexi.pun-pun.prv 6.4-STABLE FreeBSD 6.4-STABLE #0: Sat Dec 20 23:13:14 JST 2008
>Description:
The current net/asterisk12 port links against speex using -lspeex -lm.
But in newer versions of libspeex, some functions have been moved to
libspeexdsp.  Therefore we must link using -lspeex -lspeexdsp -lm
instead.

The order of some variables in the Makefile was also changed to satisfy
portlint.

See http://bugs.digium.com/view.php?id=11693 for a similar bug report
(and fix).  The fix has been incorporated into asterisk 1.4, but 1.2
is no longer maintained, so we need to patch it ourselves.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
Try to run asterisk12, and note the following errors in
/var/log/asterisk/messages:

Dec 27 11:41:35 WARNING[74785] loader.c: /usr/local/lib/asterisk/modules/codec_speex.so: Undefined symbol "speex_preprocess_ctl"
Dec 27 11:41:35 WARNING[74785] loader.c: Loading module codec_speex.so failed!

Also notice that asterisk has exited and will not run.

>Fix:

--- asterisk12-1.2.27_2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /usr/src/cvs-repo/ports/net/asterisk12/Makefile,v
retrieving revision 1.78
diff -u -u -r1.78 Makefile
--- Makefile	25 Jul 2008 12:24:04 -0000	1.78
+++ Makefile	27 Dec 2008 07:54:04 -0000
@@ -7,11 +7,14 @@
 
 PORTNAME=	asterisk
 PORTVERSION=	1.2.27
-PKGNAMESUFFIX=	12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://ftp.digium.com/pub/asterisk/ \
 		http://ftp.digium.com/pub/asterisk/old-releases/
+PKGNAMESUFFIX=	12
+
+MAINTAINER=	sobomax at FreeBSD.org
+COMMENT=	An Open Source PBX and telephony toolkit
 
 PATCHFILES=	asterisk-1.2.26.1-codec-negotiation-20080118.diff.gz
 PATCH_SITES=	http://b2bua.org/chrome/site/
@@ -21,9 +24,6 @@
 #PATCH_SITE_SUBDIR=	fjoe/:bristuff
 #BRIVER=		bristuff-0.3.0-PRE-1l
 
-MAINTAINER=	sobomax at FreeBSD.org
-COMMENT=	An Open Source PBX and telephony toolkit
-
 BUILD_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
 LIB_DEPENDS=	speex.1:${PORTSDIR}/audio/speex \
 		newt.51:${PORTSDIR}/devel/newt \
Index: files/patch-codecs::Makefile
===================================================================
RCS file: /usr/src/cvs-repo/ports/net/asterisk12/files/patch-codecs::Makefile,v
retrieving revision 1.9
diff -u -u -r1.9 patch-codecs::Makefile
--- files/patch-codecs::Makefile	26 Apr 2007 00:11:37 -0000	1.9
+++ files/patch-codecs::Makefile	27 Dec 2008 02:52:00 -0000
@@ -12,7 +12,7 @@
    ifeq (${OSARCH},NetBSD)
      SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/pkg/lib
    endif
-@@ -43,8 +43,8 @@
+@@ -43,28 +43,28 @@
  
  UI_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/speex.h)
  UIS_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/speex/speex.h)
@@ -22,26 +22,35 @@
 +ULIS_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/speex/speex.h)
  ifneq (${UI_SPEEX},)
    MODSPEEX=codec_speex.so
-   LIBSPEEX+=-lspeex -lm
-@@ -56,14 +56,14 @@
+-  LIBSPEEX+=-lspeex -lm
++  LIBSPEEX+=-lspeex -lspeexdsp -lm
+ endif
+ ifneq (${UIS_SPEEX},)
+   MODSPEEX=codec_speex.so
+   CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/include/speex
+-  LIBSPEEX+=-lspeex -lm
++  LIBSPEEX+=-lspeex -lspeexdsp -lm
  endif
  ifneq (${ULI_SPEEX},)
    MODSPEEX=codec_speex.so
 -  CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include
 -  LIBSPEEX=-L$(CROSS_COMPILE_TARGET)/usr/local/lib
+-  LIBSPEEX+=-lspeex -lm
 +  CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include
 +  LIBSPEEX=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib
-   LIBSPEEX+=-lspeex -lm
++  LIBSPEEX+=-lspeex -lspeexdsp -lm
  endif
  ifneq (${ULIS_SPEEX},)
    MODSPEEX=codec_speex.so
 -  CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/speex
 -  LIBSPEEX=-L$(CROSS_COMPILE_TARGET)/usr/local/lib
+-  LIBSPEEX+=-lspeex -lm
 +  CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/speex
 +  LIBSPEEX=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib
-   LIBSPEEX+=-lspeex -lm
++  LIBSPEEX+=-lspeex -lspeexdsp -lm
  endif
  
+ ifneq ($(wildcard ilbc/iLBC_decode.h),)
 @@ -78,7 +78,7 @@
  LIBLPC10=lpc10/liblpc10.a
  
--- asterisk12-1.2.27_2.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: