diff options
| author | Sebastian Kemper <sebastian_ml@gmx.net> | 2017-08-09 22:45:32 +0200 |
|---|---|---|
| committer | Sebastian Kemper <sebastian_ml@gmx.net> | 2017-08-09 22:45:34 +0200 |
| commit | ae177a2f5f7799bfe47d2a40fafc279884d3aeef (patch) | |
| tree | 3e1afaa62e4472e058b3832246cb948ba1e05567 /libs/pjproject/Makefile | |
| parent | d8469c8750ec9a2b48da1219b52b975c86f8df67 (diff) | |
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 <sebastian_ml@gmx.net>
Diffstat (limited to 'libs/pjproject/Makefile')
| -rw-r--r-- | libs/pjproject/Makefile | 32 |
1 files changed, 17 insertions, 15 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)) |