aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2010-05-14 18:04:47 +0300
committerTimo Teräs <timo.teras@iki.fi>2010-05-14 18:04:47 +0300
commit229ead728746f8d7ad8f03bdadf975de3a985f1c (patch)
treeb7bb70073420005b09d75ee8acc5127019f5a650
parentbb1d2327dc8e22774cd3a908f8463dddd2a74012 (diff)
downloadalpine_aports-229ead728746f8d7ad8f03bdadf975de3a985f1c.tar.bz2
alpine_aports-229ead728746f8d7ad8f03bdadf975de3a985f1c.tar.xz
alpine_aports-229ead728746f8d7ad8f03bdadf975de3a985f1c.zip
main/asterisk: upgrade to 1.6.2.7
-rw-r--r--main/asterisk/102-gsm-pic.patch54
-rw-r--r--main/asterisk/APKBUILD6
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 71370ec0b7..0000000000
--- a/main/asterisk/102-gsm-pic.patch
+++ /dev/null
@@ -1,54 +0,0 @@
1--- a/codecs/gsm/Makefile.org 2008-03-29 11:33:09.000000000 +0100
2+++ b/codecs/gsm/Makefile 2008-03-29 11:44:40.000000000 +0100
3@@ -37,23 +37,6 @@
4 ######### ppro's, etc, as well as the AMD K6 and K7. The compile will
5 ######### probably require gcc.
6
7-ifeq (, $(findstring $(OSARCH) , Darwin SunOS ))
8-ifeq (, $(findstring $(PROC) , x86_64 amd64 ultrasparc sparc64 arm armv5b armeb ppc powerpc ppc64 ia64 s390 bfin mipsel mips))
9-ifeq (, $(findstring $(shell uname -m) , ppc ppc64 alpha armv4l s390 ))
10-OPTIMIZE+=-march=$(PROC)
11-endif
12-endif
13-endif
14-
15-#The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
16-#This works for even old (2.96) versions of gcc and provides a small boost either way.
17-#A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesn't support it.
18-#So we go lowest common available by gcc and go a step down, still a step up from
19-#the default as we now have a better instruction set to work with. - Belgarath
20-ifeq ($(PROC),ultrasparc)
21-OPTIMIZE+=-mcpu=v8 -mtune=$(PROC) -O3
22-endif
23-
24 PG =
25 #PG = -g -pg
26 ######### Profiling flags. If you don't know what that means, leave it blank.
27@@ -208,12 +191,10 @@
28 # XXX Keep a space after each findstring argument
29 # XXX should merge with GSM_OBJECTS
30 ifeq ($(OSARCH),linux-gnu)
31-ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc s390 ))
32-ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 s390 bfin mipsel mips ))
33+ifneq ($(K6OPT),)
34 GSM_SOURCES+= $(SRC)/k6opt.s
35 endif
36 endif
37-endif
38
39 TOAST_SOURCES = $(SRC)/toast.c \
40 $(SRC)/toast_lin.c \
41@@ -260,12 +241,10 @@
42 $(SRC)/table.o
43
44 ifeq ($(OSARCH),linux-gnu)
45-ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc ))
46-ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 bfin mipsel mips ))
47+ifneq ($(K6OPT),)
48 GSM_OBJECTS+= $(SRC)/k6opt.o
49 endif
50 endif
51-endif
52
53 TOAST_OBJECTS = $(SRC)/toast.o \
54 $(SRC)/toast_lin.o \
diff --git a/main/asterisk/APKBUILD b/main/asterisk/APKBUILD
index 22b9668eef..7273b4f78e 100644
--- a/main/asterisk/APKBUILD
+++ b/main/asterisk/APKBUILD
@@ -1,7 +1,7 @@
1# Contributor: Timo Teras <timo.teras@iki.fi> 1# Contributor: Timo Teras <timo.teras@iki.fi>
2# Maintainer: Timo Teras <timo.teras@iki.fi> 2# Maintainer: Timo Teras <timo.teras@iki.fi>
3pkgname=asterisk 3pkgname=asterisk
4pkgver=1.6.2.6 4pkgver=1.6.2.7
5pkgrel=0 5pkgrel=0
6pkgdesc="Asterisk: A Module Open Source PBX System" 6pkgdesc="Asterisk: A Module Open Source PBX System"
7url="http://www.asterisk.org/" 7url="http://www.asterisk.org/"
@@ -16,7 +16,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-pgsql $pkgname-odbc
16source="http://downloads.digium.com/pub/asterisk/releases/$pkgname-$pkgver.tar.gz 16source="http://downloads.digium.com/pub/asterisk/releases/$pkgname-$pkgver.tar.gz
17 100-uclibc-daemon.patch 17 100-uclibc-daemon.patch
18 101-caps-uclibc.patch 18 101-caps-uclibc.patch
19 102-gsm-pic.patch
20 400-bug-227.patch 19 400-bug-227.patch
21 asterisk.initd 20 asterisk.initd
22 asterisk.confd 21 asterisk.confd
@@ -104,10 +103,9 @@ sample() {
104 make samples DESTDIR="$subpkgdir" 103 make samples DESTDIR="$subpkgdir"
105} 104}
106 105
107md5sums="f068ef2433eebdc7f6dd635986f36d77 asterisk-1.6.2.6.tar.gz 106md5sums="861f57ba43bfe05dc645e0679a260e41 asterisk-1.6.2.7.tar.gz
108b00c9d98ce2ad445501248a197c6e436 100-uclibc-daemon.patch 107b00c9d98ce2ad445501248a197c6e436 100-uclibc-daemon.patch
1096e1129e30c4fd2c25c86c81685a485a9 101-caps-uclibc.patch 1086e1129e30c4fd2c25c86c81685a485a9 101-caps-uclibc.patch
11097b39fd9777a2521d4f9f095482b7ac2 102-gsm-pic.patch
11179e9634b5054bceb3b8dc246654bb243 400-bug-227.patch 10979e9634b5054bceb3b8dc246654bb243 400-bug-227.patch
1120ce3219e05f55af884a7dc6b99c2b276 asterisk.initd 1100ce3219e05f55af884a7dc6b99c2b276 asterisk.initd
113ed31d7ba37bcf8b0346dcf8593c395f0 asterisk.confd 111ed31d7ba37bcf8b0346dcf8593c395f0 asterisk.confd