From: Elan Ruusamäe <glen@pld-linux.org>
Date: Tue, 29 Dec 2009 18:52:32 +0000 (+0000)
Subject: - update to 1.6.1.12
X-Git-Tag: auto/th/asterisk-1_6_1_12-0_34~14
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=e7993f7e63366dce74dfcb209f6c6c368b491f43;p=packages%2Fasterisk.git

- update to 1.6.1.12

Changed files:
    asterisk-lib.patch -> 1.3
    asterisk-no_k6_on_sparc.patch -> 1.5
---

diff --git a/asterisk-lib.patch b/asterisk-lib.patch
index 983c932..3a3bba8 100644
--- a/asterisk-lib.patch
+++ b/asterisk-lib.patch
@@ -1,9 +1,9 @@
---- asterisk-1.2.0/channels/Makefile.orig	2005-11-21 13:47:31.000000000 +0100
-+++ asterisk-1.2.0/channels/Makefile	2005-11-21 13:49:38.000000000 +0100
-@@ -31,8 +31,8 @@
+--- asterisk-1.6.1.12/channels/Makefile~	2009-07-21 16:48:38.000000000 +0300
++++ asterisk-1.6.1.12/channels/Makefile	2009-12-29 20:52:01.351345246 +0200
+@@ -21,8 +21,8 @@
  endif
  
- ifeq (${OSARCH},Linux)
+ ifeq ($(OSARCH),linux-gnu)
 -  PTLIB=-lpt_linux_x86_r
 -  H323LIB=-lh323_linux_x86_r
 +  PTLIB=-lpt
diff --git a/asterisk-no_k6_on_sparc.patch b/asterisk-no_k6_on_sparc.patch
index 1c2e932..775596a 100644
--- a/asterisk-no_k6_on_sparc.patch
+++ b/asterisk-no_k6_on_sparc.patch
@@ -1,34 +1,20 @@
---- asterisk-1.2.0/codecs/gsm/Makefile.orig	2005-11-21 13:34:00.000000000 +0100
-+++ asterisk-1.2.0/codecs/gsm/Makefile	2005-11-21 13:40:02.000000000 +0100
-@@ -235,6 +235,7 @@
- ifneq ($(shell uname -m),alpha)
- ifneq ($(shell uname -m),armv4l)
- ifneq ($(shell uname -m),sparc64)
-+ifneq ($(shell uname -m),sparc)
- ifneq (${PROC},arm)
+--- asterisk-1.6.1.12/codecs/gsm/Makefile~	2009-12-29 20:48:57.000000000 +0200
++++ asterisk-1.6.1.12/codecs/gsm/Makefile	2009-12-29 20:49:58.084691177 +0200
+@@ -208,7 +208,7 @@
+ # 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 $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 sparc parisc s390 ))
+ ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 s390 bfin mipsel mips ))
  GSM_SOURCES+= $(SRC)/k6opt.s
  endif
-@@ -245,6 +246,7 @@
- endif
- endif
- endif
-+endif
+@@ -261,7 +261,7 @@
+ 		$(SRC)/table.o
  
- TOAST_SOURCES = $(SRC)/toast.c 		\
- 		$(SRC)/toast_lin.c	\
-@@ -296,6 +298,7 @@
- ifneq ($(shell uname -m), ppc64)
- ifneq ($(shell uname -m), alpha)
- ifneq ($(shell uname -m), sparc64)
-+ifneq ($(shell uname -m), sparc)
- ifneq ($(shell uname -m), armv4l)
+ ifeq ($(OSARCH),linux-gnu)
+-ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc ))
++ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 sparc parisc ))
+ ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 bfin mipsel mips ))
  GSM_OBJECTS+= $(SRC)/k6opt.o
  endif
-@@ -305,6 +308,7 @@
- endif
- endif
- endif
-+endif
- 
- TOAST_OBJECTS =	$(SRC)/toast.o 		\
- 		$(SRC)/toast_lin.o	\