asterisk-13.x: bump to 13.19.0
- Remove 003-disable-ast-xml-docs.patch, it doesn't apply anymore. Instead change --enable-xmldoc into --disable-xmldoc in the Makefile. - Remove 055-ASTERISK-24517.patch again due to multiple hunk failures. - Refresh patches. Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
This commit is contained in:
parent
b0e5bba218
commit
3c8c7844ae
|
@ -10,12 +10,12 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=asterisk13
|
||||
PKG_VERSION:=13.18.4
|
||||
PKG_VERSION:=13.19.0
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/asterisk/releases
|
||||
PKG_HASH:=a14c2132eaa4f581452cd6d4d5094639e67a28eb70102458c796660d704115e4
|
||||
PKG_HASH:=57b3f37f7c9f557754b6e67b183922a4957c832dc9150ae4024aedc4948d53d0
|
||||
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/asterisk-$(PKG_VERSION)
|
||||
PKG_BUILD_DEPENDS:=libxml2/host
|
||||
|
@ -242,6 +242,7 @@ endif
|
|||
TARGET_CFLAGS+=$(TARGET_CPPFLAGS)
|
||||
|
||||
CONFIGURE_ARGS+= \
|
||||
--disable-xmldoc \
|
||||
$(if $(CONFIG_PACKAGE_$(PKG_NAME)-chan-alsa),--with-asound="$(STAGING_DIR)/usr",--without-asound) \
|
||||
--without-execinfo \
|
||||
$(if $(CONFIG_PACKAGE_$(PKG_NAME)-chan-mobile),--with-bluetooth="$(STAGING_DIR)/usr",--without-bluetooth) \
|
||||
|
@ -278,8 +279,7 @@ CONFIGURE_ARGS+= \
|
|||
$(if $(CONFIG_PACKAGE_$(PKG_NAME)-format-ogg-vorbis),--with-vorbis="$(STAGING_DIR)/usr",--without-vorbis) \
|
||||
--without-vpb \
|
||||
--with-z="$(STAGING_DIR)/usr" \
|
||||
--with-sounds-cache="$(DL_DIR)" \
|
||||
--enable-xmldoc
|
||||
--with-sounds-cache="$(DL_DIR)"
|
||||
|
||||
ifeq ($(CONFIG_PACKAGE_$(PKG_NAME)-codec-speex)$(CONFIG_PACKAGE_$(PKG_NAME)-func-speex),)
|
||||
CONFIGURE_ARGS+= \
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -963,19 +963,6 @@ AC_LINK_IFELSE(
|
||||
@@ -965,19 +965,6 @@ AC_LINK_IFELSE(
|
||||
]
|
||||
)
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1290,7 +1290,6 @@ AC_LINK_IFELSE(
|
||||
@@ -1299,7 +1299,6 @@ AC_LINK_IFELSE(
|
||||
#include <resolv.h>],
|
||||
[int foo = res_ninit(NULL);])],
|
||||
AC_MSG_RESULT(yes)
|
||||
|
|
|
@ -1,13 +0,0 @@
|
|||
--- a/include/asterisk/xml.h
|
||||
+++ b/include/asterisk/xml.h
|
||||
@@ -246,10 +246,5 @@ struct ast_xml_node *ast_xml_xpath_get_f
|
||||
*/
|
||||
struct ast_xml_xpath_results *ast_xml_query(struct ast_xml_doc *doc, const char *xpath_str);
|
||||
|
||||
-/* Features using ast_xml_ */
|
||||
-#ifdef HAVE_LIBXML2
|
||||
-#define AST_XML_DOCS
|
||||
-#endif
|
||||
-
|
||||
#endif /* _ASTERISK_XML_H */
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -181,6 +181,9 @@ case "${host_os}" in
|
||||
@@ -180,6 +180,9 @@ case "${host_os}" in
|
||||
linux-gnu*)
|
||||
OSARCH=linux-gnu
|
||||
;;
|
||||
|
@ -10,7 +10,7 @@
|
|||
kfreebsd*-gnu)
|
||||
OSARCH=kfreebsd-gnu
|
||||
;;
|
||||
@@ -1414,9 +1417,11 @@ if test "${PBX_BFD}" = "0"; then
|
||||
@@ -1423,9 +1426,11 @@ if test "${PBX_BFD}" = "0"; then
|
||||
AST_EXT_LIB_CHECK([BFD], [bfd], [bfd_check_format], [bfd.h], [-ldl -liberty -lz])
|
||||
fi
|
||||
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1,6 +1,6 @@
|
|||
--- a/build_tools/make_build_h
|
||||
+++ b/build_tools/make_build_h
|
||||
@@ -5,6 +5,14 @@
|
||||
@@ -5,6 +5,14 @@ MACHINE=`uname -m | sed 's/\\\\/\\\\\\\
|
||||
OS=`uname -s`
|
||||
USER=`id | awk -F")" '{print $1}'| awk -F"(" '{print $2}' | sed 's/\\\\/\\\\\\\\/g'`
|
||||
DATE=`date -u "+%Y-%m-%d %H:%M:%S"`
|
||||
|
@ -17,7 +17,7 @@
|
|||
* build.h
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -465,7 +465,7 @@
|
||||
@@ -477,7 +477,7 @@ doc/core-en_US.xml: makeopts .lastclean
|
||||
@echo "<docs xmlns:xi=\"http://www.w3.org/2001/XInclude\">" >> $@
|
||||
@for x in $(MOD_SUBDIRS); do \
|
||||
printf "$$x " ; \
|
||||
|
|
Loading…
Reference in New Issue