diff options
author | Timo Teräs <timo.teras@iki.fi> | 2010-05-14 18:04:47 +0300 |
---|---|---|
committer | Timo Teräs <timo.teras@iki.fi> | 2010-05-14 18:04:47 +0300 |
commit | 229ead728746f8d7ad8f03bdadf975de3a985f1c (patch) | |
tree | b7bb70073420005b09d75ee8acc5127019f5a650 | |
parent | bb1d2327dc8e22774cd3a908f8463dddd2a74012 (diff) | |
download | aports-229ead728746f8d7ad8f03bdadf975de3a985f1c.tar.bz2 aports-229ead728746f8d7ad8f03bdadf975de3a985f1c.tar.xz |
main/asterisk: upgrade to 1.6.2.7
-rw-r--r-- | main/asterisk/102-gsm-pic.patch | 54 | ||||
-rw-r--r-- | main/asterisk/APKBUILD | 6 |
2 files changed, 2 insertions, 58 deletions
diff --git a/main/asterisk/102-gsm-pic.patch b/main/asterisk/102-gsm-pic.patch deleted file mode 100644 index 71370ec0b..000000000 --- a/main/asterisk/102-gsm-pic.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- a/codecs/gsm/Makefile.org 2008-03-29 11:33:09.000000000 +0100 -+++ b/codecs/gsm/Makefile 2008-03-29 11:44:40.000000000 +0100 -@@ -37,23 +37,6 @@ - ######### ppro's, etc, as well as the AMD K6 and K7. The compile will - ######### probably require gcc. - --ifeq (, $(findstring $(OSARCH) , Darwin SunOS )) --ifeq (, $(findstring $(PROC) , x86_64 amd64 ultrasparc sparc64 arm armv5b armeb ppc powerpc ppc64 ia64 s390 bfin mipsel mips)) --ifeq (, $(findstring $(shell uname -m) , ppc ppc64 alpha armv4l s390 )) --OPTIMIZE+=-march=$(PROC) --endif --endif --endif -- --#The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only. --#This works for even old (2.96) versions of gcc and provides a small boost either way. --#A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesn't support it. --#So we go lowest common available by gcc and go a step down, still a step up from --#the default as we now have a better instruction set to work with. - Belgarath --ifeq ($(PROC),ultrasparc) --OPTIMIZE+=-mcpu=v8 -mtune=$(PROC) -O3 --endif -- - PG = - #PG = -g -pg - ######### Profiling flags. If you don't know what that means, leave it blank. -@@ -208,12 +191,10 @@ - # XXX Keep a space after each findstring argument - # XXX should merge with GSM_OBJECTS - ifeq ($(OSARCH),linux-gnu) --ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc s390 )) --ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 s390 bfin mipsel mips )) -+ifneq ($(K6OPT),) - GSM_SOURCES+= $(SRC)/k6opt.s - endif - endif --endif - - TOAST_SOURCES = $(SRC)/toast.c \ - $(SRC)/toast_lin.c \ -@@ -260,12 +241,10 @@ - $(SRC)/table.o - - ifeq ($(OSARCH),linux-gnu) --ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc )) --ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 bfin mipsel mips )) -+ifneq ($(K6OPT),) - GSM_OBJECTS+= $(SRC)/k6opt.o - endif - endif --endif - - TOAST_OBJECTS = $(SRC)/toast.o \ - $(SRC)/toast_lin.o \ diff --git a/main/asterisk/APKBUILD b/main/asterisk/APKBUILD index 22b9668ee..7273b4f78 100644 --- a/main/asterisk/APKBUILD +++ b/main/asterisk/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Timo Teras <timo.teras@iki.fi> # Maintainer: Timo Teras <timo.teras@iki.fi> pkgname=asterisk -pkgver=1.6.2.6 +pkgver=1.6.2.7 pkgrel=0 pkgdesc="Asterisk: A Module Open Source PBX System" url="http://www.asterisk.org/" @@ -16,7 +16,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-pgsql $pkgname-odbc source="http://downloads.digium.com/pub/asterisk/releases/$pkgname-$pkgver.tar.gz 100-uclibc-daemon.patch 101-caps-uclibc.patch - 102-gsm-pic.patch 400-bug-227.patch asterisk.initd asterisk.confd @@ -104,10 +103,9 @@ sample() { make samples DESTDIR="$subpkgdir" } -md5sums="f068ef2433eebdc7f6dd635986f36d77 asterisk-1.6.2.6.tar.gz +md5sums="861f57ba43bfe05dc645e0679a260e41 asterisk-1.6.2.7.tar.gz b00c9d98ce2ad445501248a197c6e436 100-uclibc-daemon.patch 6e1129e30c4fd2c25c86c81685a485a9 101-caps-uclibc.patch -97b39fd9777a2521d4f9f095482b7ac2 102-gsm-pic.patch 79e9634b5054bceb3b8dc246654bb243 400-bug-227.patch 0ce3219e05f55af884a7dc6b99c2b276 asterisk.initd ed31d7ba37bcf8b0346dcf8593c395f0 asterisk.confd |