From 986ee83a4e1d6cd4c941b9675ecb23bd34bf3b0e Mon Sep 17 00:00:00 2001 From: Mazilo Date: Sat, 6 Jul 2013 08:01:36 -0400 Subject: [PATCH] Updated to git HEAD 9ed53db590ae63ed941a9fe48e56435a903d07a0 --- net/freeswitch/Makefile | 4 +- .../patches/001-build-modules_conf_in.patch | 72 ++++--------------- net/freeswitch/patches/002-configure_in.patch | 2 +- 3 files changed, 15 insertions(+), 63 deletions(-) diff --git a/net/freeswitch/Makefile b/net/freeswitch/Makefile index b6ee738..883c6b4 100644 --- a/net/freeswitch/Makefile +++ b/net/freeswitch/Makefile @@ -18,7 +18,7 @@ PKG_VERSION:=1.5.3b # PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=git://git.$(PKG_NAME).org/$(PKG_NAME).git -FS_DEFAULT_HEAD:=a6f5efaedf201b29a653fe1390be8fde90c4bc4f +FS_DEFAULT_HEAD:=37a1f2c6334906119d8dbfec9c16f2ee45216f32 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) @@ -197,7 +197,7 @@ endef define Package/$(PKG_NAME) $(call Package/$(PKG_NAME)/Default) TITLE:=FreeSWITCH open source telephony platform ($(PKG_SOURCE_VERSION_SHORT)) - DEPENDS:=+libcurl +libiconv-full +libjpeg +libncurses +libpthread +librt +libstdcpp +FS_WITH_POSTGRESQL:libpq + DEPENDS:=+libcurl +libiconv-full +libjpeg +libncurses +libpthread +librt +libstdcpp +FS_WITH_POSTGRESQL:libpq +libuuid MENU:=1 endef diff --git a/net/freeswitch/patches/001-build-modules_conf_in.patch b/net/freeswitch/patches/001-build-modules_conf_in.patch index e34ea59..5d20600 100644 --- a/net/freeswitch/patches/001-build-modules_conf_in.patch +++ b/net/freeswitch/patches/001-build-modules_conf_in.patch @@ -1,65 +1,17 @@ --- a/build/modules.conf.in +++ b/build/modules.conf.in -@@ -3,6 +3,9 @@ - #applications/mod_blacklist - #applications/mod_callcenter - #applications/mod_cidlookup -+#applications/mod_skel -+#applications/mod_mp4 -+#applications/mod_protovm - applications/mod_cluechoo - applications/mod_commands - applications/mod_conference -@@ -27,6 +30,7 @@ applications/mod_httapi - #applications/mod_memcache - #applications/mod_mongo - #applications/mod_nibblebill -+#applications/mod_oreka - #applications/mod_osp +@@ -33,6 +33,7 @@ applications/mod_httapi + #applications/mod_rad_auth #applications/mod_redis #applications/mod_rss -@@ -34,6 +38,7 @@ applications/mod_sms ++#applications/mod_skel + #applications/mod_sonar + applications/mod_sms #applications/mod_snapshot - #applications/mod_snipe_hunt - #applications/mod_snom -+#applications/mod_sonar - #applications/mod_soundtouch - applications/mod_spandsp - #applications/mod_spy -@@ -63,17 +68,20 @@ codecs/mod_h26x - codecs/mod_vp8 - #codecs/mod_ilbc - #codecs/mod_isac -+#codecs/mod_mp4v - #codecs/mod_opus - #codecs/mod_sangoma_codec - #codecs/mod_silk - #codecs/mod_siren - codecs/mod_speex -+#codecs/mod_theora - dialplans/mod_dialplan_asterisk - #dialplans/mod_dialplan_directory - dialplans/mod_dialplan_xml - #directories/mod_ldap - #endpoints/mod_alsa - #endpoints/mod_dingaling -+#endpoints/mod_gsmopen - #endpoints/mod_h323 - #endpoints/mod_html5 - #endpoints/mod_khomp -@@ -90,6 +98,7 @@ event_handlers/mod_cdr_csv - event_handlers/mod_cdr_sqlite - #event_handlers/mod_erlang_event - #event_handlers/mod_event_multicast -+#event_handlers/mod_json_cdr - event_handlers/mod_event_socket - #event_handlers/mod_event_zmq - #event_handlers/mod_radius_cdr -@@ -117,6 +126,7 @@ loggers/mod_syslog - #say/mod_say_de - say/mod_say_en - #say/mod_say_es -+#say/mod_say_fa - #say/mod_say_fr - #say/mod_say_he - #say/mod_say_hu +@@ -152,4 +153,4 @@ xml_int/mod_xml_scgi + #../../libs/openzap/mod_openzap + + ## Experimental Modules (don't cry if they're broken) +-#../../contrib/mod/xml_int/mod_xml_odbc +\ No newline at end of file ++#../../contrib/mod/xml_int/mod_xml_odbc diff --git a/net/freeswitch/patches/002-configure_in.patch b/net/freeswitch/patches/002-configure_in.patch index 99375be..7a5ebff 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" -@@ -597,7 +597,7 @@ AC_CHECK_LIB(pthread, pthread_setschedpa +@@ -601,7 +601,7 @@ AC_CHECK_LIB(pthread, pthread_setschedpa AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket)) -- 2.30.2