From 9218873acd76f0c4baa33ea30aff9b775169d65f Mon Sep 17 00:00:00 2001 From: Mazilo Date: Sat, 14 Sep 2013 09:01:37 -0400 Subject: [PATCH] FreeSWITCH: Sync to FS latest git HEAD with some updates on patched files. 1. Synched to FS git HEAD fb238ed99779b28eeb1cc839b033ea2cf9d03212. 2. Update some patched files. 3. Bumped to FS v1.5.6b. Signed-off-by: Mazilo --- libs/opal/Makefile | 69 ----------- .../patches/010-fix-gcc_4_3-compile.patch | 25 ---- libs/ptlib/Makefile | 107 ------------------ .../patches/010-fix-gcc_4_3-compile.patch | 12 -- .../patches/020-uclibc-res_nsearch.patch | 14 --- net/freeswitch/Makefile | 4 +- net/freeswitch/patches/002-configure_in.patch | 2 +- .../patches/100-libs-esl-Makefile.patch | 8 +- 8 files changed, 7 insertions(+), 234 deletions(-) delete mode 100644 libs/opal/Makefile delete mode 100644 libs/opal/patches/010-fix-gcc_4_3-compile.patch delete mode 100644 libs/ptlib/Makefile delete mode 100644 libs/ptlib/patches/010-fix-gcc_4_3-compile.patch delete mode 100644 libs/ptlib/patches/020-uclibc-res_nsearch.patch diff --git a/libs/opal/Makefile b/libs/opal/Makefile deleted file mode 100644 index 80e6e0f..0000000 --- a/libs/opal/Makefile +++ /dev/null @@ -1,69 +0,0 @@ -# -# Copyright (C) 2006-2012 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=opal -PKG_VERSION:=3.2.1 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-src.tar.bz2 -PKG_SOURCE_URL:=@SF/opalvoip -PKG_MD5SUM:=405ba3b03ec706b6e6f873de340937e2 - -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)_$(PKG_VERSION) - -include $(INCLUDE_DIR)/package.mk - -define Package/libopal - SECTION:=libs - CATEGORY:=Libraries - DEPENDS:=+ptlib +libstdcpp - TITLE:=Open Phone Abstraction Library - URL:=http://www.opalvoip.org/ -endef - -define Package/libopal/description - Open Phone Abstraction Library, implementation of the ITU H.323 - teleconferencing protocol, and successor of the openh323 library. It - supports not only the H.323 protocol but also SIP and IAX2. -endef - -TARGET_CFLAGS += $(FPIC) - -CONFIGURE_ARGS += \ - --enable-audio \ - --disable-video \ - --enable-sip \ - --enable-h323 \ - --disable-iax \ - --disable-h224 \ - --disable-h450 \ - --disable-h460 \ - --disable-ivr \ - --disable-rfc4175 \ - --disable-versioncheck \ - --disable-theora \ - --enable-localgsm - -CONFIGURE_VARS += \ - PTLIBDIR="$(BUILD_DIR)/ptlib" \ - PTLIBPLUGINDIR="$(BUILD_DIR)/ptlib/plugins/ptlib/" - CXXFLAGS="$(TARGET_CFLAGS)" \ - -MAKE_FLAGS += \ - CFLAGS="$(TARGET_CFLAGS)" \ - CCFLAGS="$(TARGET_CFLAGS)" \ - PTLIBDIR="$(BUILD_DIR)/ptlib" \ - PTLIBPLUGINDIR="$(BUILD_DIR)/ptlib/plugins/ptlib/" \ - optnoshared - -define Build/InstallDev - ln -sf $(PKG_NAME)_$(PKG_VERSION) $(BUILD_DIR)/$(PKG_NAME) -endef - -$(eval $(call BuildPackage,libopal)) diff --git a/libs/opal/patches/010-fix-gcc_4_3-compile.patch b/libs/opal/patches/010-fix-gcc_4_3-compile.patch deleted file mode 100644 index 15d80b4..0000000 --- a/libs/opal/patches/010-fix-gcc_4_3-compile.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/plugins/video/common/trace.cxx b/plugins/video/common/trace.cxx -index 7262478..de641af 100644 ---- a/plugins/video/common/trace.cxx -+++ b/plugins/video/common/trace.cxx -@@ -30,6 +30,7 @@ - /*****************************************************************************/ - - #include "trace.h" -+#include - - #ifdef __MACOSX__ - #include -diff --git a/plugins/video/H.263-ffmpeg/h263ffmpeg.cxx b/plugins/video/H.263-ffmpeg/h263ffmpeg.cxx -index 4a17b2c..a2f051c 100644 ---- a/plugins/video/H.263-ffmpeg/h263ffmpeg.cxx -+++ b/plugins/video/H.263-ffmpeg/h263ffmpeg.cxx -@@ -54,6 +54,8 @@ - #define _CRT_NONSTDC_NO_WARNINGS - #define _CRT_SECURE_NO_DEPRECATE - #include -+#include -+#include - - #include - #ifdef _WIN32 diff --git a/libs/ptlib/Makefile b/libs/ptlib/Makefile deleted file mode 100644 index f8b8380..0000000 --- a/libs/ptlib/Makefile +++ /dev/null @@ -1,107 +0,0 @@ -# -# Copyright (C) 2006-2009 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. - -include $(TOPDIR)/rules.mk - -PKG_NAME:=ptlib -PKG_VERSION:=2.10.9 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=@SF/opalvoip -PKG_MD5SUM:= - -include $(INCLUDE_DIR)/package.mk - -define Package/ptlib - SECTION:=libs - CATEGORY:=Libraries - DEPENDS:=+libexpat - TITLE:=Portable Tools library - URL:=http://www.opalvoip.org/ -endef - -define Package/ptlib/description - PTLib is a moderately large class library that has its genesis many years ago as - PWLib (portable Windows Library), a method to product applications to run on both - Microsoft Windows and Unix X-Windows systems. It also was to have a Macintosh port - as well but that never eventuated. The parts of the library relating to GUI - functions have long been removed as other class libraries such as wxWidgets were - much more advanced. -endef - -TARGET_CFLAGS += $(FPIC) - -CONFIGURE_ARGS += \ - --enable-minsize \ - --enable-opal \ - --enable-internalregex \ - --enable-audio \ - --disable-alsa \ - --disable-asn \ - --disable-avc \ - --enable-configfile \ - --disable-dc \ - --disable-dtmf \ - --enable-expat \ - --disable-ftp \ - --disable-http \ - --disable-httpsvc \ - --disable-jabber \ - --disable-odbc \ - --disable-openldap \ - --disable-openssl \ - --disable-oss \ - --disable-pipechan \ - --disable-plugins \ - --disable-pop3smtp \ - --disable-remconn \ - --enable-resolver \ - --enable-qos \ - --disable-sasl \ - --disable-sdl \ - --disable-serial \ - --disable-shm-video \ - --disable-snmp \ - --disable-soap \ - --disable-socks \ - --enable-stun \ - --disable-telnet \ - --disable-tts \ - --disable-v4l \ - --disable-v4l2 \ - --disable-bsdvideo \ - --disable-video \ - --disable-vxml \ - --enable-wavfile \ - --disable-xmlrpc \ - -CONFIGURE_VARS += \ - CXXFLAGS="$(TARGET_CFLAGS) -fno-builtin -fno-rtti" \ - -CONFIGURE_CMD = ./configure - -define Build/Configure/Default - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH)/$(strip $(3)); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/$(3)/ && \ - $(CONFIGURE_VARS) \ - $(2) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS) \ - $(1); \ - fi; \ - ) -endef - -MAKE_FLAGS += optnoshared - -define Build/InstallDev - ln -sf $(PKG_NAME)_$(PKG_VERSION) $(BUILD_DIR)/$(PKG_NAME) - $(SED) 's|//\(#include \)|\1|' $(PKG_BUILD_DIR)/include/ptlib.h -endef - -$(eval $(call BuildPackage,ptlib)) diff --git a/libs/ptlib/patches/010-fix-gcc_4_3-compile.patch b/libs/ptlib/patches/010-fix-gcc_4_3-compile.patch deleted file mode 100644 index c764ca1..0000000 --- a/libs/ptlib/patches/010-fix-gcc_4_3-compile.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN ptlib-2.10.9/src/ptclib/socks.cxx ptlib-2.10.9.new/src/ptclib/socks.cxx ---- ptlib-2.10.9/src/ptclib/socks.cxx 2012-11-26 11:44:52.000000000 +0100 -+++ ptlib-2.10.9.new/src/ptclib/socks.cxx 2012-12-11 15:55:41.320940496 +0100 -@@ -34,6 +34,8 @@ - - #include - -+#include -+ - #define new PNEW - - #define SOCKS_VERSION_4 ((BYTE)4) diff --git a/libs/ptlib/patches/020-uclibc-res_nsearch.patch b/libs/ptlib/patches/020-uclibc-res_nsearch.patch deleted file mode 100644 index f644350..0000000 --- a/libs/ptlib/patches/020-uclibc-res_nsearch.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur ptlib-2.10.4.orig/src/ptclib/pdns.cxx ptlib-2.10.4/src/ptclib/pdns.cxx ---- ptlib-2.10.4.orig/src/ptclib/pdns.cxx 2012-03-12 13:34:10.000000000 -0400 -+++ ptlib-2.10.4/src/ptclib/pdns.cxx 2012-03-12 13:35:05.000000000 -0400 -@@ -37,6 +37,10 @@ - #include - #include - -+#if defined(__UCLIBC__) -+ #undef P_HAS_RES_NINIT -+#endif -+ - #define new PNEW - - #define USE_RESOLVER_CACHING 1 diff --git a/net/freeswitch/Makefile b/net/freeswitch/Makefile index db5e232..e475a96 100644 --- a/net/freeswitch/Makefile +++ b/net/freeswitch/Makefile @@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=freeswitch PKG_SOURCE_PROTO:=git PKG_DISTNAME:=$(PKG_NAME)_$(PKG_SOURCE_PROTO) -PKG_VERSION:=1.5.5b +PKG_VERSION:=1.5.6b # @@ -19,7 +19,7 @@ PKG_VERSION:=1.5.5b # http://fisheye.freeswitch.org # PKG_SOURCE_URL:=git://git.$(PKG_NAME).org/$(PKG_NAME).git -FS_DEFAULT_HEAD:=dbfde499a42b4f72eaf5578da2ebc741b85dedb3 +FS_DEFAULT_HEAD:=fb238ed99779b28eeb1cc839b033ea2cf9d03212 FS_LATEST_HEAD:=$(if $(DUMP),$(FS_DEFAULT_HEAD),$(shell git ls-remote $(PKG_SOURCE_URL) HEAD | cut -f1)) PKG_SOURCE_VERSION:=$(if $(CONFIG_FS_WITH_PULL_CURRENT),$(FS_LATEST_HEAD),$(FS_DEFAULT_HEAD)) PKG_SOURCE_VERSION_SHORT:=$(shell echo $(PKG_SOURCE_VERSION)|cut -b -7) diff --git a/net/freeswitch/patches/002-configure_in.patch b/net/freeswitch/patches/002-configure_in.patch index 7a5ebff..a5c8769 100644 --- a/net/freeswitch/patches/002-configure_in.patch +++ b/net/freeswitch/patches/002-configure_in.patch @@ -9,7 +9,7 @@ # set defaults for use on all platforms SWITCH_AM_CFLAGS="-I${switch_srcdir}/src/include -I${switch_builddir}/src/include -I${switch_srcdir}/libs/libteletone/src -I${switch_srcdir}/libs/stfu" -@@ -601,7 +601,7 @@ AC_CHECK_LIB(pthread, pthread_setschedpa +@@ -607,7 +607,7 @@ AC_CHECK_LIB(pthread, pthread_setschedpa AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket)) diff --git a/net/freeswitch/patches/100-libs-esl-Makefile.patch b/net/freeswitch/patches/100-libs-esl-Makefile.patch index c0034ec..6806db8 100644 --- a/net/freeswitch/patches/100-libs-esl-Makefile.patch +++ b/net/freeswitch/patches/100-libs-esl-Makefile.patch @@ -1,15 +1,15 @@ --- a/libs/esl/Makefile +++ b/libs/esl/Makefile -@@ -7,7 +7,7 @@ PICKY=-O2 +@@ -8,7 +8,7 @@ PICKY=-O2 CFLAGS=$(BASE_FLAGS) $(PICKY) CXXFLAGS=$(BASE_FLAGS) MYLIB=libesl.a --LIBS=-lncurses -lesl -lpthread -lm -+LIBS=-L$(STAGING_DIR)/usr/lib -lncurses -lesl -lpthread -lm +-LIBS=-lncurses -lesl -lpthread -lm $(TINFO_LIBS) ++LIBS=-L$(STAGING_DIR)/usr/lib -lncurses -lesl -lpthread -lm $(TINFO_LIBS) LDFLAGS=-L. OBJS=src/esl.o src/esl_event.o src/esl_threadmutex.o src/esl_config.o src/esl_json.o src/esl_buffer.o SRC=src/esl.c src/esl_json.c src/esl_event.c src/esl_threadmutex.c src/esl_config.c src/esl_oop.cpp src/esl_json.c src/esl_buffer.c -@@ -19,8 +19,8 @@ OBJS += src/esl_oop.o +@@ -20,8 +20,8 @@ OBJS += src/esl_oop.o all: $(MYLIB) fs_cli testclient testserver ivrd $(MYLIB): $(OBJS) $(HEADERS) $(SRC) -- 2.30.2