From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Dec 27 08:10:06 2008 Return-Path: <owner-freebsd-ports-bugs@FreeBSD.ORG> Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A18D01065670 for <freebsd-ports-bugs@hub.freebsd.org>; Sat, 27 Dec 2008 08:10:06 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 7DCBE8FC1B for <freebsd-ports-bugs@hub.freebsd.org>; Sat, 27 Dec 2008 08:10:06 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id mBR8A5Og011106 for <freebsd-ports-bugs@freefall.freebsd.org>; Sat, 27 Dec 2008 08:10:05 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id mBR8A5sL011105; Sat, 27 Dec 2008 08:10:05 GMT (envelope-from gnats) Resent-Date: Sat, 27 Dec 2008 08:10:05 GMT Resent-Message-Id: <200812270810.mBR8A5sL011105@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Tod McQuillin <devin@spamcop.net> Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5AE5B106568D for <FreeBSD-gnats-submit@freebsd.org>; Sat, 27 Dec 2008 08:02:39 +0000 (UTC) (envelope-from root@distalzou.net) Received: from mail.distalzou.net (203.141.139.231.static.zoot.jp [203.141.139.231]) by mx1.freebsd.org (Postfix) with ESMTP id 2025E8FC33 for <FreeBSD-gnats-submit@freebsd.org>; Sat, 27 Dec 2008 08:02:38 +0000 (UTC) (envelope-from root@distalzou.net) Received: from root by mail.distalzou.net with local (Exim 4.69 (FreeBSD)) (envelope-from <root@distalzou.net>) id 1LGU84-0004Ji-2e for FreeBSD-gnats-submit@freebsd.org; Sat, 27 Dec 2008 17:02:36 +0900 Message-Id: <E1LGU84-0004Ji-2e@mail.distalzou.net> Date: Sat, 27 Dec 2008 17:02:36 +0900 From: Tod McQuillin <devin@spamcop.net> To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/129970: [PATCH] net/asterisk12: [chase libspeex changes] X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports <freebsd-ports-bugs.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>, <mailto:freebsd-ports-bugs-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports-bugs> List-Post: <mailto:freebsd-ports-bugs@freebsd.org> List-Help: <mailto:freebsd-ports-bugs-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>, <mailto:freebsd-ports-bugs-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 27 Dec 2008 08:10:06 -0000 >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@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@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: