mirror of
https://github.com/openwrt/telephony.git
synced 2025-12-21 17:04:36 +04:00
f5120a4637
This is a manual cherry-pick ofa572285886and472f1ac7ac. 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>
25 lines
926 B
Diff
25 lines
926 B
Diff
--- a/libpjproject.pc.in
|
|
+++ b/libpjproject.pc.in
|
|
@@ -2,8 +2,8 @@
|
|
|
|
prefix=@PREFIX@
|
|
exec_prefix=${prefix}
|
|
-libdir=@LIBDIR@
|
|
-includedir=@INCLUDEDIR@
|
|
+libdir=${exec_prefix}/lib
|
|
+includedir=${prefix}/include
|
|
|
|
Name: libpjproject
|
|
Description: Multimedia communication library
|
|
--- a/build.mak.in
|
|
+++ b/build.mak.in
|
|
@@ -348,6 +348,6 @@ export PJ_LIBXX_FILES := $(APP_LIBXX_FIL
|
|
export PJ_INSTALL_DIR := @prefix@
|
|
export PJ_INSTALL_INC_DIR := @includedir@
|
|
export PJ_INSTALL_LIB_DIR := @libdir@
|
|
-export PJ_INSTALL_CFLAGS := -I$(PJ_INSTALL_INC_DIR) -DPJ_AUTOCONF=1 @ac_cflags@
|
|
+export PJ_INSTALL_CFLAGS := -DPJ_AUTOCONF=1 @ac_cflags@
|
|
export PJ_INSTALL_LDFLAGS_PRIVATE := $(APP_THIRD_PARTY_LIBS) $(APP_THIRD_PARTY_EXT) @LIBS@
|
|
-export PJ_INSTALL_LDFLAGS := -L$(PJ_INSTALL_LIB_DIR) $(filter-out $(PJ_INSTALL_LDFLAGS_PRIVATE),$(APP_LDXXLIBS))
|
|
+export PJ_INSTALL_LDFLAGS := $(filter-out $(PJ_INSTALL_LDFLAGS_PRIVATE),$(APP_LDXXLIBS))
|