Gentoo Archives: gentoo-commits

From: "Tony Vroon (chainsaw)" <chainsaw@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-misc/asterisk/files/1.6.2: asterisk-1.6.2.9-gsm-pic.patch
Date: Fri, 25 Jun 2010 15:14:16
Message-Id: 20100625151409.A5E382CF60@corvid.gentoo.org
1 chainsaw 10/06/25 15:14:09
2
3 Added: asterisk-1.6.2.9-gsm-pic.patch
4 Log:
5 New upstream version. A DTMF crasher has been fixed, several off-by-one errors have been addressed. Also the build system has seen some improvements. With thanks to Oliver Jacksch for a rebased patch, closes bug #324657. Research by Jaco Kroon closes bug #325231 by Kerin Millar. Cleaned up old ebuilds.
6 (Portage version: 2.1.8.3/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 net-misc/asterisk/files/1.6.2/asterisk-1.6.2.9-gsm-pic.patch
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/asterisk/files/1.6.2/asterisk-1.6.2.9-gsm-pic.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/asterisk/files/1.6.2/asterisk-1.6.2.9-gsm-pic.patch?rev=1.1&content-type=text/plain
13
14 Index: asterisk-1.6.2.9-gsm-pic.patch
15 ===================================================================
16 diff -uNr asterisk-1.6.2.9.ORIG/codecs/gsm/Makefile asterisk-1.6.2.9/codecs/gsm/Makefile
17 --- asterisk-1.6.2.9.ORIG/codecs/gsm/Makefile 2010-03-09 21:39:20.000000000 +0100
18 +++ asterisk-1.6.2.9/codecs/gsm/Makefile 2010-03-09 21:39:20.000000000 +0100
19 @@ -37,30 +37,6 @@
20 ######### ppro's, etc, as well as the AMD K6 and K7. The compile will
21 ######### probably require gcc.
22
23 -ifeq (,$(findstring $(OSARCH),Darwin SunOS))
24 - ifeq (,$(strip $(findstring $(PROC) ,"x86_64 amd64 ultrasparc sparc64 arm armv5b armeb ppc powerpc ppc64 ia64 s390 bfin mipsel mips ")))
25 - ifeq (,$(strip $(findstring $(shell uname -m) ,"ppc ppc64 alpha armv4l s390 ")))
26 - OPTIMIZE+=-march=$(PROC)
27 - endif
28 - endif
29 -else
30 - ifneq (,$(findstring $(OSARCH),Darwin))
31 - ifeq ($(shell /usr/bin/sw_vers -productVersion | cut -c1-4),10.6)
32 - # Snow Leopard reports i386, even though it's really x86_64
33 - OPTIMIZE+=-mtune=native
34 - endif
35 - endif
36 -endif
37 -
38 -#The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
39 -#This works for even old (2.96) versions of gcc and provides a small boost either way.
40 -#A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesn't support it.
41 -#So we go lowest common available by gcc and go a step down, still a step up from
42 -#the default as we now have a better instruction set to work with. - Belgarath
43 -ifeq ($(PROC),ultrasparc)
44 -OPTIMIZE+=-mcpu=v8 -mtune=$(PROC) -O3
45 -endif
46 -
47 PG =
48 #PG = -g -pg
49 ######### Profiling flags. If you don't know what that means, leave it blank.
50 @@ -215,11 +191,9 @@
51 # XXX Keep a space after each findstring argument
52 # XXX should merge with GSM_OBJECTS
53 ifeq ($(OSARCH),linux-gnu)
54 -ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc s390 ))
55 -ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 s390 bfin mipsel mips ))
56 -GSM_SOURCES+= $(SRC)/k6opt.s
57 -endif
58 -endif
59 + ifneq ($(K6OPT),)
60 + GSM_SOURCES+= $(SRC)/k6opt.s
61 + endif
62 endif
63
64 TOAST_SOURCES = $(SRC)/toast.c \
65 @@ -267,11 +241,9 @@
66 $(SRC)/table.o
67
68 ifeq ($(OSARCH),linux-gnu)
69 -ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc ))
70 -ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 bfin mipsel mips ))
71 -GSM_OBJECTS+= $(SRC)/k6opt.o
72 -endif
73 -endif
74 + ifneq ($(K6OPT),)
75 + GSM_OBJECTS+= $(SRC)/k6opt.o
76 + endif
77 endif
78
79 TOAST_OBJECTS = $(SRC)/toast.o \