From ae177a2f5f7799bfe47d2a40fafc279884d3aeef Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Wed, 9 Aug 2017 22:45:32 +0200 Subject: [PATCH] pjproject: align with Asterisk requirements, misc improvements - Make "--disable-floating-point" depend on SOFT_FLOAT - Remove "--disable-ilbc-coder" as configure no longer recognizes it. - Align args with the ones used by Asterisk (for their bundled pjproject); this includes adding "--disable-resample". - With libresample removed remove the dep from asterisk13 accordingly. - Note: the disabled items are _not_ used by Asterisk anyway. - Drop speex dep as pjproject does not link against it the way it is configured. Signed-off-by: Sebastian Kemper --- libs/pjproject/Makefile | 32 +++++++++++++++++--------------- net/asterisk-13.x/Makefile | 2 +- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/libs/pjproject/Makefile b/libs/pjproject/Makefile index 64682fa..bafb468 100644 --- a/libs/pjproject/Makefile +++ b/libs/pjproject/Makefile @@ -55,33 +55,36 @@ $(call Package/pjproject/install/lib,$$(1),$2) endef CONFIGURE_ARGS += \ + $(if $(CONFIG_SOFT_FLOAT),--disable-floating-point) \ + --disable-ext-sound \ --disable-ffmpeg \ - --disable-floating-point \ --disable-g711-codec \ --disable-g722-codec \ --disable-g7221-codec \ --disable-gsm-codec \ --disable-ilbc-codec \ - --disable-ilbc-coder \ --disable-ipp \ --disable-l16-codec \ - --disable-large-filter \ --disable-libwebrtc \ --disable-libyuv \ + --disable-opencore-amr \ + --disable-openh264 \ --disable-opus \ --disable-oss \ - --disable-resample-dll \ + --disable-resample \ --disable-sdl \ - --disable-small-filter \ + --disable-silk \ --disable-sound \ --disable-speex-aec \ --disable-speex-codec \ --disable-ssl \ --disable-v4l2 \ - --enable-g711-codec \ + --disable-video \ --enable-shared \ --with-external-srtp="$(STAGING_DIR)/usr" \ - --without-external-gsm + --without-external-gsm \ + --without-external-pa \ + --without-external-webrtc TARGET_LDFLAGS+=-lc $(LIBGCC) -lm TARGET_CFLAGS+=$(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS) @@ -92,7 +95,7 @@ endef PJPROJECT_LIBS = \ libpj libpjlib-util libpjmedia libpjnath libpjsip-simple \ - libpjsip-ua libpjsip libpjsua libpjsua2 libresample + libpjsip-ua libpjsip libpjsua libpjsua2 define Build/InstallDev $(INSTALL_DIR) $(1)/usr/{include,lib} @@ -106,11 +109,10 @@ endef $(eval $(call PJSIPpackage,libpj,libpj,+librt)) $(eval $(call PJSIPpackage,libpjlib-util,libpjlib-util,+libpj +librt)) -$(eval $(call PJSIPpackage,libpjmedia,libpjmedia*,+libpj +libpjlib-util +libpjnath +libresample +librt +libspeex +libsrtp)) +$(eval $(call PJSIPpackage,libpjmedia,libpjmedia*,+libpj +libpjlib-util +libpjnath +librt +libsrtp)) $(eval $(call PJSIPpackage,libpjnath,libpjnath,+libpj +libpjlib-util +librt)) -$(eval $(call PJSIPpackage,libpjsip-simple,libpjsip-simple,+libpj +libpjlib-util +libpjsip +libresample +librt +libspeex +libsrtp)) -$(eval $(call PJSIPpackage,libpjsip-ua,libpjsip-ua,+libpj +libpjlib-util +libpjmedia +libpjsip-simple +libpjsip +libresample +librt +libspeex +libsrtp)) -$(eval $(call PJSIPpackage,libpjsip,libpjsip,+libpj +libpjlib-util +libresample +librt +libspeex +libsrtp)) -$(eval $(call PJSIPpackage,libpjsua,libpjsua,+libpj +libpjlib-util +libpjmedia +libpjnath +libpjsip-simple +libpjsip-ua +libpjsip +libresample +librt +libspeex +libsrtp)) -$(eval $(call PJSIPpackage,libpjsua2,libpjsua2,+libpj +libpjlib-util +libpjmedia +libpjnath +libpjsip-simple +libpjsip-ua +libpjsip +libresample +librt +libspeex +libsrtp +libpjsua)) -$(eval $(call PJSIPpackage,libresample,libresample,)) +$(eval $(call PJSIPpackage,libpjsip-simple,libpjsip-simple,+libpj +libpjlib-util +libpjsip +librt +libsrtp)) +$(eval $(call PJSIPpackage,libpjsip-ua,libpjsip-ua,+libpj +libpjlib-util +libpjmedia +libpjsip-simple +libpjsip +librt +libsrtp)) +$(eval $(call PJSIPpackage,libpjsip,libpjsip,+libpj +libpjlib-util +librt +libsrtp)) +$(eval $(call PJSIPpackage,libpjsua,libpjsua,+libpj +libpjlib-util +libpjmedia +libpjnath +libpjsip-simple +libpjsip-ua +libpjsip +librt +libsrtp)) +$(eval $(call PJSIPpackage,libpjsua2,libpjsua2,+libpj +libpjlib-util +libpjmedia +libpjnath +libpjsip-simple +libpjsip-ua +libpjsip +librt +libsrtp +libpjsua)) diff --git a/net/asterisk-13.x/Makefile b/net/asterisk-13.x/Makefile index 49e0718..dec833d 100644 --- a/net/asterisk-13.x/Makefile +++ b/net/asterisk-13.x/Makefile @@ -424,7 +424,7 @@ $(eval $(call BuildAsterisk13Module,res-monitor,Provide Monitor,Cryptographic Si $(eval $(call BuildAsterisk13Module,res-musiconhold,MOH,Music On Hold support,,musiconhold.conf,res_musiconhold,,)) $(eval $(call BuildAsterisk13Module,res-parking,Phone Parking,Phone Parking application,,res_parking.conf,res_parking,,)) $(eval $(call BuildAsterisk13Module,res-phoneprov,Phone Provisioning,Phone provisioning application for the asterisk internal http server,,phoneprov.conf,res_phoneprov,,)) -$(eval $(call BuildAsterisk13Module,res-pjproject,Bridge PJPROJECT to Asterisk logging,,+libpj +libpjlib-util +libpjmedia +libpjmedia +libpjnath +libpjsip-simple +libpjsip-ua +libpjsip +libpjsua +libpjsua2 +libresample +libsrtp,pjproject.conf,res_pjproject,,)) +$(eval $(call BuildAsterisk13Module,res-pjproject,Bridge PJPROJECT to Asterisk logging,,+libpj +libpjlib-util +libpjmedia +libpjmedia +libpjnath +libpjsip-simple +libpjsip-ua +libpjsip +libpjsua +libpjsua2 +libsrtp,pjproject.conf,res_pjproject,,)) $(eval $(call BuildAsterisk13Module,res-realtime,RealTime CLI,RealTime CLI,,,res_realtime,,)) $(eval $(call BuildAsterisk13Module,res-rtp-asterisk,RTP stack,Supports RTP and RTCP with Symmetric RTP support for NAT traversal,+libpjsip +libpjmedia +libpjnath +libpjsip-simple +libpjsip-ua +libpjsua +libpjsua2,rtp.conf,res_rtp_asterisk,,)) $(eval $(call BuildAsterisk13Module,res-rtp-multicast,RTP multicast engine,Multicast RTP Engine,,,res_rtp_multicast,,)) -- 2.30.2