diff options
| author | Sebastian Kemper <sebastian_ml@gmx.net> | 2022-12-03 15:41:32 +0100 |
|---|---|---|
| committer | Sebastian Kemper <sebastian_ml@gmx.net> | 2022-12-03 15:44:30 +0100 |
| commit | f5120a46371ff75f401c1cb724c3880811bfbae0 (patch) | |
| tree | faa71092185bf5f89dd6a31e4544e552e70ee993 /libs/pjproject/Makefile | |
| parent | e2f370462421e20cccf09aa155cb78e6ff60d0c0 (diff) | |
pjproject: bump to 2.12.1
This is a manual cherry-pick of a57228588602e5217b95f1e9ded0b76402cb6c72
and 472f1ac7ac867b8fbc2841c56e7d61935dba9d52. The only difference is
that the uclibc-related patches were not dropped, because uclibc is used
in OpenWrt 21.02.
- add "--disable-android-mediacodec" to configure
- add EXCLUDE_APP=1 to "make" calls so some apps aren't built (speeds up
the build a bit)
- drop "sed" call as no longer needed
- update 0004-config_site.patch to sync up with Asterisk 18.14.0
- update 0006-fix-pkg_config-file.patch as there were some changes in
this area upstream
- add 0007-execinfo.patch to prevent errors due to missing <execinfo.h>
- sync patches with Asterisk 18.14.0
- backports two security fixes (c4d3498 and 450baca) from pjproject
2.13, source: asterisk 20.0.1
Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
Diffstat (limited to 'libs/pjproject/Makefile')
| -rw-r--r-- | libs/pjproject/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libs/pjproject/Makefile b/libs/pjproject/Makefile index 5e7b645..f1fe59b 100644 --- a/libs/pjproject/Makefile +++ b/libs/pjproject/Makefile @@ -10,14 +10,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pjproject -PKG_VERSION:=2.10 -PKG_RELEASE:=7 +PKG_VERSION:=2.12.1 +PKG_RELEASE:=1 # download "vX.Y.tar.gz" as "pjproject-vX.Y.tar.gz" PKG_SOURCE_URL_FILE:=$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_URL_FILE) PKG_SOURCE_URL:=https://github.com/pjsip/$(PKG_NAME)/archive -PKG_HASH:=936a4c5b98601b52325463a397ddf11ab4106c6a7b04f8dc7cdd377efbb597de +PKG_HASH:=d0feef6963b07934e821ba4328aecb4c36358515c1b3e507da5874555d713533 PKG_INSTALL:=1 PKG_LICENSE:=GPL-2.0 @@ -60,6 +60,7 @@ endef CONFIGURE_ARGS+= \ $(if $(CONFIG_SOFT_FLOAT),--disable-floating-point) \ + --disable-android-mediacodec \ --disable-bcg729 \ --disable-darwin-ssl \ --disable-ext-sound \ @@ -94,8 +95,8 @@ CONFIGURE_ARGS+= \ TARGET_CFLAGS+=$(TARGET_CPPFLAGS) define Build/Compile - $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) dep - $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) + $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) EXCLUDE_APP=1 dep + $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) EXCLUDE_APP=1 endef PJPROJECT_LIBS:= \ @@ -110,7 +111,6 @@ define Build/InstallDev $(foreach m,$(PJPROJECT_LIBS),$(CP) $(PKG_INSTALL_DIR)/usr/lib/$(m)* $(1)/usr/lib;) $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(SED) 's|$(TARGET_CFLAGS)||g' $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libpjproject.pc $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libpjproject.pc \ $(1)/usr/lib/pkgconfig endef |