[gentoo-commits] gentoo-x86 commit in net-misc/asterisk/files/1.6.2: asterisk-1.6.2.7-pri-missing-keyword.patch asterisk-1.6.2.7-gsm-pic.patch

[gentoo-commits] gentoo-x86 commit in net-misc/asterisk/files/1.6.2: asterisk-1.6.2.7-pri-missing-keyword.patch asterisk-1.6.2.7-gsm-pic.patch

[Tony Vroon (chainsaw)]

chainsaw    10/05/13 14:52:35

  Added:                asterisk-1.6.2.7-pri-missing-keyword.patch
                        asterisk-1.6.2.7-gsm-pic.patch
  Log:
  Bugfix release from upstream, closes bug #318535 by Thomas Stein. Many thanks to Oliver Jaksch for his patch rediffing & scavenging activities. /etc/asterisk will no longer be polluted with any sample files if the samples USE-flag is unset, closes bug #286574 by Jeremy Johnson and bug #305313 by Michael Higgins.
  (Portage version: 2.1.8.3/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  net-misc/asterisk/files/1.6.2/asterisk-1.6.2.7-pri-missing-keyword.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/asterisk/files/1.6.2/asterisk-1.6.2.7-pri-missing-keyword.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/asterisk/files/1.6.2/asterisk-1.6.2.7-pri-missing-keyword.patch?rev=1.1&content-type=text/plain

Index: asterisk-1.6.2.7-pri-missing-keyword.patch
===================================================================
diff -uNr asterisk-1.6.2.6.ORIG/include/asterisk/autoconfig.h.in	asterisk-1.6.2.6/include/asterisk/autoconfig.h.in
--- asterisk-1.6.2.6.ORIG/include/asterisk/autoconfig.h.in	2009-09-29 09:53:36.000000000 +0200
+++ asterisk-1.6.2.6/include/asterisk/autoconfig.h.in	2009-09-29   2009-09-29 09:53:36.000000000 +0200
@@ -616,6 +616,8 @@
 /* Define to 1 if you have the ISDN PRI library. */
 #undef HAVE_PRI
 
+#undef HAVE_PRI_PROG_W_CAUSE
+
 /* Define to 1 if you have the ISDN PRI set_inbanddisconnect library. */
 #undef HAVE_PRI_INBANDDISCONNECT
 



1.1                  net-misc/asterisk/files/1.6.2/asterisk-1.6.2.7-gsm-pic.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/asterisk/files/1.6.2/asterisk-1.6.2.7-gsm-pic.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/asterisk/files/1.6.2/asterisk-1.6.2.7-gsm-pic.patch?rev=1.1&content-type=text/plain

Index: asterisk-1.6.2.7-gsm-pic.patch
===================================================================
diff -uNr asterisk-1.6.2.7.ORIG/codecs/gsm/Makefile asterisk-1.6.2.7/codecs/gsm/Makefile
--- asterisk-1.6.2.7.ORIG/codecs/gsm/Makefile	2010-03-09 21:39:20.000000000 +0100
+++ asterisk-1.6.2.7/codecs/gsm/Makefile		2010-03-09 21:39:20.000000000 +0100
@@ -37,28 +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 ))
-ifeq ($(shell /usr/bin/sw_vers -productVersion | cut -c1-4),10.6)
-# Wow... Snow Leopard is BROKEN!
-OPTIMIZE+=-mtune=native
-else
-OPTIMIZE+=-march=$(PROC)
-endif
-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.
@@ -213,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	\
@@ -265,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	\