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

Merge pull request #706 from micmac1/fs-small-fixes

Browse source 
freeswitch + freetdm: small fixes
This commit is contained in:
micmac1 2021-11-07 22:46:08 +01:00 committed by GitHub
commit 0363331c8e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
libs/freetdm/Makefile
View file

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=freetdm PKG_NAME:=freetdm
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_MAINTAINER:=Sebastian Kemper <sebastian_ml@gmx.net> PKG_MAINTAINER:=Sebastian Kemper <sebastian_ml@gmx.net>
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
@ -40,7 +40,8 @@ FS_MOD_DIR:=$(FS_LIB_DIR)/freeswitch/mod
FS_PKGCONFIG_DIR:=$(FS_LIB_DIR)/pkgconfig FS_PKGCONFIG_DIR:=$(FS_LIB_DIR)/pkgconfig
PKG_CONFIG_DEPENDS:= \ PKG_CONFIG_DEPENDS:= \
CONFIG_FT_WITH_DEBUG \ CONFIG_FREETDM_WITH_DEBUG \
CONFIG_FS_WITH_MODCONF \
CONFIG_LIBC \ CONFIG_LIBC \
CONFIG_PACKAGE_libfreetdm-ftmod-libpri \ CONFIG_PACKAGE_libfreetdm-ftmod-libpri \
CONFIG_PACKAGE_libfreetdm-ftmod-pritap \ CONFIG_PACKAGE_libfreetdm-ftmod-pritap \
@ -134,19 +135,6 @@ CONFIGURE_ARGS+= \
$(if $(CONFIG_PACKAGE_libfreetdm-ftmod-libpri),--with-libpri="$(STAGING_DIR)/usr",--without-libpri) \ $(if $(CONFIG_PACKAGE_libfreetdm-ftmod-libpri),--with-libpri="$(STAGING_DIR)/usr",--without-libpri) \
$(if $(CONFIG_PACKAGE_libfreetdm-ftmod-pritap),--with-pritap,--without-pritap) $(if $(CONFIG_PACKAGE_libfreetdm-ftmod-pritap),--with-pritap,--without-pritap)
define Build/InstallDev/libfreetdm
$(INSTALL_DIR) $(1)/usr/include
$(INSTALL_DATA) \
$(PKG_INSTALL_DIR)$(FS_PKGCONFIG_DIR)/freetdm.pc \
$(1)$(FS_PKGCONFIG_DIR)
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include
endef
define Build/InstallDev
$(INSTALL_DIR) $(1)$(FS_PKGCONFIG_DIR)
$(call Build/InstallDev/libfreetdm,$(1))
endef
$(eval $(call BuildPackage,libfreetdm)) $(eval $(call BuildPackage,libfreetdm))
$(eval $(call BuildPackage,freeswitch-mod-freetdm)) $(eval $(call BuildPackage,freeswitch-mod-freetdm))

3
net/freeswitch/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=freeswitch PKG_NAME:=freeswitch
PKG_VERSION:=1.10.7 PKG_VERSION:=1.10.7
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_MAINTAINER:=Sebastian Kemper <sebastian_ml@gmx.net> PKG_MAINTAINER:=Sebastian Kemper <sebastian_ml@gmx.net>
PKG_SOURCE:=freeswitch-$(PKG_VERSION).-release.tar.xz PKG_SOURCE:=freeswitch-$(PKG_VERSION).-release.tar.xz
@ -218,6 +218,7 @@ PKG_CONFIG_DEPENDS:= \
CONFIG_FS_WITH_DEBUG \ CONFIG_FS_WITH_DEBUG \
CONFIG_FS_WITH_FREETYPE \ CONFIG_FS_WITH_FREETYPE \
CONFIG_FS_WITH_LIBYUV \ CONFIG_FS_WITH_LIBYUV \
CONFIG_FS_WITH_MODCONF \
CONFIG_FS_WITH_ODBC \ CONFIG_FS_WITH_ODBC \
CONFIG_FS_WITH_PNG \ CONFIG_FS_WITH_PNG \
CONFIG_FS_WITH_SRTP \ CONFIG_FS_WITH_SRTP \