From 8a089d17c71fa2f9b891ba323b9b0b456b60cadd Mon Sep 17 00:00:00 2001 From: Maxim Sobolev Date: Thu, 12 Jun 2008 10:14:08 +0000 Subject: o Update codec negotiation patch. This version should be working with built-in h323 module; o don't link main binary with h323 library and friends. This creates issues with ooh323 module, from the asterisk-addons package. Bump PORTREVISION. --- net/asterisk14/Makefile | 5 ++++- net/asterisk14/distinfo | 6 +++--- net/asterisk14/files/patch-channels::Makefile | 20 +++++++++++++++++--- net/asterisk14/files/patch-main::Makefile | 18 +++++++++++++++--- 4 files changed, 39 insertions(+), 10 deletions(-) (limited to 'net/asterisk14') diff --git a/net/asterisk14/Makefile b/net/asterisk14/Makefile index 467e5d26a99a..82e3cac1e173 100644 --- a/net/asterisk14/Makefile +++ b/net/asterisk14/Makefile @@ -7,6 +7,7 @@ PORTNAME= asterisk PORTVERSION= 1.4.20.1 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://ftp.digium.com/pub/asterisk/ \ http://ftp.digium.com/pub/asterisk/old-releases/ @@ -37,6 +38,7 @@ MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PWLIBDIR=${LOCALBASE}/share/pwlib \ OPENH323DIR=${LOCALBASE}/share/openh323 \ OSVERSION=${OSVERSION} \ + NOISY_BUILD=YES \ CXX="${CXX}" MAN8= asterisk.8 astgenkey.8 autosupport.8 safe_asterisk.8 @@ -167,7 +169,7 @@ EXTRA_PATCHES+= ${PATCHDIR}/ilbc_enable.diff .endif .if defined(WITH_CODEC_PATCH) -PATCHFILES= asterisk-1.4.19-codec-negotiation-20080408.diff.gz +PATCHFILES= asterisk-1.4.20.1-codec-negotiation-20080610.diff.gz PATCH_SITES= http://b2bua.org/chrome/site/ EXTRA_PATCHES+= ${PATCHDIR}/codecnego-patch-Makefile .else @@ -188,6 +190,7 @@ EXTRA_PATCHES+= ${PATCHDIR}/rtp_force_dtmf-nocodecnego.diff post-extract: ${MKDIR} ${WRKSRC}/codecs/ilbc + ${FIND} ${WRKSRC} -name '*.d' -delete post-patch: ${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/musiconhold.conf.sample diff --git a/net/asterisk14/distinfo b/net/asterisk14/distinfo index c67a307cd036..2b829eb47607 100644 --- a/net/asterisk14/distinfo +++ b/net/asterisk14/distinfo @@ -1,6 +1,6 @@ MD5 (asterisk-1.4.20.1.tar.gz) = 4e4c0cdd97cb0f7b007d4f773222a2a9 SHA256 (asterisk-1.4.20.1.tar.gz) = 992aa7fab0e474b55cfeacbc3a056e29ace56fd49689dbda334b68ffe66b3a02 SIZE (asterisk-1.4.20.1.tar.gz) = 11510578 -MD5 (asterisk-1.4.19-codec-negotiation-20080408.diff.gz) = 12db6a4bc354d3eeeee7a900a6060b2f -SHA256 (asterisk-1.4.19-codec-negotiation-20080408.diff.gz) = 55290639455b1117541c5bf560ef8326c3e9414d266459293893b0e3d36c64f9 -SIZE (asterisk-1.4.19-codec-negotiation-20080408.diff.gz) = 39004 +MD5 (asterisk-1.4.20.1-codec-negotiation-20080610.diff.gz) = a589cdeb08037b56059a62660f0cbc8e +SHA256 (asterisk-1.4.20.1-codec-negotiation-20080610.diff.gz) = e4c0d20e4fb412575c93c811cc9bff9f56a8976a5c422e0ab2221a8df50752a3 +SIZE (asterisk-1.4.20.1-codec-negotiation-20080610.diff.gz) = 38994 diff --git a/net/asterisk14/files/patch-channels::Makefile b/net/asterisk14/files/patch-channels::Makefile index dbe7d0c7a0d2..833abdac1569 100644 --- a/net/asterisk14/files/patch-channels::Makefile +++ b/net/asterisk14/files/patch-channels::Makefile @@ -3,7 +3,7 @@ $FreeBSD$ --- channels/Makefile.orig +++ channels/Makefile -@@ -26,8 +26,8 @@ +@@ -32,8 +32,8 @@ endif ifeq ($(OSARCH),FreeBSD) @@ -14,7 +14,7 @@ $FreeBSD$ CHANH323LIB=-pthread endif -@@ -72,12 +72,12 @@ +@@ -78,12 +78,13 @@ h323/libchanh323.a h323/Makefile.ast: $(CMD_PREFIX) $(MAKE) -C h323 $(CMD_PREFIX) rm -f ../main/asterisk @@ -24,6 +24,7 @@ $FreeBSD$ - $(CMD_PREFIX) echo - $(CMD_PREFIX) echo "***************************************************************" - $(CMD_PREFIX) exit 1 ++ $(CMD_PREFIX) $(MAKE) -C . chan_h323.so +# $(CMD_PREFIX) echo "***************************************************************" +# $(CMD_PREFIX) echo +# $(CMD_PREFIX) echo "********** Re-run 'make' to pick up H.323 parameters **********" @@ -32,4 +33,17 @@ $FreeBSD$ +# $(CMD_PREFIX) exit 1 endif - gentone: gentone.c + dist-clean:: +@@ -113,8 +114,12 @@ + else + chan_h323.so: chan_h323.o h323/libchanh323.a + $(ECHO_PREFIX) echo " [LD] $^ -> $@" ++ifeq ($(OSARCH),FreeBSD) ++ $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) ++else + $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat + endif ++endif + + chan_misdn.o: ASTCFLAGS+=-Imisdn + diff --git a/net/asterisk14/files/patch-main::Makefile b/net/asterisk14/files/patch-main::Makefile index 56624065f61f..47f93c3df6e1 100644 --- a/net/asterisk14/files/patch-main::Makefile +++ b/net/asterisk14/files/patch-main::Makefile @@ -1,5 +1,8 @@ ---- main/Makefile.orig 2008-01-29 19:43:41.000000000 +0200 -+++ main/Makefile 2008-03-13 13:57:48.000000000 +0200 + +$FreeBSD$ + +--- main/Makefile.orig ++++ main/Makefile @@ -102,8 +102,8 @@ cd editline && test -f config.h || CFLAGS="$(PTHREAD_CFLAGS) $(subst $(ASTTOPDIR),../../,$(ASTCFLAGS:-Werror=))" LDFLAGS="$(ASTLDFLAGS)" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-ncurses=$(NCURSES_DIR) --with-curses=$(CURSES_DIR) --with-termcap=$(TERMCAP_DIR) --with-tinfo=$(TINFO_DIR) $(MAKE) -C editline libedit.a @@ -11,7 +14,7 @@ ast_expr2.c ast_expr2.h: bison -o $@ -d --name-prefix=ast_yy ast_expr2.y -@@ -133,7 +133,7 @@ +@@ -138,7 +138,7 @@ H323LDLIBS= endif @@ -20,3 +23,12 @@ @$(ASTTOPDIR)/build_tools/make_build_h > $(ASTTOPDIR)/include/asterisk/build.h.tmp @if cmp -s $(ASTTOPDIR)/include/asterisk/build.h.tmp $(ASTTOPDIR)/include/asterisk/build.h ; then echo ; else \ mv $(ASTTOPDIR)/include/asterisk/build.h.tmp $(ASTTOPDIR)/include/asterisk/build.h ; \ +@@ -149,7 +149,7 @@ + ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),) + $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) + else +- $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) ++ $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) + endif + $(CMD_PREFIX) $(ASTTOPDIR)/build_tools/strip_nonapi $@ || rm $@ + -- cgit v1.2.3