Difuse/telephony
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

FreeSWITCH: Fix dependency issue with LZMA and sync to FS latest git HEAD

Browse source 
1. Added CONFIG_FS_WITH_LZMA var to pass --enable-lzma or
		--disable-lzma switch to configure for libs/tiff package.
		The switch is determined by the selection of liblzma
		package.
	2. Synch to FS git HEAD 4eee5aee8c94910f65f47ade4e873aa62e7117eb.
	3. Patches refreshed.

Signed-off-by: Mazilo <openwrt.mazilo@recursor.net>
This commit is contained in:
Mazilo 2013-08-09 07:44:02 -04:00
parent 2ad3d01180
commit bff1f87ad7
5 changed files with 38 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
net/freeswitch/Makefile
View file

@ -15,10 +15,11 @@ PKG_VERSION:=1.5.5b
#
# The latest FS git hash in PKG_SOURCE_VERSION can be obtained from http://fisheye.freeswitch.org
# The latest FS git hash in PKG_SOURCE_VERSION can be obtained from
# http://fisheye.freeswitch.org
#
PKG_SOURCE_URL:=git://git.$(PKG_NAME).org/$(PKG_NAME).git
FS_DEFAULT_HEAD:=6a5595b049075a58240c327718129cf3870c285c
FS_DEFAULT_HEAD:=4eee5aee8c94910f65f47ade4e873aa62e7117eb
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)
@ -168,6 +169,7 @@ PKG_CONFIG_DEPENDS:= \
CONFIG_FS_WITH_BUILTIN_ZRTP \
CONFIG_FS_WITH_FIXED_POINT \
CONFIG_FS_WITH_IPV6 \
CONFIG_FS_WITH_LZMA \
CONFIG_FS_WITH_MYSQL \
CONFIG_FS_WITH_ODBC \
CONFIG_FS_WITH_OPT \
@ -190,7 +192,7 @@ define Package/$(PKG_NAME)/Default
CATEGORY:=Network
SUBMENU:=Telephony
URL:=http://www.$(PKG_NAME).org/
MAINTAINER:=Mazilo <openwrt.forum.mazilo@recursor.net>
MAINTAINER:=Mazilo <openwrt.mazilo@recursor.net>
endef
@ -216,11 +218,13 @@ define Package/$(PKG_NAME)/config
bool "Pull the latest git HEAD - $(PKG_SOURCE_VERSION_SHORT) (Press < Help > for more information)"
default n
help
This existing git HEAD ($(FS_DEFAULT_HEAD)) is probably outdated.
Enable this option for the latest git HEAD ($(FS_LATEST_HEAD)).
Enable this option ONLY if you know what you are doing. It may and/or may not be cleanly
compiled and may require some intervension to create new patches. If you take this route
and come up with some patches, please contemplate to contribute or send in your patches.
This existing git HEAD ($(FS_DEFAULT_HEAD))
is probably outdated. Enable this option for the latest git HEAD
($(FS_LATEST_HEAD)) ONLY if you know what
you are doing. It may and/or may not be cleanly compiled and may
require some intervension to create new patches. If you take this
route and come up with some patches, please contemplate to contribute
or send in your patches.
config FS_WITH_ALSA
depends on PACKAGE_$(PKG_NAME)
@ -243,13 +247,22 @@ define Package/$(PKG_NAME)/config
help
Compile libs/apr package with IPV6 support.
config FS_WITH_LZMA
depends on PACKAGE_$(PKG_NAME) && PACKAGE_liblzma
bool "Enable liblzma usage in libtiff"
default y
#select PACKAGE_liblzma
help
Compile libs/tiff package with liblzma support. This option requires
LZMA2 compression package called liblzma.
config FS_WITH_OPT
depends on PACKAGE_$(PKG_NAME)
bool "Enable optimization"
default y
help
Compile $(PKG_NAME) with optimization flag enabled. This will add max optimising
compiler flags
Compile $(PKG_NAME) with optimization flag enabled. This will add
max optimising compiler flags
config FS_WITH_SCTP
depends on PACKAGE_$(PKG_NAME)
@ -593,7 +606,7 @@ CONFIGURE_ARGS+= \
$(if ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-curl)|$(CONFIG_PACKAGE_$(PKG_NAME)-mod-xml-cdr)|$(CONFIG_PACKAGE_$(PKG_NAME)-mod-xml-curl)),--with-libcurl="$(STAGING_DIR)/usr",--without-libcurl) \
$(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-erlang-event),--with,--without)-erlang \
$(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-java),--with-java="$(STAGING_DIR)/usr",--without-java) \
$(call autoconf_bool,CONFIG_PACKAGE_liblzma,lzma) \
$(call autoconf_bool,CONFIG_FS_WITH_LZMA,lzma) \
$(call autoconf_bool,CONFIG_FS_WITH_POSTGRESQL,core-pgsql-support) \
$(call autoconf_bool,CONFIG_PACKAGE_$(PKG_NAME)-mod-spandsp && CONFIG_FS_WITH_FIXED_POINT,fixed-point) \
$(call autoconf_bool,CONFIG_PACKAGE_$(PKG_NAME)-mod-spandsp,builtin-tiff) \
@ -1067,7 +1080,7 @@ $(eval $(call BuildPlugin,snmp,SNMP AgentX Subagent,vanilla,,,,+libnetsnmp))
$(eval $(call BuildPlugin,snom,SNOM specific features,vanilla,,,,))
$(eval $(call BuildPlugin,sofia,SOFIA SIP,mod,,,,)) # ~/conf
$(eval $(call BuildPlugin,sonar,Sonar Ping Timer,vanilla,,,,))
$(eval $(call BuildPlugin,spandsp,Span DSP,mod,,,,+libjpeg +@PACKAGE_xz:PACKAGE_liblzma)) # ~/conf
$(eval $(call BuildPlugin,spandsp,Span DSP,mod,,,,+libjpeg +FS_WITH_LZMA:liblzma)) # ~/conf
$(eval $(call BuildPlugin,speex,Speex codec,mod,,,,))
$(eval $(call BuildPlugin,spidermonkey,JavaScript,vanilla,,,,@BROKEN)) # fails in js
$(eval $(call BuildPlugin,spidermonkey-core_db,JavaScript DB,vanilla,,,,@BROKEN))

8
net/freeswitch/patches/000-build-openwrt_rules.mk.patch
View file

@ -2,9 +2,9 @@
+++ b/build/openwrt_rules.mk
@@ -0,0 +1,7 @@
+OPENWRT_DIR=$(shell (cd $(BASE)/../../..;pwd))
+STAGING_PREFIX=$(OPENWRT_DIR)/staging_dir/host
+STAGING_DIR=$(OPENWRT_DIR)/staging_dir/$(shell (cd $(BASE)/..;basename `pwd`))
+ARCH="$(shell grep CONFIG_ARCH $(OPENWRT_DIR)/.config|cut -d= -d'"' -f2)"
+GNU_TARGET_NAME=$(ARCH)-openwrt-linux
+#STAGING_PREFIX=$(OPENWRT_DIR)/staging_dir/host
+#STAGING_DIR=$(OPENWRT_DIR)/staging_dir/$(shell (cd $(BASE)/..;basename `pwd`))
+#ARCH="$(shell grep CONFIG_ARCH $(OPENWRT_DIR)/.config|cut -d= -d'"' -f2)"
+#GNU_TARGET_NAME=$(ARCH)-openwrt-linux
+
+include $(OPENWRT_DIR)/rules.mk

6
net/freeswitch/patches/003-Makefile.am.patch
View file

@ -16,7 +16,7 @@
endif
library_includedir = $(includedir)
@@ -426,7 +429,7 @@ $(switch_builddir)/quiet_libtool: $(swit
@@ -427,7 +430,7 @@ $(switch_builddir)/quiet_libtool: $(swit
@cat libtool | sed -e 's|$$show "$$command"|if test -z "$$suppress_output" ; then $$show "Compiling $$srcfile ..." ; fi|' > $(switch_builddir)/quiet_libtool
build/print_git_revision: build/print_git_revision.c
@ -25,7 +25,7 @@
src/include/switch_version.h: src/include/switch_version.h.in Makefile build/print_git_revision $(libfreeswitch_la_SOURCES) $(library_include_HEADERS)
@cat $< > $@; \
@@ -664,7 +667,9 @@ sndfile-reconf:
@@ -665,7 +668,9 @@ sndfile-reconf:
tiff-reconf:
cd libs/tiff-4.0.2 && autoreconf -fi
@ -36,7 +36,7 @@
cd libs/tiff-4.0.2 && make
python-reconf:
@@ -689,9 +694,6 @@ iks-reconf:
@@ -690,9 +695,6 @@ iks-reconf:
$(MAKE) mod_dingaling-clean
spandsp-reconf: tiff-reconf

6
net/freeswitch/patches/103-libs-spandsp-src-t4_rx_c.patch
View file

@ -1,11 +1,11 @@
--- a/libs/spandsp/src/t4_rx.c
+++ b/libs/spandsp/src/t4_rx.c
@@ -45,7 +45,7 @@
#include <math.h>
@@ -50,7 +50,7 @@
#include "spandsp/stdbool.h"
#endif
#include "floating_fudge.h"
-#include <tiffio.h>
+#include <tiffiop.h>
#include "spandsp/telephony.h"
#include "spandsp/logging.h"
#include "spandsp/alloc.h"

6
net/freeswitch/patches/104-libs-spandsp-src-t4_tx_c.patch
View file

@ -1,11 +1,11 @@
--- a/libs/spandsp/src/t4_tx.c
+++ b/libs/spandsp/src/t4_tx.c
@@ -45,7 +45,7 @@
#include <math.h>
@@ -50,7 +50,7 @@
#include "spandsp/stdbool.h"
#endif
#include "floating_fudge.h"
-#include <tiffio.h>
+#include <tiffiop.h>
#include "spandsp/telephony.h"
#include "spandsp/logging.h"
#include "spandsp/alloc.h"