Skip to content
Snippets Groups Projects
Commit d62c0692 authored by Vittorio Giovara's avatar Vittorio Giovara Committed by Tristan Matthews
Browse files

contrib: add zrtpcpp rules and patches

Change-Id: Ic66314b6e7b2ee5f25df4bb6d4fe6b1be7200068
Refs: #46617
parent a1836c1d
No related branches found
No related tags found
No related merge requests found
fbadb826ae26b2729e10d64197c58d545e0e6e7bd9524775cbf4838d2ce3e6ae559932b5c20bb579a3e0cab33abd50251adf129e761cfdcf3fb25347e71ffc36 libzrtpcpp-2.3.4.tar.gz
--- a/CMakeLists.txt.orig 2014-05-06 19:35:46.443707232 -0400
+++ b/CMakeLists.txt 2014-05-06 19:13:04.235686028 -0400
@@ -107,7 +107,7 @@
endif()
# now get info about crypto libraries
-pkg_check_modules(OPENSSL libcrypto>=0.9.8)
+#pkg_check_modules(OPENSSL libcrypto>=0.9.8)
if (OPENSSL_FOUND)
set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${OPENSSL_INCLUDE_DIRS}) #update include files search directory
check_include_files(openssl/bn.h HAVE_OPENSSL_BN_H)
# ZRTPCPP
ZRTPCPP_VERSION := 2.3.4
ZRTPCPP_URL := $(GNUTELEPHONY)/libzrtpcpp-$(ZRTPCPP_VERSION).tar.gz
PKGS += zrtpcpp
ifeq ($(call need_pkg,'libzrtpcpp >= 2.0.0'),)
PKGS_FOUND += zrtpcpp
endif
DEPS_zrtpcpp = ccrtp ucommon gcrypt
ZRTPCPP_CMAKECONF := -DBUILD_STATIC:BOOL=ON \
-DBUILD_SHARED:BOOL=OFF \
-DBUILD_SHARED_LIBS:BOOL=OFF
$(TARBALLS)/libzrtpcpp-$(ZRTPCPP_VERSION).tar.gz:
$(call download,$(ZRTPCPP_URL))
.sum-zrtpcpp: libzrtpcpp-$(ZRTPCPP_VERSION).tar.gz
zrtpcpp: libzrtpcpp-$(ZRTPCPP_VERSION).tar.gz .sum-zrtpcpp
$(UNPACK)
$(APPLY) $(SRC)/zrtpcpp/forcegcrypt.patch
$(APPLY) $(SRC)/zrtpcpp/threadcbsupdate.patch
$(APPLY) $(SRC)/zrtpcpp/standardheader.patch
$(MOVE)
.zrtpcpp: zrtpcpp toolchain.cmake
cd $< && $(HOSTVARS) $(CMAKE) . $(ZRTPCPP_CMAKECONF)
cd $< && $(MAKE) install VERBOSE=1
touch $@
--- a/src/libzrtpcpp/crypto/gcrypt/InitializeGcrypt.cpp.orig 2014-06-25 20:40:20.000000000 -0400
+++ b/src/libzrtpcpp/crypto/gcrypt/InitializeGcrypt.cpp 2014-06-25 20:40:32.000000000 -0400
@@ -17,7 +17,7 @@
#include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
#include <errno.h>
#include <gcrypt.h>
--- a/src/libzrtpcpp/crypto/gcrypt/InitializeGcrypt.cpp.orig 2014-06-12 17:36:14.367890764 -0400
+++ b/src/libzrtpcpp/crypto/gcrypt/InitializeGcrypt.cpp 2014-06-12 17:36:52.899889626 -0400
@@ -68,9 +68,12 @@
}
static struct gcry_thread_cbs gcry_threads = {
- GCRY_THREAD_OPTION_PTHREAD, NULL,
+ GCRY_THREAD_OPTION_PTHREAD,
+#if 0
+ NULL,
gcry_thread_mutex_init, gcry_thread_mutex_destroy,
gcry_thread_mutex_lock, gcry_thread_mutex_unlock
+#endif
};
#else
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment