From cf9f5629861f88de0ca318a6f2f973239c52f3c2 Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Mon, 14 Nov 2011 22:37:04 +0100 Subject: [PATCH 1/4] Fix srtp install/uninstall with parallel build. --- submodules/build/builders.d/srtp.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/build/builders.d/srtp.mk b/submodules/build/builders.d/srtp.mk index 2e2c9b1d6..97534a732 100644 --- a/submodules/build/builders.d/srtp.mk +++ b/submodules/build/builders.d/srtp.mk @@ -10,7 +10,7 @@ $(BUILDER_BUILD_DIR)/$(srtp_dir)/Makefile: $(BUILDER_SRC_DIR)/$(srtp_dir)/config $(BUILDER_SRC_DIR)/$(srtp_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} build-srtp: $(BUILDER_BUILD_DIR)/$(srtp_dir)/Makefile - cd $(BUILDER_BUILD_DIR)/$(srtp_dir) && make libsrtp.a && make uninstall install + cd $(BUILDER_BUILD_DIR)/$(srtp_dir) && make libsrtp.a && make uninstall && make install clean-srtp: -cd $(BUILDER_BUILD_DIR)/$(srtp_dir) && make clean From c61c15a6f81758f8a9498e1c211189a727339b91 Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Mon, 14 Nov 2011 22:38:36 +0100 Subject: [PATCH 2/4] Fix srtp compilation blocking issues. --- submodules/externals/srtp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/externals/srtp b/submodules/externals/srtp index f21cc2418..94599d9fd 160000 --- a/submodules/externals/srtp +++ b/submodules/externals/srtp @@ -1 +1 @@ -Subproject commit f21cc24184a285d0b7fec42dba7851a66f7a94ae +Subproject commit 94599d9fd7ab75b8a9854d3e7c25dab742319e50 From 6a5cd0815aba205879fa97e07a3dc76e3dfab8e8 Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Mon, 14 Nov 2011 22:39:30 +0100 Subject: [PATCH 3/4] Improve ZRTP documentation. --- README | 1 + 1 file changed, 1 insertion(+) diff --git a/README b/README index 1429a88d4..2cbc697cd 100644 --- a/README +++ b/README @@ -35,4 +35,5 @@ As Skype requires that you accept its license, the plugin is not compiled and en ZRTP liblinphone-sdk depends on the GNU LIBZRTPCPP extension for ZRTP support. As the license of this library is GPLv3+ it is not enabled unless the enable_zrtp=yes option is passed to the make command. +Add liblinphone-sdk/lib/libzrtpcpp.a to XCode. Define sip property media_encryption to "zrtp" in linphonerc. Note that activiting ZRTP makes the license of the whole application GPLv3+. From 33ddf4e90f078206d518a513925e3f453bfb3e81 Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Tue, 15 Nov 2011 10:53:41 +0100 Subject: [PATCH 4/4] don't let srtp redefine PACKAGE_NAME... --- submodules/externals/srtp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/externals/srtp b/submodules/externals/srtp index 94599d9fd..daa25fdba 160000 --- a/submodules/externals/srtp +++ b/submodules/externals/srtp @@ -1 +1 @@ -Subproject commit 94599d9fd7ab75b8a9854d3e7c25dab742319e50 +Subproject commit daa25fdbacb75e2aa99f5fce1bd5836dc616fb42