From aefcfd6c9402fdff88380e00d8b8959822b72dbb Mon Sep 17 00:00:00 2001 From: craig Date: Thu, 12 Oct 2006 18:45:14 +0000 Subject: [PATCH] Asterisk version update and GSM patch from dkowis@shlrm.org git-svn-id: http://svn.gumstix.com/gumstix-buildroot/trunk@1133 440079d4-f5dc-0310-964d-94f3b09ad5cf --- package/asterisk/asterisk-gsm-codec.patch | 18 ++++++++++++++++++ package/asterisk/asterisk-uclibc-compat.patch | 4 ++-- package/asterisk/asterisk-utils-getloadavg.patch | 4 ++-- package/asterisk/asterisk.mk | 3 ++- package/asterisk/asterisk_no_res_ninit.patch | 2 +- 5 files changed, 25 insertions(+), 6 deletions(-) create mode 100644 package/asterisk/asterisk-gsm-codec.patch diff --git a/package/asterisk/asterisk-gsm-codec.patch b/package/asterisk/asterisk-gsm-codec.patch new file mode 100644 index 0000000..ed2c81b --- /dev/null +++ b/package/asterisk/asterisk-gsm-codec.patch @@ -0,0 +1,18 @@ +--- Makefile.old 2006-10-11 12:57:35.000000000 -0500 ++++ asterisk-1.2.12.1/codecs/gsm/Makefile 2006-10-11 12:58:10.000000000 -0500 +@@ -310,6 +310,7 @@ + ifneq ($(shell uname -m), armv4l) + ifneq ($(shell uname -m), parisc) + ifneq ($(shell uname -m),s390) ++ifneq (${PROC},arm) + GSM_OBJECTS+= $(SRC)/k6opt.o + endif + endif +@@ -321,6 +322,7 @@ + endif + endif + endif ++endif + + TOAST_OBJECTS = $(SRC)/toast.o \ + $(SRC)/toast_lin.o \ diff --git a/package/asterisk/asterisk-uclibc-compat.patch b/package/asterisk/asterisk-uclibc-compat.patch index 5fdfdbf..30227f2 100644 --- a/package/asterisk/asterisk-uclibc-compat.patch +++ b/package/asterisk/asterisk-uclibc-compat.patch @@ -1,5 +1,5 @@ ---- asterisk-1.2.4/Makefile.orig 2006-02-24 09:31:16.000000000 -0800 -+++ asterisk-1.2.4/Makefile 2006-02-24 09:31:32.000000000 -0800 +--- asterisk-1.2.12.1/Makefile.orig 2006-02-24 09:31:16.000000000 -0800 ++++ asterisk-1.2.12.1/Makefile 2006-02-24 09:31:32.000000000 -0800 @@ -345,16 +345,6 @@ netsock.o slinfactory.o ast_expr2.o ast_expr2f.o \ cryptostub.o diff --git a/package/asterisk/asterisk-utils-getloadavg.patch b/package/asterisk/asterisk-utils-getloadavg.patch index f55c417..4df3c52 100644 --- a/package/asterisk/asterisk-utils-getloadavg.patch +++ b/package/asterisk/asterisk-utils-getloadavg.patch @@ -1,5 +1,5 @@ ---- asterisk-1.2.4/utils.c.orig 2006-02-24 09:48:45.000000000 -0800 -+++ asterisk-1.2.4/utils.c 2006-02-24 09:49:00.000000000 -0800 +--- asterisk-1.2.12.1/utils.c.orig 2006-02-24 09:48:45.000000000 -0800 ++++ asterisk-1.2.12.1/utils.c 2006-02-24 09:49:00.000000000 -0800 @@ -842,7 +842,6 @@ } #endif /* !HAVE_STRTOQ */ diff --git a/package/asterisk/asterisk.mk b/package/asterisk/asterisk.mk index f31e806..c7ae5f6 100644 --- a/package/asterisk/asterisk.mk +++ b/package/asterisk/asterisk.mk @@ -3,7 +3,7 @@ # asterisk # ############################################################## -ASTERISK_VERSION := 1.2.4 +ASTERISK_VERSION := 1.2.12.1 ASTERISK_SOURCE := asterisk-$(ASTERISK_VERSION).tar.gz ASTERISK_SITE := ftp://ftp.digium.com/pub/asterisk ASTERISK_DIR := $(BUILD_DIR)/asterisk-$(ASTERISK_VERSION) @@ -25,6 +25,7 @@ $(ASTERISK_DIR)/$(ASTERISK_BINARY): $(ASTERISK_DIR)/.configured $(MAKE1) -C $(ASTERISK_DIR) CROSS_ARCH=Linux CROSS_COMPILE=$(TARGET_CROSS) CROSS_COMPILE_BIN=$(STAGING_DIR)/bin/ CROSS_COMPILE_TARGET=$(STAGING_DIR) CROSS_PROC=$(OPTIMIZE_FOR_CPU) OPTIMIZE="$(TARGET_OPTIMIZATION)" OPTIONS=-DLOW_MEMORY DEBUG= $(TARGET_CONFIGURE_OPTS) $(TARGET_DIR)/$(ASTERISK_TARGET_BINARY): $(ASTERISK_DIR)/$(ASTERISK_BINARY) + mkdir -p $(TARGET_DIR)/usr/lib/asterisk/modules $(MAKE) -C $(ASTERISK_DIR) CROSS_ARCH=Linux CROSS_COMPILE=$(TARGET_CROSS) CROSS_COMPILE_BIN=$(TARGET_CC) CROSS_COMPILE_TARGET=$(STAGING_DIR) CROSS_PROC=$(OPTIMIZE_FOR_CPU) OPTIMIZE="$(TARGET_OPTIMIZATION)" OPTIONS=-DLOW_MEMORY DEBUG= $(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR) install $(STRIP) $(TARGET_DIR)/usr/sbin/asterisk $(STRIP) $(TARGET_DIR)/usr/sbin/stereorize diff --git a/package/asterisk/asterisk_no_res_ninit.patch b/package/asterisk/asterisk_no_res_ninit.patch index 1dff2f3..b2e5161 100644 --- a/package/asterisk/asterisk_no_res_ninit.patch +++ b/package/asterisk/asterisk_no_res_ninit.patch @@ -1,6 +1,6 @@ diff -ur /tmp/asterisk-1.2.0-beta1/dns.c asterisk-1.2.0-beta1/dns.c --- /tmp/asterisk-1.2.0-beta1/dns.c 2005-08-14 04:23:33.000000000 +0200 -+++ asterisk-1.2.0-beta1/dns.c 2005-08-31 09:42:36.000000000 +0200 ++++ asterisk-1.2.12.1/dns.c 2005-08-31 09:42:36.000000000 +0200 @@ -157,7 +157,7 @@ return 0; } -- 2.11.4.GIT