Author: glen Date: Thu Sep 16 14:47:36 2010 GMT
Module: packages Tag: ASTERISK_1_6_1
---- Log message:
- up to 1.6.1.20
---- Files affected:
packages/asterisk:
external-libedit.patch (1.1 -> 1.1.2.1) , lpc10-system.patch (1.2 ->
1.2.2.1) , mxml-system.patch (1.1 -> 1.1.2.1)
---- Diffs:
================================================================
Index: packages/asterisk/external-libedit.patch
diff -u packages/asterisk/external-libedit.patch:1.1
packages/asterisk/external-libedit.patch:1.1.2.1
--- packages/asterisk/external-libedit.patch:1.1 Tue Dec 29 18:22:46 2009
+++ packages/asterisk/external-libedit.patch Thu Sep 16 16:47:30 2010
@@ -63,7 +63,7 @@
ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),)
http.o: _ASTCFLAGS+=$(GMIME_INCLUDE)
endif
-@@ -161,13 +163,13 @@
+@@ -173,13 +173,13 @@
GMIMELDFLAGS+=$(GMIME_LIB)
endif
@@ -72,11 +72,11 @@
@$(CC) -c -o buildinfo.o $(_ASTCFLAGS) buildinfo.c $(ASTCFLAGS)
$(ECHO_PREFIX) echo " [LD] $^ -> $@"
ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),)
-- $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK)
$(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS)
$(GMIMELDFLAGS)
-+ $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK)
$(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS)
$(GMIMELDFLAGS) $(LIBEDIT_LIB)
+- $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK)
$(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS)
$(AST_EMBED_LIBS) $(GMIMELDFLAGS)
++ $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK)
$(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS)
$(AST_EMBED_LIBS) $(GMIMELDFLAGS) $(LIBEDIT_LIB)
else
-- $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK)
$(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS)
$(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS)
-+ $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK)
$(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS)
$(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS) $(LIBEDIT_LIB)
+- $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK)
$(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o
$(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS)
++ $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK)
$(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o
$(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS) $(LIBEDIT_LIB)
endif
$(CMD_PREFIX) $(ASTTOPDIR)/build_tools/strip_nonapi $@ || rm $@
================================================================
Index: packages/asterisk/lpc10-system.patch
diff -u packages/asterisk/lpc10-system.patch:1.2
packages/asterisk/lpc10-system.patch:1.2.2.1
--- packages/asterisk/lpc10-system.patch:1.2 Thu Dec 31 19:49:09 2009
+++ packages/asterisk/lpc10-system.patch Thu Sep 16 16:47:30 2010
@@ -54,16 +54,16 @@
gtk_inclu...@gtk_include@
gtk_l...@gtk_lib@
---- asterisk-1.6.1.12/configure.ac~ 2009-12-31 11:15:37.000000000 +0200
-+++ asterisk-1.6.1.12/configure.ac 2009-12-31 13:09:33.900041134 +0200
-@@ -237,6 +237,7 @@
+--- asterisk-1.6.1.20/configure.ac~ 2010-09-16 17:38:40.000000000 +0300
++++ asterisk-1.6.1.20/configure.ac 2010-09-16 17:41:17.036609257 +0300
+@@ -283,6 +283,7 @@
AST_EXT_LIB_SETUP([DAHDI], [DAHDI], [dahdi])
- AST_EXT_LIB_SETUP([FFMPEG], [Ffmpeg and avcodec library], [avcodec])
- AST_EXT_LIB_SETUP([GSM], [External GSM library], [gsm], [, use 'internal' GSM
otherwise])
+ AST_EXT_LIB_SETUP([FFMPEG], [Ffmpeg and avcodec], [avcodec])
+ AST_EXT_LIB_SETUP([GSM], [External GSM], [gsm], [, use 'internal' GSM
otherwise])
+AST_EXT_LIB_SETUP([LPC10], [External lpc10 library], [lpc10], [, use
'internal' lpc10 otherwise])
- AST_EXT_LIB_SETUP([GTK], [gtk libraries], [gtk])
- AST_EXT_LIB_SETUP([GTK2], [gtk2 libraries], [gtk2])
- AST_EXT_LIB_SETUP([GMIME], [GMime library], [gmime])
+ AST_EXT_LIB_SETUP([GTK], [gtk], [gtk])
+ AST_EXT_LIB_SETUP([GTK2], [gtk2], [gtk2])
+ AST_EXT_LIB_SETUP([GMIME], [GMime], [gmime])
@@ -712,6 +713,72 @@
fi
fi
================================================================
Index: packages/asterisk/mxml-system.patch
diff -u packages/asterisk/mxml-system.patch:1.1
packages/asterisk/mxml-system.patch:1.1.2.1
--- packages/asterisk/mxml-system.patch:1.1 Wed Dec 30 22:23:03 2009
+++ packages/asterisk/mxml-system.patch Thu Sep 16 16:47:30 2010
@@ -40,12 +40,12 @@
ifdef C_OBJS
menuselect_curses.o: CFLAGS+=$(C_INCLUDE)
---- asterisk-1.6.1.12/menuselect/menuselect.c~ 2009-06-03 02:21:48.000000000
+0300
-+++ asterisk-1.6.1.12/menuselect/menuselect.c 2009-12-30 23:18:45.881616815
+0200
-@@ -29,8 +29,8 @@
- #include <string.h>
+--- asterisk-1.6.1.20/menuselect/menuselect.c~ 2010-04-19 20:09:10.000000000
+0300
++++ asterisk-1.6.1.20/menuselect/menuselect.c 2010-09-16 17:36:18.370864953
+0300
+@@ -30,8 +30,8 @@
#include <unistd.h>
#include <stdarg.h>
+ #include <getopt.h>
+#include <mxml.h>
-#include "mxml/mxml.h"
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/asterisk/external-libedit.patch?r1=1.1&r2=1.1.2.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/asterisk/lpc10-system.patch?r1=1.2&r2=1.2.2.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/asterisk/mxml-system.patch?r1=1.1&r2=1.1.2.1&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
