Attachment 576867 Details for Bug 728302 – patch to use system libsrtp

[patch] patch to use system libsrtp

pjproject-1.12-use-system-srtp.patch (text/plain), 2.46 KB, created by Tom "spot" Callaway on 2012-04-11 19:59:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tom "spot" Callaway

Created: 2012-04-11 19:59:51 UTC

Size: 2.46 KB

patch

obsolete

>diff -up pjproject-1.12/build.mak.in.system pjproject-1.12/build.mak.in
>--- pjproject-1.12/build.mak.in.system	2012-04-11 15:23:17.995573089 -0400
>+++ pjproject-1.12/build.mak.in	2012-04-11 15:23:17.999573058 -0400
>@@ -13,9 +13,9 @@ export ac_libdir := @libdir@
> LIB_SUFFIX = $(TARGET_NAME).a
> 
> # Determine which party libraries to use
>-export APP_THIRD_PARTY_LIBS := -lresample-$(TARGET_NAME) -lmilenage-$(TARGET_NAME) -lsrtp-$(TARGET_NAME)
>-export APP_THIRD_PARTY_EXT :=
>-export APP_THIRD_PARTY_LIB_FILES = $(PJ_DIR)/third_party/lib/libresample-$(LIB_SUFFIX) $(PJ_DIR)/third_party/lib/libmilenage-$(LIB_SUFFIX) $(PJ_DIR)/third_party/lib/libsrtp-$(LIB_SUFFIX)
>+export APP_THIRD_PARTY_LIBS := -lresample-$(TARGET_NAME) -lmilenage-$(TARGET_NAME)
>+export APP_THIRD_PARTY_EXT := -lsrtp
>+export APP_THIRD_PARTY_LIB_FILES = $(PJ_DIR)/third_party/lib/libresample-$(LIB_SUFFIX) $(PJ_DIR)/third_party/lib/libmilenage-$(LIB_SUFFIX)
> 
> ifneq (@ac_no_gsm_codec@,1)
> ifeq (@ac_external_gsm@,1)
>diff -up pjproject-1.12/pjmedia/build/Makefile.system pjproject-1.12/pjmedia/build/Makefile
>--- pjproject-1.12/pjmedia/build/Makefile.system	2011-07-22 07:52:50.000000000 -0400
>+++ pjproject-1.12/pjmedia/build/Makefile	2012-04-11 15:23:18.000573050 -0400
>@@ -3,9 +3,7 @@ include ../../version.mak
> 
> THIRD_PARTY:=$(PJDIR)/third_party
> 
>-SRTP_INC=$(CC_INC)$(THIRD_PARTY)/build/srtp \
>-	 $(CC_INC)$(THIRD_PARTY)/srtp/crypto/include \
>-	 $(CC_INC)$(THIRD_PARTY)/srtp/include
>+SRTP_INC=$(CC_INC)/usr/include/srtp
> 
> include $(PJDIR)/build/common.mak
> 
>diff -up pjproject-1.12/pjmedia/src/pjmedia/transport_srtp.c.system pjproject-1.12/pjmedia/src/pjmedia/transport_srtp.c
>--- pjproject-1.12/pjmedia/src/pjmedia/transport_srtp.c.system	2012-04-11 15:27:00.408781019 -0400
>+++ pjproject-1.12/pjmedia/src/pjmedia/transport_srtp.c	2012-04-11 15:27:14.793665075 -0400
>@@ -303,7 +303,7 @@ static void pjmedia_srtp_deinit_lib(void
> {
>     err_status_t err;
> 
>-    err = srtp_deinit();
>+    err = srtp_shutdown();
>     if (err != err_status_ok) {
> 	PJ_LOG(4, (THIS_FILE, "Failed to deinitialize libsrtp: %s", 
> 		   get_libsrtp_errstr(err)));
>diff -up pjproject-1.12/third_party/build/Makefile.system pjproject-1.12/third_party/build/Makefile
>--- pjproject-1.12/third_party/build/Makefile.system	2008-06-20 17:39:02.000000000 -0400
>+++ pjproject-1.12/third_party/build/Makefile	2012-04-11 15:23:18.000573050 -0400
>@@ -1,4 +1,4 @@
>-DIRS = resample milenage srtp
>+DIRS = resample milenage
> 
> include ../../build.mak
> include $(PJDIR)/build/common.mak

Actions: View | Diff

Attachments on bug 728302: 576866 | 576867 | 577648 | 925597