Menu
▾
▴
[Astlinux-commits] SF.net SVN: astlinux:[7623] branches/1.0/package
|
From: <abe...@us...> - 2016-03-30 21:23:22
|
Revision: 7623
http://sourceforge.net/p/astlinux/code/7623
Author: abelbeck
Date: 2016-03-30 21:23:20 +0000 (Wed, 30 Mar 2016)
Log Message:
-----------
asterisk, version bump to 11.22.0 and 13.8.0, update pjsip build opts
Modified Paths:
--------------
branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch
branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch
branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch
branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch
branches/1.0/package/asterisk/asterisk.mk
branches/1.0/package/pjsip/asterisk-config_site.h
branches/1.0/package/pjsip/pjsip.mk
Added Paths:
-----------
branches/1.0/package/asterisk/asterisk-13-main-Makefile-fix.patch
Modified: branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch 2016-03-30 12:45:40 UTC (rev 7622)
+++ branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch 2016-03-30 21:23:20 UTC (rev 7623)
@@ -1,6 +1,6 @@
--- asterisk-1.8.25.0/configure.ac.orig 2014-01-24 16:52:23.000000000 -0600
+++ asterisk-1.8.25.0/configure.ac 2014-01-24 16:55:14.000000000 -0600
-@@ -2410,11 +2410,13 @@
+@@ -2474,11 +2474,13 @@
AC_OUTPUT
${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2
Modified: branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch 2016-03-30 12:45:40 UTC (rev 7622)
+++ branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch 2016-03-30 21:23:20 UTC (rev 7623)
@@ -1,6 +1,6 @@
--- asterisk-11.17.1/channels/chan_sip.c.orig 2015-04-23 10:22:04.000000000 -0500
+++ asterisk-11.17.1/channels/chan_sip.c 2015-04-23 10:22:40.000000000 -0500
-@@ -16790,7 +16790,7 @@
+@@ -16781,7 +16781,7 @@
}
if (!force) {
Modified: branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch 2016-03-30 12:45:40 UTC (rev 7622)
+++ branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch 2016-03-30 21:23:20 UTC (rev 7623)
@@ -1,6 +1,6 @@
--- asterisk-13.1.0/configure.ac.orig 2014-01-24 16:52:23.000000000 -0600
+++ asterisk-13.1.0/configure.ac 2014-01-24 16:55:14.000000000 -0600
-@@ -2523,11 +2523,13 @@
+@@ -2631,11 +2631,13 @@
AC_OUTPUT
${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2
Modified: branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch 2016-03-30 12:45:40 UTC (rev 7622)
+++ branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch 2016-03-30 21:23:20 UTC (rev 7623)
@@ -1,6 +1,6 @@
--- asterisk-11.17.1/channels/chan_sip.c.orig 2015-04-23 10:22:04.000000000 -0500
+++ asterisk-11.17.1/channels/chan_sip.c 2015-04-23 10:22:40.000000000 -0500
-@@ -16943,7 +16943,7 @@
+@@ -17333,7 +17333,7 @@
}
if (!force) {
Added: branches/1.0/package/asterisk/asterisk-13-main-Makefile-fix.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-main-Makefile-fix.patch (rev 0)
+++ branches/1.0/package/asterisk/asterisk-13-main-Makefile-fix.patch 2016-03-30 21:23:20 UTC (rev 7623)
@@ -0,0 +1,13 @@
+--- asterisk-13.8.0/main/Makefile.orig 2016-03-30 12:32:58.000000000 -0500
++++ asterisk-13.8.0/main/Makefile 2016-03-30 12:33:23.000000000 -0500
+@@ -226,9 +226,8 @@
+ $(ECHO_PREFIX) echo " [LN] $< -> $@"
+ ifneq ($(LDCONFIG),)
+ $(CMD_PREFIX) $(LDCONFIG) $(LDCONFIG_FLAGS) . 2>/dev/null
+-else
+- $(CMD_PREFIX) $(LN) -sf $< $@
+ endif
++ $(CMD_PREFIX) $(LN) -sf $< $@
+
+ else # Darwin
+ ASTSSL_LIB:=libasteriskssl.dylib
Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk 2016-03-30 12:45:40 UTC (rev 7622)
+++ branches/1.0/package/asterisk/asterisk.mk 2016-03-30 21:23:20 UTC (rev 7623)
@@ -7,9 +7,9 @@
ASTERISK_VERSION := 1.8.32.3
else
ifeq ($(BR2_PACKAGE_ASTERISK_v11),y)
-ASTERISK_VERSION := 11.21.2
+ASTERISK_VERSION := 11.22.0
else
-ASTERISK_VERSION := 13.7.2
+ASTERISK_VERSION := 13.8.0
endif
endif
ASTERISK_SOURCE := asterisk-$(ASTERISK_VERSION).tar.gz
@@ -213,9 +213,10 @@
touch $@
-$(ASTERISK_DIR)/.configured: $(ASTERISK_DIR)/.patched | host-pkg-config host-ncurses host-bison host-flex host-libxml2 \
+$(ASTERISK_DIR)/.configured: $(ASTERISK_DIR)/.patched | host-automake host-pkg-config host-ncurses host-bison host-flex host-libxml2 \
libelf ncurses zlib openssl libtool util-linux $(ASTERISK_EXTRAS)
(cd $(ASTERISK_DIR); rm -rf config.cache configure; \
+ $(HOST_CONFIGURE_OPTS) \
./bootstrap.sh; \
$(TARGET_CONFIGURE_OPTS) \
./configure \
Modified: branches/1.0/package/pjsip/asterisk-config_site.h
===================================================================
--- branches/1.0/package/pjsip/asterisk-config_site.h 2016-03-30 12:45:40 UTC (rev 7622)
+++ branches/1.0/package/pjsip/asterisk-config_site.h 2016-03-30 21:23:20 UTC (rev 7623)
@@ -4,40 +4,35 @@
*
*/
+#include <sys/select.h>
+
+#define PJ_HAS_IPV6 1
#define NDEBUG 1
-#define PJ_HAS_IPV6 1
-#define PJ_MAX_HOSTNAME 256
-#define PJSIP_MAX_URL_SIZE 512
-
-/* The upper limit on MAX_HANDLES is determined by
- * the value of FD_SETSIZE on your system. For Linux
- * this is usually 1024. The following code sets it
- * to whatever FD_SETSIZE is or you can set it to a
- * specific number yourself. pjproject will not
- * compile if you set it to greater than FD_SETSIZE.
- */
-#include <sys/select.h>
-#define PJ_IOQUEUE_MAX_HANDLES (FD_SETSIZE)
-
-/* Set for maximum server performance.
- * In tests, setting these parameters reduced
- * CPU load by approximately 25% for the same number
- * of calls per second. Your results will vary,
- * of course.
- */
-#define PJ_SCANNER_USE_BITWISE 0
-#define PJ_OS_HAS_CHECK_STACK 0
-#define PJ_LOG_MAX_LEVEL 3
-#define PJ_ENABLE_EXTRA_CHECK 0
-#define PJSIP_MAX_TSX_COUNT ((64*1024)-1)
-#define PJSIP_MAX_DIALOG_COUNT ((64*1024)-1)
-#define PJSIP_UDP_SO_SNDBUF_SIZE (512*1024)
-#define PJSIP_UDP_SO_RCVBUF_SIZE (512*1024)
-#define PJ_DEBUG 0
-#define PJSIP_SAFE_MODULE 0
-#define PJ_HAS_STRICMP_ALNUM 0
-#define PJ_HASH_USE_OWN_TOLOWER 1
-#define PJSIP_UNESCAPE_IN_PLACE 1
+#define PJ_MAX_HOSTNAME (256)
+#define PJSIP_MAX_URL_SIZE (512)
+#ifdef PJ_HAS_LINUX_EPOLL
+#define PJ_IOQUEUE_MAX_HANDLES (5000)
+#else
+#define PJ_IOQUEUE_MAX_HANDLES (FD_SETSIZE)
+#endif
+#define PJ_IOQUEUE_HAS_SAFE_UNREG 1
+#define PJ_IOQUEUE_MAX_EVENTS_IN_SINGLE_POLL (16)
+
+#define PJ_SCANNER_USE_BITWISE 0
+#define PJ_OS_HAS_CHECK_STACK 0
+#define PJ_LOG_MAX_LEVEL 3
+#define PJ_ENABLE_EXTRA_CHECK 0
+#define PJSIP_MAX_TSX_COUNT ((64*1024)-1)
+#define PJSIP_MAX_DIALOG_COUNT ((64*1024)-1)
+#define PJSIP_UDP_SO_SNDBUF_SIZE (512*1024)
+#define PJSIP_UDP_SO_RCVBUF_SIZE (512*1024)
+#define PJ_DEBUG 0
+#define PJSIP_SAFE_MODULE 0
+#define PJ_HAS_STRICMP_ALNUM 0
+#define PJ_HASH_USE_OWN_TOLOWER 1
+#define PJSIP_UNESCAPE_IN_PLACE 1
+#define PJSIP_MAX_PKT_LEN 6000
+
#undef PJ_TODO
#define PJ_TODO(x)
Modified: branches/1.0/package/pjsip/pjsip.mk
===================================================================
--- branches/1.0/package/pjsip/pjsip.mk 2016-03-30 12:45:40 UTC (rev 7622)
+++ branches/1.0/package/pjsip/pjsip.mk 2016-03-30 21:23:20 UTC (rev 7623)
@@ -23,10 +23,14 @@
PJSIP_CONF_OPT = \
--with-external-srtp \
+ --disable-video \
+ --disable-v4l2 \
--disable-sound \
+ --disable-opencore-amr \
+ --disable-ilbc-codec \
+ --disable-g7221-codec \
--disable-resample \
- --disable-video \
- --disable-opencore-amr
+ --without-libyuv
ifeq ($(BR2_PACKAGE_OPENSSL),y)
PJSIP_CONF_OPT += --with-ssl=$(STAGING_DIR)/usr
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
