Use dyfet github repo for libccrtp
diff --git a/jni/libccrtp/sources/.gitignore b/jni/libccrtp/sources/.gitignore
index 0cee799..cce880a 100644
--- a/jni/libccrtp/sources/.gitignore
+++ b/jni/libccrtp/sources/.gitignore
@@ -1,5 +1,3 @@
-build/
-autoconf/
CMakeFiles/
demo-*
configure
@@ -7,8 +5,29 @@
Makefile.in
aclocal.m4
cmake_*
-CMakeCache.txt
+/CMakeCache.txt
config.h
+/auto*/
+/configure
+/config.*
+/ccrtp-config.h
+/ccrtp-config.h.in
+/ccrtp.list
+/directive
+/libtool
+doc/ccrtp.info
+doc/doxy
+doc/html/
+doc/man/
+demo/audiorx
+demo/audiotx
+demo/ccrtptest
+demo/ccsrtptest
+demo/rtpduphello
+demo/rtphello
+demo/rtplisten
+demo/rtpsend
+/stamp-*
*.o
*.lo
*.la
@@ -19,5 +38,9 @@
*.libs
*.pc
*.spec
+*.cbp
*~
-
+TAGS
+.gitattributes
+directive.in
+/packaging/
diff --git a/jni/libccrtp/sources/CMakeLists.txt b/jni/libccrtp/sources/CMakeLists.txt
index 1c55da5..c5de159 100644
--- a/jni/libccrtp/sources/CMakeLists.txt
+++ b/jni/libccrtp/sources/CMakeLists.txt
@@ -14,7 +14,7 @@
cmake_minimum_required(VERSION 2.6)
PROJECT(libccrtp)
-set (VERSION 2.0.7)
+set (VERSION 2.0.8)
set (SOVERSION ${VERSION})
STRING(REGEX REPLACE "[.].*$" "" SOVERSION ${SOVERSION})
set (REQUIRES 5.0.0)
diff --git a/jni/libccrtp/sources/ChangeLog b/jni/libccrtp/sources/ChangeLog
index 3f6e290..bfbc9fb 100644
--- a/jni/libccrtp/sources/ChangeLog
+++ b/jni/libccrtp/sources/ChangeLog
@@ -1,4 +1,12 @@
-2014-01-05 Tristen Matth
+2014-03-24 David Sugar (for 2.0.8)
+
+ Fixed for gcrypt >= 1.6.0...
+
+2014-01-15 Tristen Matthew (for 2.0.8)
+
+ Improved demos
+
+2014-01-05 Tristen Matthew
Clang fixes & code cleanup from static analysis
diff --git a/jni/libccrtp/sources/Makefile b/jni/libccrtp/sources/Makefile
index c6db325..8a427f0 100644
--- a/jni/libccrtp/sources/Makefile
+++ b/jni/libccrtp/sources/Makefile
@@ -300,12 +300,12 @@
LIPO =
LN_S = ln -s
LTLIBOBJS =
-LT_CCXX_VERSION = -version-info 2:4:0
+LT_CCXX_VERSION = -version-info 2:5:0
LT_MAJOR = 2
LT_MINOR = 0
LT_RELEASE =
LT_SUBVER = 2.0
-LT_VERSION = 2:4:0
+LT_VERSION = 2:5:0
MAINT = #
MAKEINFO = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing makeinfo
MANIFEST_TOOL = :
@@ -319,10 +319,10 @@
PACKAGE = ccrtp
PACKAGE_BUGREPORT =
PACKAGE_NAME = ccrtp
-PACKAGE_STRING = ccrtp 2.0.7
+PACKAGE_STRING = ccrtp 2.0.8
PACKAGE_TARNAME = ccrtp
PACKAGE_URL =
-PACKAGE_VERSION = 2.0.7
+PACKAGE_VERSION = 2.0.8
PATH_SEPARATOR = :
PKG_CONFIG = /usr/bin/pkg-config
PKG_CONFIG_LIBDIR =
@@ -332,7 +332,7 @@
SET_MAKE =
SHELL = /bin/sh
STRIP = strip
-VERSION = 2.0.7
+VERSION = 2.0.8
WARN_FLAGS = -fno-strict-aliasing -Wall -ansi -pedantic
abs_builddir = /home/lisional/git/sflphone-android/jni/libccrtp/sources
abs_srcdir = /home/lisional/git/sflphone-android/jni/libccrtp/sources
diff --git a/jni/libccrtp/sources/autom4te.cache/output.0 b/jni/libccrtp/sources/autom4te.cache/output.0
index 0c8b68c..4a51668 100644
--- a/jni/libccrtp/sources/autom4te.cache/output.0
+++ b/jni/libccrtp/sources/autom4te.cache/output.0
@@ -1,6 +1,6 @@
@%:@! /bin/sh
@%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.69 for ccrtp 2.0.7.
+@%:@ Generated by GNU Autoconf 2.69 for ccrtp 2.0.8.
@%:@
@%:@
@%:@ Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@
# Identity of this package.
PACKAGE_NAME='ccrtp'
PACKAGE_TARNAME='ccrtp'
-PACKAGE_VERSION='2.0.7'
-PACKAGE_STRING='ccrtp 2.0.7'
+PACKAGE_VERSION='2.0.8'
+PACKAGE_STRING='ccrtp 2.0.8'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1362,7 +1362,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures ccrtp 2.0.7 to adapt to many kinds of systems.
+\`configure' configures ccrtp 2.0.8 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1433,7 +1433,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of ccrtp 2.0.7:";;
+ short | recursive ) echo "Configuration of ccrtp 2.0.8:";;
esac
cat <<\_ACEOF
@@ -1559,7 +1559,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-ccrtp configure 2.0.7
+ccrtp configure 2.0.8
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2045,7 +2045,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by ccrtp $as_me 2.0.7, which was
+It was created by ccrtp $as_me 2.0.8, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2395,7 +2395,7 @@
-LT_VERSION="2:4:0"
+LT_VERSION="2:5:0"
REQUIRES="5.0.0"
ac_aux_dir=
@@ -15542,7 +15542,7 @@
# Define the identity of the package.
PACKAGE='ccrtp'
- VERSION='2.0.7'
+ VERSION='2.0.8'
cat >>confdefs.h <<_ACEOF
@@ -17320,7 +17320,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by ccrtp $as_me 2.0.7, which was
+This file was extended by ccrtp $as_me 2.0.8, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -17386,7 +17386,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-ccrtp config.status 2.0.7
+ccrtp config.status 2.0.8
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/jni/libccrtp/sources/autom4te.cache/output.1 b/jni/libccrtp/sources/autom4te.cache/output.1
index 0c8b68c..4a51668 100644
--- a/jni/libccrtp/sources/autom4te.cache/output.1
+++ b/jni/libccrtp/sources/autom4te.cache/output.1
@@ -1,6 +1,6 @@
@%:@! /bin/sh
@%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.69 for ccrtp 2.0.7.
+@%:@ Generated by GNU Autoconf 2.69 for ccrtp 2.0.8.
@%:@
@%:@
@%:@ Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@
# Identity of this package.
PACKAGE_NAME='ccrtp'
PACKAGE_TARNAME='ccrtp'
-PACKAGE_VERSION='2.0.7'
-PACKAGE_STRING='ccrtp 2.0.7'
+PACKAGE_VERSION='2.0.8'
+PACKAGE_STRING='ccrtp 2.0.8'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1362,7 +1362,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures ccrtp 2.0.7 to adapt to many kinds of systems.
+\`configure' configures ccrtp 2.0.8 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1433,7 +1433,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of ccrtp 2.0.7:";;
+ short | recursive ) echo "Configuration of ccrtp 2.0.8:";;
esac
cat <<\_ACEOF
@@ -1559,7 +1559,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-ccrtp configure 2.0.7
+ccrtp configure 2.0.8
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2045,7 +2045,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by ccrtp $as_me 2.0.7, which was
+It was created by ccrtp $as_me 2.0.8, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2395,7 +2395,7 @@
-LT_VERSION="2:4:0"
+LT_VERSION="2:5:0"
REQUIRES="5.0.0"
ac_aux_dir=
@@ -15542,7 +15542,7 @@
# Define the identity of the package.
PACKAGE='ccrtp'
- VERSION='2.0.7'
+ VERSION='2.0.8'
cat >>confdefs.h <<_ACEOF
@@ -17320,7 +17320,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by ccrtp $as_me 2.0.7, which was
+This file was extended by ccrtp $as_me 2.0.8, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -17386,7 +17386,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-ccrtp config.status 2.0.7
+ccrtp config.status 2.0.8
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/jni/libccrtp/sources/autom4te.cache/requests b/jni/libccrtp/sources/autom4te.cache/requests
index 6987e91..94df52d 100644
--- a/jni/libccrtp/sources/autom4te.cache/requests
+++ b/jni/libccrtp/sources/autom4te.cache/requests
@@ -47,205 +47,205 @@
'configure.ac'
],
{
- 'AC_LTDL_SHLIBEXT' => 1,
- 'm4_pattern_allow' => 1,
- 'AM_MAKE_INCLUDE' => 1,
- 'AC_LIBTOOL_LINKER_OPTION' => 1,
- 'AC_PROG_EGREP' => 1,
- 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
- 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
- '_AM_DEPENDENCIES' => 1,
- 'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
- '_LT_COMPILER_BOILERPLATE' => 1,
- 'AM_DISABLE_STATIC' => 1,
- '_LT_AC_LOCK' => 1,
- 'AC_LIBTOOL_PROG_CC_C_O' => 1,
- 'AC_LIBTOOL_CONFIG' => 1,
- '_AM_AUTOCONF_VERSION' => 1,
- 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
- 'LTDL_CONVENIENCE' => 1,
- 'AC_PROG_LD_GNU' => 1,
- '_LT_PROG_ECHO_BACKSLASH' => 1,
- 'PKG_INSTALLDIR' => 1,
- 'AM_SET_DEPDIR' => 1,
- 'LT_AC_PROG_SED' => 1,
- 'LTOPTIONS_VERSION' => 1,
- '_LT_AC_TAGCONFIG' => 1,
- 'm4_pattern_forbid' => 1,
- 'AC_DEFUN_ONCE' => 1,
- 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
- 'OST_PROJ_LIBRARY' => 1,
- 'AM_PROG_NM' => 1,
- '_LT_AC_SHELL_INIT' => 1,
- '_LT_AC_TRY_DLOPEN_SELF' => 1,
- 'AC_CHECK_LIBM' => 1,
- 'OST_PROG_LIBVER' => 1,
- 'AM_CONFIG_HEADER' => 1,
- '_LT_AC_LANG_CXX_CONFIG' => 1,
- 'LT_AC_PROG_EGREP' => 1,
- 'AC_CONFIG_MACRO_DIR_TRACE' => 1,
- '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
- 'AU_DEFUN' => 1,
- '_LT_AC_PROG_CXXCPP' => 1,
- 'AC_PATH_TOOL_PREFIX' => 1,
- 'AC_LTDL_PREOPEN' => 1,
- 'AM_INIT_AUTOMAKE' => 1,
- '_AM_IF_OPTION' => 1,
- '_LT_LINKER_OPTION' => 1,
- '_LT_AC_FILE_LTDLL_C' => 1,
- '_m4_warn' => 1,
- 'LT_LANG' => 1,
- 'LT_SYS_SYMBOL_USCORE' => 1,
- 'AC_LIBTOOL_DLOPEN_SELF' => 1,
- 'AC_PROG_LD' => 1,
- '_LT_WITH_SYSROOT' => 1,
- '_PKG_SHORT_ERRORS_SUPPORTED' => 1,
- '_AM_MANGLE_OPTION' => 1,
- 'AC_DISABLE_STATIC' => 1,
- 'LT_OUTPUT' => 1,
- 'AC_LIBTOOL_DLOPEN' => 1,
- '_AC_AM_CONFIG_HEADER_HOOK' => 1,
- 'LT_CONFIG_LTDL_DIR' => 1,
- 'AC_LTDL_DLSYM_USCORE' => 1,
- 'LT_PROG_GO' => 1,
- 'AC_CONFIG_MACRO_DIR' => 1,
- 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
- 'AM_DEP_TRACK' => 1,
- 'AC_LIBTOOL_COMPILER_OPTION' => 1,
- 'AM_PROG_INSTALL_SH' => 1,
- 'AC_LTDL_ENABLE_INSTALL' => 1,
- 'OST_PROG_LIBRARY' => 1,
- 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
- 'LT_AC_PROG_GCJ' => 1,
- 'AC_PATH_MAGIC' => 1,
- 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
- 'AC_LIBTOOL_PICMODE' => 1,
- 'AC_LTDL_SYMBOL_USCORE' => 1,
- 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
- 'AC_LIBTOOL_FC' => 1,
- 'AC_ENABLE_FAST_INSTALL' => 1,
- 'AC_LIBLTDL_CONVENIENCE' => 1,
- 'AC_LIB_LTDL' => 1,
- 'AM_SUBST_NOTMAKE' => 1,
- 'AC_ENABLE_SHARED' => 1,
- 'AM_ENABLE_SHARED' => 1,
- '_AC_PROG_LIBTOOL' => 1,
- 'OST_PROG_COMMON' => 1,
- 'AC_LIBTOOL_GCJ' => 1,
- 'OST_DEBUG' => 1,
- 'PKG_CHECK_EXISTS' => 1,
- '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
- '_LT_LINKER_BOILERPLATE' => 1,
- 'PKG_CHECK_MODULES' => 1,
- 'AC_DEFUN' => 1,
- 'LT_SUPPORTED_TAG' => 1,
- 'LT_INIT' => 1,
- 'AC_LTDL_OBJDIR' => 1,
- 'OST_MAINTAINER_MODE' => 1,
- 'LT_WITH_LTDL' => 1,
- 'AM_RUN_LOG' => 1,
'LT_PROG_GCJ' => 1,
- 'AC_PROG_LD_RELOAD_FLAG' => 1,
- 'LT_CMD_MAX_LEN' => 1,
- 'AM_DISABLE_SHARED' => 1,
- 'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
- 'AM_AUX_DIR_EXPAND' => 1,
- 'LT_PATH_LD' => 1,
- 'AC_SUBST_DIR' => 1,
- '_LT_AC_LANG_F77_CONFIG' => 1,
- 'LT_PROG_RC' => 1,
- 'include' => 1,
- 'AM_PROG_CC_STDC' => 1,
- 'AM_PROG_LD' => 1,
- 'AC_LTDL_SHLIBPATH' => 1,
- '_LT_PREPARE_SED_QUOTE_VARS' => 1,
- '_LT_AC_LANG_RC_CONFIG' => 1,
- 'LTVERSION_VERSION' => 1,
- 'AM_AUTOMAKE_VERSION' => 1,
- 'LTSUGAR_VERSION' => 1,
- '_LT_PROG_F77' => 1,
- 'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
- 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
- '_LT_PROG_LTMAIN' => 1,
- 'AM_ENABLE_STATIC' => 1,
- 'AM_MISSING_HAS_RUN' => 1,
- '_AM_CONFIG_MACRO_DIRS' => 1,
- '_LT_PROG_FC' => 1,
- 'AM_PATH_LIBGCRYPT_CCRTP' => 1,
- 'AM_C_PROTOTYPES' => 1,
- 'AC_LTDL_DLLIB' => 1,
- 'AC_LIBTOOL_RC' => 1,
- 'AC_LIBTOOL_CXX' => 1,
- 'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
- 'fp_C_PROTOTYPES' => 1,
- '_AM_SET_OPTIONS' => 1,
- '_LT_AC_LANG_F77' => 1,
- 'AC_LIBTOOL_F77' => 1,
- 'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
+ 'AC_LTDL_DLSYM_USCORE' => 1,
+ '_LT_AC_LOCK' => 1,
+ 'AC_ENABLE_SHARED' => 1,
'PKG_NOARCH_INSTALLDIR' => 1,
- '_LT_AC_LANG_C_CONFIG' => 1,
- '_LT_LIBOBJ' => 1,
- 'AC_ENABLE_STATIC' => 1,
- 'AM_MISSING_PROG' => 1,
- 'AC_DISABLE_FAST_INSTALL' => 1,
- 'LT_SYS_DLSEARCH_PATH' => 1,
- 'AC_DEPLIBS_CHECK_METHOD' => 1,
- 'LT_SYS_DLOPEN_DEPLIBS' => 1,
- '_LT_PROG_CXX' => 1,
- 'PKG_CHECK_VAR' => 1,
- 'gl_FUNC_ARGZ' => 1,
- 'AM_SET_LEADING_DOT' => 1,
- 'AC_WITH_LTDL' => 1,
- '_LT_REQUIRED_DARWIN_CHECKS' => 1,
- 'AC_LIBTOOL_LANG_C_CONFIG' => 1,
'_LT_AC_LANG_GCJ_CONFIG' => 1,
- 'LT_LIB_DLLOAD' => 1,
- 'AC_LIBTOOL_SETUP' => 1,
+ '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
'LT_AC_PROG_RC' => 1,
- 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
- 'AC_LIBTOOL_OBJDIR' => 1,
- '_AM_PROG_TAR' => 1,
- 'AC_LIBTOOL_WIN32_DLL' => 1,
- '_LT_CC_BASENAME' => 1,
- 'AM_MAINTAINER_MODE' => 1,
- 'LT_SYS_MODULE_PATH' => 1,
- '_LT_AC_LANG_CXX' => 1,
- 'LTDL_INSTALLABLE' => 1,
- '_AM_SET_OPTION' => 1,
- 'LT_SYS_MODULE_EXT' => 1,
- 'AC_LTDL_SYSSEARCHPATH' => 1,
- 'AM_SANITY_CHECK' => 1,
- 'LT_FUNC_DLSYM_USCORE' => 1,
- 'LT_LIB_M' => 1,
- 'LT_PATH_NM' => 1,
- '_LT_COMPILER_OPTION' => 1,
- '_LT_AC_LANG_GCJ' => 1,
- 'AC_PROG_NM' => 1,
- 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
- 'gl_PREREQ_ARGZ' => 1,
- '_LT_AC_TAGVAR' => 1,
- 'OST_PROG_CC_POSIX' => 1,
- '_AM_SUBST_NOTMAKE' => 1,
- 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
- 'OST_AUTOMAKE_MODE' => 1,
- '_LT_AC_SYS_LIBPATH_AIX' => 1,
- 'AC_LIBLTDL_INSTALLABLE' => 1,
- 'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
- 'AM_PROG_LIBTOOL' => 1,
'PKG_PROG_PKG_CONFIG' => 1,
- 'AC_DISABLE_SHARED' => 1,
- 'LT_SYS_DLOPEN_SELF' => 1,
- '_LT_AC_SYS_COMPILER' => 1,
- 'AM_SILENT_RULES' => 1,
- '_LT_AC_CHECK_DLFCN' => 1,
- 'LTDL_INIT' => 1,
+ 'AM_SUBST_NOTMAKE' => 1,
+ 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
+ 'AM_DISABLE_SHARED' => 1,
+ 'AC_SUBST_DIR' => 1,
+ 'AC_LIBTOOL_CONFIG' => 1,
+ 'AC_DEFUN_ONCE' => 1,
+ '_AM_SET_OPTIONS' => 1,
+ '_LT_AC_LANG_CXX' => 1,
+ 'LT_INIT' => 1,
+ '_LT_PROG_FC' => 1,
+ '_LT_PROG_CXX' => 1,
+ 'AC_LIBTOOL_F77' => 1,
+ 'AC_LIBTOOL_PROG_CC_C_O' => 1,
+ 'LT_SYS_DLSEARCH_PATH' => 1,
+ 'AM_AUX_DIR_EXPAND' => 1,
+ 'LT_FUNC_DLSYM_USCORE' => 1,
+ '_AM_IF_OPTION' => 1,
+ '_AM_AUTOCONF_VERSION' => 1,
+ '_LT_AC_TAGVAR' => 1,
+ 'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
+ 'AC_PROG_NM' => 1,
'LTOBSOLETE_VERSION' => 1,
- 'AM_PROG_INSTALL_STRIP' => 1,
- 'AC_PROG_LIBTOOL' => 1,
- 'm4_include' => 1,
- '_LTDL_SETUP' => 1,
+ 'AC_DISABLE_STATIC' => 1,
+ '_LT_AC_SHELL_INIT' => 1,
+ 'OST_AUTOMAKE_MODE' => 1,
+ 'AM_PROG_INSTALL_SH' => 1,
+ 'AC_ENABLE_STATIC' => 1,
+ 'AC_PATH_MAGIC' => 1,
+ 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
+ 'AM_CONFIG_HEADER' => 1,
+ 'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
+ 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
+ 'AM_SILENT_RULES' => 1,
+ 'LTDL_CONVENIENCE' => 1,
'AM_CONDITIONAL' => 1,
- '_LT_PATH_TOOL_PREFIX' => 1
+ 'LT_SYS_DLOPEN_SELF' => 1,
+ 'PKG_INSTALLDIR' => 1,
+ 'AC_LIBLTDL_CONVENIENCE' => 1,
+ 'AM_MISSING_HAS_RUN' => 1,
+ 'AM_ENABLE_SHARED' => 1,
+ 'AC_LIBLTDL_INSTALLABLE' => 1,
+ 'AC_LIBTOOL_COMPILER_OPTION' => 1,
+ 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
+ '_AM_DEPENDENCIES' => 1,
+ 'LTOPTIONS_VERSION' => 1,
+ 'LT_SYS_DLOPEN_DEPLIBS' => 1,
+ 'AM_SET_LEADING_DOT' => 1,
+ 'AC_PROG_LD' => 1,
+ 'AC_LIBTOOL_OBJDIR' => 1,
+ 'AC_LTDL_PREOPEN' => 1,
+ 'AC_PROG_LD_GNU' => 1,
+ 'AM_MAKE_INCLUDE' => 1,
+ 'AM_RUN_LOG' => 1,
+ 'AC_DISABLE_FAST_INSTALL' => 1,
+ 'LT_OUTPUT' => 1,
+ 'LT_LANG' => 1,
+ 'LT_AC_PROG_EGREP' => 1,
+ 'AU_DEFUN' => 1,
+ 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
+ 'LT_AC_PROG_GCJ' => 1,
+ 'AC_LIBTOOL_SETUP' => 1,
+ 'm4_include' => 1,
+ 'm4_pattern_forbid' => 1,
+ 'AM_AUTOMAKE_VERSION' => 1,
+ '_LT_COMPILER_BOILERPLATE' => 1,
+ '_LT_AC_LANG_GCJ' => 1,
+ 'AM_PATH_LIBGCRYPT_CCRTP' => 1,
+ 'AC_PROG_EGREP' => 1,
+ 'AC_LIBTOOL_DLOPEN_SELF' => 1,
+ 'OST_PROG_LIBRARY' => 1,
+ 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+ 'AC_LIBTOOL_GCJ' => 1,
+ 'm4_pattern_allow' => 1,
+ 'AM_ENABLE_STATIC' => 1,
+ 'AC_LTDL_ENABLE_INSTALL' => 1,
+ 'AM_PROG_CC_STDC' => 1,
+ 'AC_LIBTOOL_LINKER_OPTION' => 1,
+ '_LT_PROG_F77' => 1,
+ 'AM_SET_DEPDIR' => 1,
+ '_LT_AC_LANG_F77' => 1,
+ 'OST_DEBUG' => 1,
+ 'AM_PROG_LD' => 1,
+ 'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
+ '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
+ 'OST_PROG_COMMON' => 1,
+ 'AC_LIBTOOL_WIN32_DLL' => 1,
+ 'LT_LIB_DLLOAD' => 1,
+ 'AC_LIBTOOL_LANG_C_CONFIG' => 1,
+ '_LT_AC_FILE_LTDLL_C' => 1,
+ 'AC_PROG_LD_RELOAD_FLAG' => 1,
+ 'AM_PROG_INSTALL_STRIP' => 1,
+ '_LT_AC_SYS_COMPILER' => 1,
+ 'AC_DISABLE_SHARED' => 1,
+ '_LT_AC_SYS_LIBPATH_AIX' => 1,
+ 'PKG_CHECK_MODULES' => 1,
+ '_LT_AC_LANG_C_CONFIG' => 1,
+ 'PKG_CHECK_EXISTS' => 1,
+ 'AC_ENABLE_FAST_INSTALL' => 1,
+ 'OST_MAINTAINER_MODE' => 1,
+ 'AM_C_PROTOTYPES' => 1,
+ '_LT_WITH_SYSROOT' => 1,
+ '_LT_AC_LANG_RC_CONFIG' => 1,
+ '_LT_AC_CHECK_DLFCN' => 1,
+ '_LT_AC_TRY_DLOPEN_SELF' => 1,
+ '_LT_AC_LANG_CXX_CONFIG' => 1,
+ '_LT_PREPARE_SED_QUOTE_VARS' => 1,
+ '_AC_AM_CONFIG_HEADER_HOOK' => 1,
+ 'AC_LIBTOOL_CXX' => 1,
+ '_AM_PROG_TAR' => 1,
+ 'AC_DEPLIBS_CHECK_METHOD' => 1,
+ 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
+ 'LTDL_INIT' => 1,
+ 'AC_PROG_LIBTOOL' => 1,
+ 'AC_LIBTOOL_FC' => 1,
+ 'AC_LTDL_SHLIBPATH' => 1,
+ 'LT_PROG_GO' => 1,
+ '_LT_AC_LANG_F77_CONFIG' => 1,
+ 'fp_C_PROTOTYPES' => 1,
+ 'AM_MISSING_PROG' => 1,
+ 'LT_LIB_M' => 1,
+ 'gl_PREREQ_ARGZ' => 1,
+ 'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
+ 'LT_SUPPORTED_TAG' => 1,
+ 'AC_LIBTOOL_RC' => 1,
+ 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
+ 'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
+ 'AM_DISABLE_STATIC' => 1,
+ 'AC_PATH_TOOL_PREFIX' => 1,
+ '_LT_PROG_ECHO_BACKSLASH' => 1,
+ 'LT_CONFIG_LTDL_DIR' => 1,
+ 'AC_LTDL_SYSSEARCHPATH' => 1,
+ '_AM_MANGLE_OPTION' => 1,
+ '_LT_REQUIRED_DARWIN_CHECKS' => 1,
+ 'AC_LTDL_SYMBOL_USCORE' => 1,
+ '_AM_SUBST_NOTMAKE' => 1,
+ '_LT_AC_TAGCONFIG' => 1,
+ 'LTDL_INSTALLABLE' => 1,
+ 'AC_LTDL_DLLIB' => 1,
+ 'AM_SANITY_CHECK' => 1,
+ 'LT_PATH_LD' => 1,
+ '_LT_PROG_LTMAIN' => 1,
+ 'AC_CHECK_LIBM' => 1,
+ '_LT_LIBOBJ' => 1,
+ 'PKG_CHECK_VAR' => 1,
+ 'LT_PROG_RC' => 1,
+ 'AM_DEP_TRACK' => 1,
+ 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
+ '_m4_warn' => 1,
+ '_LT_LINKER_OPTION' => 1,
+ 'AM_INIT_AUTOMAKE' => 1,
+ '_LTDL_SETUP' => 1,
+ 'LT_SYS_MODULE_EXT' => 1,
+ 'LT_AC_PROG_SED' => 1,
+ 'AM_MAINTAINER_MODE' => 1,
+ 'OST_PROG_LIBVER' => 1,
+ 'AC_LTDL_OBJDIR' => 1,
+ 'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
+ 'LT_CMD_MAX_LEN' => 1,
+ 'include' => 1,
+ '_AM_SET_OPTION' => 1,
+ 'LTSUGAR_VERSION' => 1,
+ 'AC_DEFUN' => 1,
+ '_AC_PROG_LIBTOOL' => 1,
+ 'AC_LTDL_SHLIBEXT' => 1,
+ 'gl_FUNC_ARGZ' => 1,
+ 'LT_SYS_MODULE_PATH' => 1,
+ 'AC_LIB_LTDL' => 1,
+ 'LT_WITH_LTDL' => 1,
+ 'OST_PROJ_LIBRARY' => 1,
+ '_LT_AC_PROG_CXXCPP' => 1,
+ 'AC_WITH_LTDL' => 1,
+ '_LT_PATH_TOOL_PREFIX' => 1,
+ '_LT_CC_BASENAME' => 1,
+ 'AC_CONFIG_MACRO_DIR' => 1,
+ 'AC_LIBTOOL_DLOPEN' => 1,
+ '_PKG_SHORT_ERRORS_SUPPORTED' => 1,
+ 'LTVERSION_VERSION' => 1,
+ 'LT_PATH_NM' => 1,
+ '_LT_LINKER_BOILERPLATE' => 1,
+ 'AC_CONFIG_MACRO_DIR_TRACE' => 1,
+ '_LT_COMPILER_OPTION' => 1,
+ 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
+ 'AC_LIBTOOL_PICMODE' => 1,
+ 'AM_PROG_NM' => 1,
+ '_AM_CONFIG_MACRO_DIRS' => 1,
+ 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
+ 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+ 'OST_PROG_CC_POSIX' => 1,
+ 'LT_SYS_SYMBOL_USCORE' => 1,
+ 'AM_PROG_LIBTOOL' => 1
}
], 'Autom4te::Request' ),
bless( [
@@ -260,65 +260,65 @@
'configure.ac'
],
{
- 'AH_OUTPUT' => 1,
'AC_CANONICAL_TARGET' => 1,
- 'AC_INIT' => 1,
- 'AM_PROG_MOC' => 1,
- 'AM_PROG_CXX_C_O' => 1,
'AC_REQUIRE_AUX_FILE' => 1,
- '_AM_COND_IF' => 1,
- '_m4_warn' => 1,
- 'AC_FC_PP_DEFINE' => 1,
- 'AM_POT_TOOLS' => 1,
+ 'AC_CONFIG_FILES' => 1,
+ 'AM_EXTRA_RECURSIVE_TARGETS' => 1,
+ '_AM_SUBST_NOTMAKE' => 1,
+ '_LT_AC_TAGCONFIG' => 1,
+ 'AM_NLS' => 1,
+ 'AM_SILENT_RULES' => 1,
+ 'AM_PROG_AR' => 1,
'AM_CONDITIONAL' => 1,
+ '_AM_MAKEFILE_INCLUDE' => 1,
'AC_DEFINE_TRACE_LITERAL' => 1,
+ 'LT_CONFIG_LTDL_DIR' => 1,
+ '_AM_COND_ELSE' => 1,
+ 'AM_PROG_MOC' => 1,
+ 'AC_CONFIG_SUBDIRS' => 1,
+ 'AH_OUTPUT' => 1,
+ 'AM_PROG_CXX_C_O' => 1,
+ 'AC_SUBST_TRACE' => 1,
'AC_CANONICAL_SYSTEM' => 1,
- 'include' => 1,
- 'AC_CONFIG_LIBOBJ_DIR' => 1,
- 'AC_PROG_LIBTOOL' => 1,
+ 'AC_CANONICAL_BUILD' => 1,
+ 'AM_POT_TOOLS' => 1,
+ 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
+ 'LT_SUPPORTED_TAG' => 1,
+ 'AC_FC_PP_DEFINE' => 1,
+ '_AM_COND_ENDIF' => 1,
+ 'AM_MAKEFILE_INCLUDE' => 1,
+ 'AC_INIT' => 1,
+ 'AM_PROG_F77_C_O' => 1,
+ 'm4_pattern_allow' => 1,
+ 'AC_FC_SRCEXT' => 1,
+ 'AC_CANONICAL_HOST' => 1,
+ 'AC_CONFIG_HEADERS' => 1,
'AC_SUBST' => 1,
+ 'AC_CONFIG_LINKS' => 1,
+ 'include' => 1,
+ '_AM_COND_IF' => 1,
+ 'AM_XGETTEXT_OPTION' => 1,
+ 'AC_PROG_LIBTOOL' => 1,
+ 'AM_AUTOMAKE_VERSION' => 1,
+ 'AM_PROG_MKDIR_P' => 1,
+ 'AM_PATH_GUILE' => 1,
+ 'AC_LIBSOURCE' => 1,
+ 'AM_MAINTAINER_MODE' => 1,
+ 'LT_INIT' => 1,
+ 'm4_pattern_forbid' => 1,
'm4_include' => 1,
'AC_CONFIG_AUX_DIR' => 1,
- 'AM_MAINTAINER_MODE' => 1,
- 'AC_CANONICAL_HOST' => 1,
- 'm4_sinclude' => 1,
- 'AC_CONFIG_HEADERS' => 1,
- 'AM_PROG_F77_C_O' => 1,
- 'AM_PROG_CC_C_O' => 1,
- 'AC_CONFIG_SUBDIRS' => 1,
- 'AC_SUBST_TRACE' => 1,
- 'AM_ENABLE_MULTILIB' => 1,
'AM_INIT_AUTOMAKE' => 1,
- 'AM_SILENT_RULES' => 1,
- 'LT_SUPPORTED_TAG' => 1,
'AC_FC_PP_SRCEXT' => 1,
- 'LT_INIT' => 1,
- 'AC_CANONICAL_BUILD' => 1,
- '_AM_COND_ELSE' => 1,
- '_LT_AC_TAGCONFIG' => 1,
- '_AM_SUBST_NOTMAKE' => 1,
- 'AM_XGETTEXT_OPTION' => 1,
- 'm4_pattern_forbid' => 1,
- 'AC_LIBSOURCE' => 1,
- 'AC_CONFIG_LINKS' => 1,
- 'AC_CONFIG_FILES' => 1,
- 'AC_FC_SRCEXT' => 1,
- 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
- 'AM_PROG_FC_C_O' => 1,
'sinclude' => 1,
- 'AM_EXTRA_RECURSIVE_TARGETS' => 1,
- 'AM_PROG_AR' => 1,
- 'AM_NLS' => 1,
- 'LT_CONFIG_LTDL_DIR' => 1,
- 'AM_PROG_MKDIR_P' => 1,
- 'AM_AUTOMAKE_VERSION' => 1,
- 'm4_pattern_allow' => 1,
- 'AM_GNU_GETTEXT' => 1,
+ 'AC_CONFIG_LIBOBJ_DIR' => 1,
+ '_m4_warn' => 1,
+ 'm4_sinclude' => 1,
+ 'AM_PROG_CC_C_O' => 1,
+ 'AM_PROG_FC_C_O' => 1,
'AC_FC_FREEFORM' => 1,
- 'AM_MAKEFILE_INCLUDE' => 1,
- 'AM_PATH_GUILE' => 1,
- '_AM_MAKEFILE_INCLUDE' => 1,
- '_AM_COND_ENDIF' => 1
+ 'AM_ENABLE_MULTILIB' => 1,
+ 'AM_GNU_GETTEXT' => 1
}
], 'Autom4te::Request' )
);
diff --git a/jni/libccrtp/sources/autom4te.cache/traces.1 b/jni/libccrtp/sources/autom4te.cache/traces.1
index 3e2a35e..137af45 100644
--- a/jni/libccrtp/sources/autom4te.cache/traces.1
+++ b/jni/libccrtp/sources/autom4te.cache/traces.1
@@ -7,7 +7,7 @@
m4trace:aclocal.m4:1326: -1- m4_include([m4/ost_debug.m4])
m4trace:aclocal.m4:1327: -1- m4_include([m4/ost_maint.m4])
m4trace:aclocal.m4:1328: -1- m4_include([m4/ost_prog.m4])
-m4trace:configure.ac:12: -1- AC_INIT([ccrtp], [2.0.7])
+m4trace:configure.ac:12: -1- AC_INIT([ccrtp], [2.0.8])
m4trace:configure.ac:12: -1- m4_pattern_forbid([^_?A[CHUM]_])
m4trace:configure.ac:12: -1- m4_pattern_forbid([_AC_])
m4trace:configure.ac:12: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS'])
diff --git a/jni/libccrtp/sources/ccrtp-config.h b/jni/libccrtp/sources/ccrtp-config.h
index bf7faf2..683f937 100644
--- a/jni/libccrtp/sources/ccrtp-config.h
+++ b/jni/libccrtp/sources/ccrtp-config.h
@@ -63,7 +63,7 @@
#define PACKAGE_NAME "ccrtp"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "ccrtp 2.0.7"
+#define PACKAGE_STRING "ccrtp 2.0.8"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "ccrtp"
@@ -72,7 +72,7 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "2.0.7"
+#define PACKAGE_VERSION "2.0.8"
/* SRTP support */
#define SRTP_SUPPORT /**/
@@ -81,7 +81,7 @@
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "2.0.7"
+#define VERSION "2.0.8"
/* Define to `__inline__' or `__inline' if that's what the C compiler
calls it, or to nothing if 'inline' is not supported under any name. */
diff --git a/jni/libccrtp/sources/ccrtp.list b/jni/libccrtp/sources/ccrtp.list
index 417609d..1f09de6 100644
--- a/jni/libccrtp/sources/ccrtp.list
+++ b/jni/libccrtp/sources/ccrtp.list
@@ -13,7 +13,7 @@
# Product information
%product GNU C++ RTP Stack
-%version 2.0.7 -100
+%version 2.0.8 -100
%copyright 2004 Federico Montesino Pouzols & Open Source Telecom Corporation
%vendor Open Source Telecom Corp
%license COPYING
@@ -26,9 +26,9 @@
f 0644 root root ${libdir} ./src/*.la
f 0644 root root ${libdir} ./src/.libs/*.a
%system darwin
-f 0644 root root ${libdir} ./src/.libs/libccrtp1-2.0.7.dylib
-l 0644 root root ${libdir}/libccrtp1.dylib libccrtp1-2.0.7.dylib
-l 0644 root root ${libdir}/libccrtp1.dylib-2.0.7.2.0.dylib libccrtp1-2.0.7.dylib
+f 0644 root root ${libdir} ./src/.libs/libccrtp1-2.0.8.dylib
+l 0644 root root ${libdir}/libccrtp1.dylib libccrtp1-2.0.8.dylib
+l 0644 root root ${libdir}/libccrtp1.dylib-2.0.8.2.0.dylib libccrtp1-2.0.8.dylib
%system freebsd
f 0644 root root ${libdir} ./src/.libs/libccrtp1-.so.*
%system linux solaris
diff --git a/jni/libccrtp/sources/ccrtp.spec b/jni/libccrtp/sources/ccrtp.spec
index 94beb47..d640cbf 100644
--- a/jni/libccrtp/sources/ccrtp.spec
+++ b/jni/libccrtp/sources/ccrtp.spec
@@ -1,26 +1,29 @@
-%{!?release: %define release 0}
-%{!?version: %define version 2.0.7}
-
-%define _libname libccrtp2
-%define _devname libccrtp-devel
+# Copyright (c) 2014 David Sugar, Tycho Softworks.
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
Summary: A Common C++ Class Framework for RTP Packets
-Name: libccrtp
-Version: %{version}
-Release: %{release}%{?dist}
+Name: ccrtp
+Version: 2.0.8
+Release: 0%{?dist}
License: LGPL v2 or later
-Group: Development/Libraries/C and C++
+Group: System/Library
URL: http://www.gnu.org/software/commoncpp/commoncpp.html
Source0: ccrtp-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: ucommon >= 5.0.0
+BuildRequires: ucommon-devel >= 6.0.0
BuildRequires: pkgconfig
-BuildRequires: libstdc++-devel
BuildRequires: libgcrypt-devel
BuildRequires: gcc-c++
%description
-ccRTP is a generic, extensible and efficient C++ framework for
+GNU ccRTP is a generic, extensible and efficient C++ framework for
developing applications based on the Real-Time Transport Protocol
(RTP) from the IETF. It is based on Common C++ and provides a full
RTP/RTCP stack for sending and receiving of realtime data by the use
@@ -29,49 +32,43 @@
automatically, supports different threading models and is generic as
for underlying network and transport protocols.
-%package -n %{_libname}
-Group: Development/Libraries/C and C++
-Summary: Runtime library for GNU RTP Stack
-Provides: %{name} = %{version}-%{release}
-
-%package -n %{_devname}
+%package devel
Group: Development/Libraries/C and C++
Summary: Headers and static link library for ccrtp
-Requires: %{_libname} = %{version}
-Requires: ucommon-devel >= 5.0.0
+Requires: %{name} = %{version}
+Requires: ucommon-devel >= 6.0.0
Requires: libgcrypt-devel
-Provides: %{name}-devel = %{version}-%{release}
-%description -n %{_libname}
-This package contains the runtime library needed by applications that use
-the GNU RTP stack.
-
-%description -n %{_devname}
+%description devel
This package provides the header files, link libraries, and
documentation for building applications that use GNU ccrtp.
%prep
-%setup
-%build
-%configure
+%setup -q
-make %{?_smp_mflags} LDFLAGS="-s" CXXFLAGS="$RPM_OPT_FLAGS"
+%build
+%configure \
+ --with-pkg-config \
+ --disable-static \
+
+%{__make} %{?_smp_mflags}
%install
-
-%makeinstall
-rm -rf %{buildroot}/%{_infodir}
+%{__rm} -rf %{buildroot}
+%{__make} DESTDIR=%{buildroot} INSTALL="install -p" install
+%{__rm} %{buildroot}%{_libdir}/*.la
+%{__rm} -rf %{buildroot}/%{_infodir}
%clean
rm -rf %{buildroot}
-%files -n %{_libname}
-%defattr(-,root,root,0755)
+%files
+%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README COPYING.addendum
%{_libdir}/*.so.*
-%files -n %{_devname}
-%defattr(-,root,root,0755)
+%files devel
+%defattr(-,root,root,-)
%{_libdir}/*.a
%{_libdir}/*.so
%{_libdir}/*.la
@@ -79,9 +76,9 @@
%dir %{_includedir}/ccrtp
%{_includedir}/ccrtp/*.h
-%post -n %{_libname} -p /sbin/ldconfig
+%post -p /sbin/ldconfig
-%postun -n %{_libname} -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
%changelog
* Thu Jan 06 2011 - Werner Dittmann <werner.dittmann@t-online.de>
diff --git a/jni/libccrtp/sources/ccrtp.spec.cmake b/jni/libccrtp/sources/ccrtp.spec.cmake
index eae5e2d..75ffbd9 100644
--- a/jni/libccrtp/sources/ccrtp.spec.cmake
+++ b/jni/libccrtp/sources/ccrtp.spec.cmake
@@ -1,19 +1,28 @@
+# Copyright (c) 2014 David Sugar, Tycho Softworks.
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
%{!?release: %define release 0}
%{!?version: %define version @VERSION@}
-%define _libname libccrtp2
-%define _devname libccrtp-devel
+%define libname libccrtp2
Summary: A Common C++ Class Framework for RTP Packets
Name: libccrtp
-Version: %{version}
-Release: %{release}%{?dist}
+Version: @VERSION@
+Release: 0
License: LGPL v2 or later
Group: Development/Libraries/C and C++
URL: http://www.gnu.org/software/commoncpp/commoncpp.html
Source0: http://www.gnutelephony.org/dist/tarballs/ccrtp-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: ucommon-devel >= 5.0.0
+BuildRequires: ucommon-devel >= 6.0.0
BuildRequires: pkgconfig libstdc++-devel libgcrypt-devel gcc-c++ cmake
%define srcdirname %{name}-%{version}
@@ -28,14 +37,14 @@
automatically, supports different threading models and is generic as
for underlying network and transport protocols.
-%package -n %{_devname}
+%package devel
Group: Development/Libraries/C and C++
Summary: Headers and static link library for ccrtp
-Requires: %{name} = %{version}-%{release}
-Requires: ucommon-devel >= 5.0.0
+Requires: %{libname} = %{version}-%{release}
+Requires: ucommon-devel >= 6.0.0
Requires: libgcrypt-devel
-%description -n %{_devname}
+%description devel
This package provides the header files, link libraries, and
documentation for building applications that use GNU ccrtp
@@ -63,22 +72,22 @@
%clean
%{__rm} -rf %{buildroot}
-%files
-%defattr(-,root,root,0755)
+%files -n %libname
+%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README COPYING.addendum
%{_libdir}/*.so.*
-%files -n %{_devname}
-%defattr(-,root,root,0755)
+%files devel
+%defattr(-,root,root,-)
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
%dir %{_includedir}/ccrtp
%{_includedir}/ccrtp/*.h
%{_infodir}/ccrtp.info*
-%post -p /sbin/ldconfig
+%post -n %libname -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%postun -n %libname -p /sbin/ldconfig
%post devel
%install_info --info-dir=%{_infodir} %{_infodir}/ccrtp.info.gz
diff --git a/jni/libccrtp/sources/ccrtp.spec.in b/jni/libccrtp/sources/ccrtp.spec.in
index 9e4fdb7..a4b77f7 100644
--- a/jni/libccrtp/sources/ccrtp.spec.in
+++ b/jni/libccrtp/sources/ccrtp.spec.in
@@ -1,26 +1,29 @@
-%{!?release: %define release 0}
-%{!?version: %define version @VERSION@}
-
-%define _libname libccrtp2
-%define _devname libccrtp-devel
+# Copyright (c) 2014 David Sugar, Tycho Softworks.
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
Summary: A Common C++ Class Framework for RTP Packets
-Name: libccrtp
-Version: %{version}
-Release: %{release}%{?dist}
+Name: ccrtp
+Version: @VERSION@
+Release: 0%{?dist}
License: LGPL v2 or later
-Group: Development/Libraries/C and C++
+Group: System/Library
URL: http://www.gnu.org/software/commoncpp/commoncpp.html
Source0: ccrtp-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: ucommon >= 5.0.0
+BuildRequires: ucommon-devel >= 6.0.0
BuildRequires: pkgconfig
-BuildRequires: libstdc++-devel
BuildRequires: libgcrypt-devel
BuildRequires: gcc-c++
%description
-ccRTP is a generic, extensible and efficient C++ framework for
+GNU ccRTP is a generic, extensible and efficient C++ framework for
developing applications based on the Real-Time Transport Protocol
(RTP) from the IETF. It is based on Common C++ and provides a full
RTP/RTCP stack for sending and receiving of realtime data by the use
@@ -29,49 +32,43 @@
automatically, supports different threading models and is generic as
for underlying network and transport protocols.
-%package -n %{_libname}
-Group: Development/Libraries/C and C++
-Summary: Runtime library for GNU RTP Stack
-Provides: %{name} = %{version}-%{release}
-
-%package -n %{_devname}
+%package devel
Group: Development/Libraries/C and C++
Summary: Headers and static link library for ccrtp
-Requires: %{_libname} = %{version}
-Requires: ucommon-devel >= 5.0.0
+Requires: %{name} = %{version}
+Requires: ucommon-devel >= 6.0.0
Requires: libgcrypt-devel
-Provides: %{name}-devel = %{version}-%{release}
-%description -n %{_libname}
-This package contains the runtime library needed by applications that use
-the GNU RTP stack.
-
-%description -n %{_devname}
+%description devel
This package provides the header files, link libraries, and
documentation for building applications that use GNU ccrtp.
%prep
-%setup
-%build
-%configure
+%setup -q
-make %{?_smp_mflags} LDFLAGS="-s" CXXFLAGS="$RPM_OPT_FLAGS"
+%build
+%configure \
+ --with-pkg-config \
+ --disable-static \
+
+%{__make} %{?_smp_mflags}
%install
-
-%makeinstall
-rm -rf %{buildroot}/%{_infodir}
+%{__rm} -rf %{buildroot}
+%{__make} DESTDIR=%{buildroot} INSTALL="install -p" install
+%{__rm} %{buildroot}%{_libdir}/*.la
+%{__rm} -rf %{buildroot}/%{_infodir}
%clean
rm -rf %{buildroot}
-%files -n %{_libname}
-%defattr(-,root,root,0755)
+%files
+%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README COPYING.addendum
%{_libdir}/*.so.*
-%files -n %{_devname}
-%defattr(-,root,root,0755)
+%files devel
+%defattr(-,root,root,-)
%{_libdir}/*.a
%{_libdir}/*.so
%{_libdir}/*.la
@@ -79,9 +76,9 @@
%dir %{_includedir}/ccrtp
%{_includedir}/ccrtp/*.h
-%post -n %{_libname} -p /sbin/ldconfig
+%post -p /sbin/ldconfig
-%postun -n %{_libname} -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
%changelog
* Thu Jan 06 2011 - Werner Dittmann <werner.dittmann@t-online.de>
diff --git a/jni/libccrtp/sources/config.log b/jni/libccrtp/sources/config.log
index d41cf77..af4d890 100644
--- a/jni/libccrtp/sources/config.log
+++ b/jni/libccrtp/sources/config.log
@@ -1,7 +1,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by ccrtp configure 2.0.7, which was
+It was created by ccrtp configure 2.0.8, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ ./configure
@@ -12,9 +12,9 @@
hostname = pcal
uname -m = x86_64
-uname -r = 3.13.4-200.fc20.x86_64
+uname -r = 3.13.5-202.fc20.x86_64
uname -s = Linux
-uname -v = #1 SMP Thu Feb 20 23:00:47 UTC 2014
+uname -v = #1 SMP Mon Mar 3 19:08:00 UTC 2014
/usr/bin/uname -p = x86_64
/bin/uname -X = unknown
@@ -141,8 +141,8 @@
| /* confdefs.h */
| #define PACKAGE_NAME "ccrtp"
| #define PACKAGE_TARNAME "ccrtp"
-| #define PACKAGE_VERSION "2.0.7"
-| #define PACKAGE_STRING "ccrtp 2.0.7"
+| #define PACKAGE_VERSION "2.0.8"
+| #define PACKAGE_STRING "ccrtp 2.0.8"
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE_URL ""
| /* end confdefs.h. */
@@ -160,8 +160,8 @@
| /* confdefs.h */
| #define PACKAGE_NAME "ccrtp"
| #define PACKAGE_TARNAME "ccrtp"
-| #define PACKAGE_VERSION "2.0.7"
-| #define PACKAGE_STRING "ccrtp 2.0.7"
+| #define PACKAGE_VERSION "2.0.8"
+| #define PACKAGE_STRING "ccrtp 2.0.8"
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE_URL ""
| /* end confdefs.h. */
@@ -217,8 +217,8 @@
| /* confdefs.h */
| #define PACKAGE_NAME "ccrtp"
| #define PACKAGE_TARNAME "ccrtp"
-| #define PACKAGE_VERSION "2.0.7"
-| #define PACKAGE_STRING "ccrtp 2.0.7"
+| #define PACKAGE_VERSION "2.0.8"
+| #define PACKAGE_STRING "ccrtp 2.0.8"
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE_URL ""
| /* end confdefs.h. */
@@ -236,8 +236,8 @@
| /* confdefs.h */
| #define PACKAGE_NAME "ccrtp"
| #define PACKAGE_TARNAME "ccrtp"
-| #define PACKAGE_VERSION "2.0.7"
-| #define PACKAGE_STRING "ccrtp 2.0.7"
+| #define PACKAGE_VERSION "2.0.8"
+| #define PACKAGE_STRING "ccrtp 2.0.8"
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE_URL ""
| /* end confdefs.h. */
@@ -461,8 +461,8 @@
| /* confdefs.h */
| #define PACKAGE_NAME "ccrtp"
| #define PACKAGE_TARNAME "ccrtp"
-| #define PACKAGE_VERSION "2.0.7"
-| #define PACKAGE_STRING "ccrtp 2.0.7"
+| #define PACKAGE_VERSION "2.0.8"
+| #define PACKAGE_STRING "ccrtp 2.0.8"
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE_URL ""
| #define STDC_HEADERS 1
@@ -584,7 +584,7 @@
## Running config.status. ##
## ---------------------- ##
-This file was extended by ccrtp config.status 2.0.7, which was
+This file was extended by ccrtp config.status 2.0.8, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES =
@@ -800,12 +800,12 @@
LIPO=''
LN_S='ln -s'
LTLIBOBJS=''
-LT_CCXX_VERSION='-version-info 2:4:0'
+LT_CCXX_VERSION='-version-info 2:5:0'
LT_MAJOR='2'
LT_MINOR='0'
LT_RELEASE=''
LT_SUBVER='2.0'
-LT_VERSION='2:4:0'
+LT_VERSION='2:5:0'
MAINT='#'
MAINTAINER_MODE_FALSE=''
MAINTAINER_MODE_TRUE='#'
@@ -821,10 +821,10 @@
PACKAGE='ccrtp'
PACKAGE_BUGREPORT=''
PACKAGE_NAME='ccrtp'
-PACKAGE_STRING='ccrtp 2.0.7'
+PACKAGE_STRING='ccrtp 2.0.8'
PACKAGE_TARNAME='ccrtp'
PACKAGE_URL=''
-PACKAGE_VERSION='2.0.7'
+PACKAGE_VERSION='2.0.8'
PATH_SEPARATOR=':'
PKG_CONFIG='/usr/bin/pkg-config'
PKG_CONFIG_LIBDIR=''
@@ -838,7 +838,7 @@
SRTP_OPENSSL_FALSE=''
SRTP_OPENSSL_TRUE='#'
STRIP='strip'
-VERSION='2.0.7'
+VERSION='2.0.8'
WARN_FLAGS='-fno-strict-aliasing -Wall -ansi -pedantic'
ac_ct_AR='ar'
ac_ct_CC='gcc'
@@ -904,8 +904,8 @@
/* confdefs.h */
#define PACKAGE_NAME "ccrtp"
#define PACKAGE_TARNAME "ccrtp"
-#define PACKAGE_VERSION "2.0.7"
-#define PACKAGE_STRING "ccrtp 2.0.7"
+#define PACKAGE_VERSION "2.0.8"
+#define PACKAGE_STRING "ccrtp 2.0.8"
#define PACKAGE_BUGREPORT ""
#define PACKAGE_URL ""
#define STDC_HEADERS 1
@@ -921,7 +921,7 @@
#define HAVE_DLFCN_H 1
#define LT_OBJDIR ".libs/"
#define PACKAGE "ccrtp"
-#define VERSION "2.0.7"
+#define VERSION "2.0.8"
#define restrict __restrict
#define SRTP_SUPPORT /**/
#define HAVE_GCRYPT_H 1
diff --git a/jni/libccrtp/sources/config.status b/jni/libccrtp/sources/config.status
index e218915..5e25d4b 100755
--- a/jni/libccrtp/sources/config.status
+++ b/jni/libccrtp/sources/config.status
@@ -380,7 +380,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by ccrtp $as_me 2.0.7, which was
+This file was extended by ccrtp $as_me 2.0.8, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -429,7 +429,7 @@
ac_cs_config=""
ac_cs_version="\
-ccrtp config.status 2.0.7
+ccrtp config.status 2.0.8
configured by ./configure, generated by GNU Autoconf 2.69,
with options \"$ac_cs_config\"
@@ -785,7 +785,7 @@
PACKAGE='ccrtp'
- VERSION='2.0.7'
+ VERSION='2.0.8'
TIMESTAMP=''
RM='rm -f'
ofile='libtool'
@@ -890,7 +890,7 @@
S["DOXY_FALSE"]="#"
S["DOXY_TRUE"]=""
S["DOXYGEN"]="/usr/bin/doxygen"
-S["LT_VERSION"]="2:4:0"
+S["LT_VERSION"]="2:5:0"
S["KDOC_DIR"]="$(top_srcdir)/doc"
S["WARN_FLAGS"]="-fno-strict-aliasing -Wall -ansi -pedantic"
S["GNULIBS"]="-lcommoncpp -lucommon -lrt -ldl -lpthread -lgcrypt -ldl -lgpg-error "
@@ -903,7 +903,7 @@
S["MAINT"]="#"
S["MAINTAINER_MODE_FALSE"]=""
S["MAINTAINER_MODE_TRUE"]="#"
-S["LT_CCXX_VERSION"]="-version-info 2:4:0"
+S["LT_CCXX_VERSION"]="-version-info 2:5:0"
S["LT_MINOR"]="0"
S["LT_MAJOR"]="2"
S["LT_SUBVER"]="2.0"
@@ -946,7 +946,7 @@
S["AUTOMAKE"]="${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing automake-1.13"
S["AUTOCONF"]="${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing autoconf"
S["ACLOCAL"]="${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing aclocal-1.13"
-S["VERSION"]="2.0.7"
+S["VERSION"]="2.0.8"
S["PACKAGE"]="ccrtp"
S["CYGPATH_W"]="echo"
S["am__isrc"]=""
@@ -1033,8 +1033,8 @@
S["exec_prefix"]="${prefix}"
S["PACKAGE_URL"]=""
S["PACKAGE_BUGREPORT"]=""
-S["PACKAGE_STRING"]="ccrtp 2.0.7"
-S["PACKAGE_VERSION"]="2.0.7"
+S["PACKAGE_STRING"]="ccrtp 2.0.8"
+S["PACKAGE_VERSION"]="2.0.8"
S["PACKAGE_TARNAME"]="ccrtp"
S["PACKAGE_NAME"]="ccrtp"
S["PATH_SEPARATOR"]=":"
@@ -1082,8 +1082,8 @@
BEGIN {
D["PACKAGE_NAME"]=" \"ccrtp\""
D["PACKAGE_TARNAME"]=" \"ccrtp\""
-D["PACKAGE_VERSION"]=" \"2.0.7\""
-D["PACKAGE_STRING"]=" \"ccrtp 2.0.7\""
+D["PACKAGE_VERSION"]=" \"2.0.8\""
+D["PACKAGE_STRING"]=" \"ccrtp 2.0.8\""
D["PACKAGE_BUGREPORT"]=" \"\""
D["PACKAGE_URL"]=" \"\""
D["STDC_HEADERS"]=" 1"
@@ -1099,7 +1099,7 @@
D["HAVE_DLFCN_H"]=" 1"
D["LT_OBJDIR"]=" \".libs/\""
D["PACKAGE"]=" \"ccrtp\""
-D["VERSION"]=" \"2.0.7\""
+D["VERSION"]=" \"2.0.8\""
D["restrict"]=" __restrict"
D["SRTP_SUPPORT"]=" /**/"
D["HAVE_GCRYPT_H"]=" 1"
diff --git a/jni/libccrtp/sources/configure b/jni/libccrtp/sources/configure
index a506147..7215a18 100755
--- a/jni/libccrtp/sources/configure
+++ b/jni/libccrtp/sources/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ccrtp 2.0.7.
+# Generated by GNU Autoconf 2.69 for ccrtp 2.0.8.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@
# Identity of this package.
PACKAGE_NAME='ccrtp'
PACKAGE_TARNAME='ccrtp'
-PACKAGE_VERSION='2.0.7'
-PACKAGE_STRING='ccrtp 2.0.7'
+PACKAGE_VERSION='2.0.8'
+PACKAGE_STRING='ccrtp 2.0.8'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1362,7 +1362,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures ccrtp 2.0.7 to adapt to many kinds of systems.
+\`configure' configures ccrtp 2.0.8 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1433,7 +1433,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of ccrtp 2.0.7:";;
+ short | recursive ) echo "Configuration of ccrtp 2.0.8:";;
esac
cat <<\_ACEOF
@@ -1559,7 +1559,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-ccrtp configure 2.0.7
+ccrtp configure 2.0.8
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2045,7 +2045,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by ccrtp $as_me 2.0.7, which was
+It was created by ccrtp $as_me 2.0.8, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2395,7 +2395,7 @@
-LT_VERSION="2:4:0"
+LT_VERSION="2:5:0"
REQUIRES="5.0.0"
ac_aux_dir=
@@ -15542,7 +15542,7 @@
# Define the identity of the package.
PACKAGE='ccrtp'
- VERSION='2.0.7'
+ VERSION='2.0.8'
cat >>confdefs.h <<_ACEOF
@@ -17320,7 +17320,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by ccrtp $as_me 2.0.7, which was
+This file was extended by ccrtp $as_me 2.0.8, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -17386,7 +17386,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-ccrtp config.status 2.0.7
+ccrtp config.status 2.0.8
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/jni/libccrtp/sources/configure.ac b/jni/libccrtp/sources/configure.ac
index 261a1c9..8678f63 100644
--- a/jni/libccrtp/sources/configure.ac
+++ b/jni/libccrtp/sources/configure.ac
@@ -9,10 +9,10 @@
# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-AC_INIT([ccrtp], [2.0.7])
+AC_INIT([ccrtp], [2.0.8])
AC_CONFIG_SRCDIR([src/ccrtp/rtp.h])
-LT_VERSION="2:4:0"
+LT_VERSION="2:5:0"
REQUIRES="5.0.0"
AC_CONFIG_AUX_DIR(autoconf)
diff --git a/jni/libccrtp/sources/demo/Makefile b/jni/libccrtp/sources/demo/Makefile
index 13e791c..0aa0a78 100644
--- a/jni/libccrtp/sources/demo/Makefile
+++ b/jni/libccrtp/sources/demo/Makefile
@@ -281,12 +281,12 @@
LIPO =
LN_S = ln -s
LTLIBOBJS =
-LT_CCXX_VERSION = -version-info 2:4:0
+LT_CCXX_VERSION = -version-info 2:5:0
LT_MAJOR = 2
LT_MINOR = 0
LT_RELEASE =
LT_SUBVER = 2.0
-LT_VERSION = -version-info 2:4:0
+LT_VERSION = -version-info 2:5:0
MAINT = #
MAKEINFO = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing makeinfo
MANIFEST_TOOL = :
@@ -300,10 +300,10 @@
PACKAGE = ccrtp
PACKAGE_BUGREPORT =
PACKAGE_NAME = ccrtp
-PACKAGE_STRING = ccrtp 2.0.7
+PACKAGE_STRING = ccrtp 2.0.8
PACKAGE_TARNAME = ccrtp
PACKAGE_URL =
-PACKAGE_VERSION = 2.0.7
+PACKAGE_VERSION = 2.0.8
PATH_SEPARATOR = :
PKG_CONFIG = /usr/bin/pkg-config
PKG_CONFIG_LIBDIR =
@@ -313,7 +313,7 @@
SET_MAKE =
SHELL = /bin/sh
STRIP = strip
-VERSION = 2.0.7
+VERSION = 2.0.8
WARN_FLAGS = -fno-strict-aliasing -Wall -ansi -pedantic
abs_builddir = /home/lisional/git/sflphone-android/jni/libccrtp/sources/demo
abs_srcdir = /home/lisional/git/sflphone-android/jni/libccrtp/sources/demo
diff --git a/jni/libccrtp/sources/demo/audiorx.cpp b/jni/libccrtp/sources/demo/audiorx.cpp
index 0eb1ae0..9013b02 100644
--- a/jni/libccrtp/sources/demo/audiorx.cpp
+++ b/jni/libccrtp/sources/demo/audiorx.cpp
@@ -41,9 +41,11 @@
* @class ccRTP_AudioReceiver
* This is the class that will do almost everything.
*/
-class ccRTP_AudioReceiver: public Thread, public TimerPort
+class ccRTP_AudioReceiver: public Thread
{
private:
+ // Used to time operations
+ TimerPort timerport;
// This is the file we will write to (/dev/audio)
int audiooutput;
// The aforementioned file will be transmitted through this socket
@@ -115,7 +117,7 @@
cout << "Waiting for audio packets..." << endl;
// This will be useful for periodic execution.
- TimerPort::setTimer(PERIOD);
+ timerport.setTimer(PERIOD);
// This is the main loop, where packets are sent and receipt.
socket->setPayloadFormat(StaticPayloadFormat(sptPCMU));
@@ -145,8 +147,8 @@
cout << "." << flush;
// Let's wait for the next cycle
- Thread::sleep(TimerPort::getTimer());
- TimerPort::incTimer(PERIOD);
+ Thread::sleep(timerport.getTimer());
+ timerport.incTimer(PERIOD);
}
} // end of run
diff --git a/jni/libccrtp/sources/demo/audiotx.cpp b/jni/libccrtp/sources/demo/audiotx.cpp
index 211954e..3c2c09a 100644
--- a/jni/libccrtp/sources/demo/audiotx.cpp
+++ b/jni/libccrtp/sources/demo/audiotx.cpp
@@ -46,9 +46,11 @@
* @class ccRTP_AudioTransmitter
* This is the class that will do almost everything.
*/
-class ccRTP_AudioTransmitter: public Thread, public TimerPort
+class ccRTP_AudioTransmitter: public Thread
{
private:
+ // Used to time operations
+ TimerPort timerport;
// This is the descriptor of the file we will read from
// (commonly, /dev/audio or a .au file)
int audioinput;
@@ -140,7 +142,7 @@
int count=PACKET_SIZE;
// This will be useful for periodic execution
- TimerPort::setTimer(PERIOD);
+ timerport.setTimer(PERIOD);
// This is the main loop, where packets are transmitted.
for( int i = 0 ; (!sendingfile || count > 0) ; i++ ) {
@@ -155,8 +157,8 @@
cout << "." << flush;
// Let's wait for the next cycle
- Thread::sleep(TimerPort::getTimer());
- TimerPort::incTimer(PERIOD);
+ Thread::sleep(timerport.getTimer());
+ timerport.incTimer(PERIOD);
}
cout << endl << "I have got no more data to send. " <<endl;
}
diff --git a/jni/libccrtp/sources/demo/ccrtptest.cpp b/jni/libccrtp/sources/demo/ccrtptest.cpp
index e544ef9..6a9a85a 100644
--- a/jni/libccrtp/sources/demo/ccrtptest.cpp
+++ b/jni/libccrtp/sources/demo/ccrtptest.cpp
@@ -226,20 +226,25 @@
bool send = false;
bool recv = false;
- RecvPacketTransmissionTest *rx;
- SendPacketTransmissionTest *tx;
-
// accept as parameter if must run as --send or --recv
+ for (int i = 1; i < argc; ++i) {
+ send |= !strcmp(argv[i], "-s") or !strcmp(argv[i], "--send");
+ if ( send )
+ break;
+ recv |= !strcmp(argv[i], "-r") or !strcmp(argv[i], "--recv");
+ if ( recv )
+ break;
+ }
// run several tests in parallel threads
if ( send ) {
- tx = new SendPacketTransmissionTest();
- tx->start();
- tx->join();
+ SendPacketTransmissionTest tx;
+ tx.start();
+ tx.join();
} else if ( recv ) {
- rx = new RecvPacketTransmissionTest();
- rx->start();
- rx->join();
+ RecvPacketTransmissionTest rx;
+ rx.start();
+ rx.join();
} else {
MiscTest m;
m.start();
diff --git a/jni/libccrtp/sources/directive b/jni/libccrtp/sources/directive
index 2a678dc..ba3de74 100644
--- a/jni/libccrtp/sources/directive
+++ b/jni/libccrtp/sources/directive
@@ -1,3 +1,3 @@
version: 1.1
directory: ccrtp
-filename: ccrtp-2.0.7.tar.gz
+filename: ccrtp-2.0.8.tar.gz
diff --git a/jni/libccrtp/sources/doc/Makefile b/jni/libccrtp/sources/doc/Makefile
index d7d5999..3cca11b 100644
--- a/jni/libccrtp/sources/doc/Makefile
+++ b/jni/libccrtp/sources/doc/Makefile
@@ -251,12 +251,12 @@
LIPO =
LN_S = ln -s
LTLIBOBJS =
-LT_CCXX_VERSION = -version-info 2:4:0
+LT_CCXX_VERSION = -version-info 2:5:0
LT_MAJOR = 2
LT_MINOR = 0
LT_RELEASE =
LT_SUBVER = 2.0
-LT_VERSION = 2:4:0
+LT_VERSION = 2:5:0
MAINT = #
MAKEINFO = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing makeinfo
MANIFEST_TOOL = :
@@ -270,10 +270,10 @@
PACKAGE = ccrtp
PACKAGE_BUGREPORT =
PACKAGE_NAME = ccrtp
-PACKAGE_STRING = ccrtp 2.0.7
+PACKAGE_STRING = ccrtp 2.0.8
PACKAGE_TARNAME = ccrtp
PACKAGE_URL =
-PACKAGE_VERSION = 2.0.7
+PACKAGE_VERSION = 2.0.8
PATH_SEPARATOR = :
PKG_CONFIG = /usr/bin/pkg-config
PKG_CONFIG_LIBDIR =
@@ -283,7 +283,7 @@
SET_MAKE =
SHELL = /bin/sh
STRIP = strip
-VERSION = 2.0.7
+VERSION = 2.0.8
WARN_FLAGS = -fno-strict-aliasing -Wall -ansi -pedantic
abs_builddir = /home/lisional/git/sflphone-android/jni/libccrtp/sources/doc
abs_srcdir = /home/lisional/git/sflphone-android/jni/libccrtp/sources/doc
diff --git a/jni/libccrtp/sources/libccrtp.spec b/jni/libccrtp/sources/libccrtp.spec
index 757573a..c886e6c 100644
--- a/jni/libccrtp/sources/libccrtp.spec
+++ b/jni/libccrtp/sources/libccrtp.spec
@@ -26,7 +26,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
AutoReqProv: on
Summary: A Common C++ Class Framework for RTP Packets
-Version: 2.0.7
+Version: 2.0.8
Release: 2
Source0: ccrtp-%{version}.tar.bz2
Source1: rpmlintrc
diff --git a/jni/libccrtp/sources/libtool b/jni/libccrtp/sources/libtool
index 518dbb0..2401a94 100755
--- a/jni/libccrtp/sources/libtool
+++ b/jni/libccrtp/sources/libtool
@@ -1,7 +1,7 @@
#! /bin/sh
# libtool - Provide generalized library-building support services.
-# Generated automatically by config.status (ccrtp) 2.0.7
+# Generated automatically by config.status (ccrtp) 2.0.8
# Libtool was configured on host pcal:
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
diff --git a/jni/libccrtp/sources/m4/Makefile b/jni/libccrtp/sources/m4/Makefile
index 3e5957a..c26a686 100644
--- a/jni/libccrtp/sources/m4/Makefile
+++ b/jni/libccrtp/sources/m4/Makefile
@@ -197,12 +197,12 @@
LIPO =
LN_S = ln -s
LTLIBOBJS =
-LT_CCXX_VERSION = -version-info 2:4:0
+LT_CCXX_VERSION = -version-info 2:5:0
LT_MAJOR = 2
LT_MINOR = 0
LT_RELEASE =
LT_SUBVER = 2.0
-LT_VERSION = 2:4:0
+LT_VERSION = 2:5:0
MAINT = #
MAKEINFO = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing makeinfo
MANIFEST_TOOL = :
@@ -216,10 +216,10 @@
PACKAGE = ccrtp
PACKAGE_BUGREPORT =
PACKAGE_NAME = ccrtp
-PACKAGE_STRING = ccrtp 2.0.7
+PACKAGE_STRING = ccrtp 2.0.8
PACKAGE_TARNAME = ccrtp
PACKAGE_URL =
-PACKAGE_VERSION = 2.0.7
+PACKAGE_VERSION = 2.0.8
PATH_SEPARATOR = :
PKG_CONFIG = /usr/bin/pkg-config
PKG_CONFIG_LIBDIR =
@@ -229,7 +229,7 @@
SET_MAKE =
SHELL = /bin/sh
STRIP = strip
-VERSION = 2.0.7
+VERSION = 2.0.8
WARN_FLAGS = -fno-strict-aliasing -Wall -ansi -pedantic
abs_builddir = /home/lisional/git/sflphone-android/jni/libccrtp/sources/m4
abs_srcdir = /home/lisional/git/sflphone-android/jni/libccrtp/sources/m4
diff --git a/jni/libccrtp/sources/phone/Makefile b/jni/libccrtp/sources/phone/Makefile
index 9767eff..2a56674 100644
--- a/jni/libccrtp/sources/phone/Makefile
+++ b/jni/libccrtp/sources/phone/Makefile
@@ -259,12 +259,12 @@
LIPO =
LN_S = ln -s
LTLIBOBJS =
-LT_CCXX_VERSION = -version-info 2:4:0
+LT_CCXX_VERSION = -version-info 2:5:0
LT_MAJOR = 2
LT_MINOR = 0
LT_RELEASE =
LT_SUBVER = 2.0
-LT_VERSION = -version-info 2:4:0
+LT_VERSION = -version-info 2:5:0
MAINT = #
MAKEINFO = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing makeinfo
MANIFEST_TOOL = :
@@ -278,10 +278,10 @@
PACKAGE = ccrtp
PACKAGE_BUGREPORT =
PACKAGE_NAME = ccrtp
-PACKAGE_STRING = ccrtp 2.0.7
+PACKAGE_STRING = ccrtp 2.0.8
PACKAGE_TARNAME = ccrtp
PACKAGE_URL =
-PACKAGE_VERSION = 2.0.7
+PACKAGE_VERSION = 2.0.8
PATH_SEPARATOR = :
PKG_CONFIG = /usr/bin/pkg-config
PKG_CONFIG_LIBDIR =
@@ -291,7 +291,7 @@
SET_MAKE =
SHELL = /bin/sh
STRIP = strip
-VERSION = 2.0.7
+VERSION = 2.0.8
WARN_FLAGS = -fno-strict-aliasing -Wall -ansi -pedantic
abs_builddir = /home/lisional/git/sflphone-android/jni/libccrtp/sources/phone
abs_srcdir = /home/lisional/git/sflphone-android/jni/libccrtp/sources/phone
diff --git a/jni/libccrtp/sources/src/Makefile b/jni/libccrtp/sources/src/Makefile
index 5e9cc6d..4edf00a 100644
--- a/jni/libccrtp/sources/src/Makefile
+++ b/jni/libccrtp/sources/src/Makefile
@@ -338,12 +338,12 @@
LIPO =
LN_S = ln -s
LTLIBOBJS =
-LT_CCXX_VERSION = -version-info 2:4:0
+LT_CCXX_VERSION = -version-info 2:5:0
LT_MAJOR = 2
LT_MINOR = 0
LT_RELEASE =
LT_SUBVER = 2.0
-LT_VERSION = 2:4:0
+LT_VERSION = 2:5:0
MAINT = #
MAKEINFO = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing makeinfo
MANIFEST_TOOL = :
@@ -357,10 +357,10 @@
PACKAGE = ccrtp
PACKAGE_BUGREPORT =
PACKAGE_NAME = ccrtp
-PACKAGE_STRING = ccrtp 2.0.7
+PACKAGE_STRING = ccrtp 2.0.8
PACKAGE_TARNAME = ccrtp
PACKAGE_URL =
-PACKAGE_VERSION = 2.0.7
+PACKAGE_VERSION = 2.0.8
PATH_SEPARATOR = :
PKG_CONFIG = /usr/bin/pkg-config
PKG_CONFIG_LIBDIR =
@@ -370,7 +370,7 @@
SET_MAKE =
SHELL = /bin/sh
STRIP = strip
-VERSION = 2.0.7
+VERSION = 2.0.8
WARN_FLAGS = -fno-strict-aliasing -Wall -ansi -pedantic
abs_builddir = /home/lisional/git/sflphone-android/jni/libccrtp/sources/src
abs_srcdir = /home/lisional/git/sflphone-android/jni/libccrtp/sources/src
diff --git a/jni/libccrtp/sources/src/ccrtp/Makefile b/jni/libccrtp/sources/src/ccrtp/Makefile
index c0a3c5f..8549eae 100644
--- a/jni/libccrtp/sources/src/ccrtp/Makefile
+++ b/jni/libccrtp/sources/src/ccrtp/Makefile
@@ -229,12 +229,12 @@
LIPO =
LN_S = ln -s
LTLIBOBJS =
-LT_CCXX_VERSION = -version-info 2:4:0
+LT_CCXX_VERSION = -version-info 2:5:0
LT_MAJOR = 2
LT_MINOR = 0
LT_RELEASE =
LT_SUBVER = 2.0
-LT_VERSION = 2:4:0
+LT_VERSION = 2:5:0
MAINT = #
MAKEINFO = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing makeinfo
MANIFEST_TOOL = :
@@ -248,10 +248,10 @@
PACKAGE = ccrtp
PACKAGE_BUGREPORT =
PACKAGE_NAME = ccrtp
-PACKAGE_STRING = ccrtp 2.0.7
+PACKAGE_STRING = ccrtp 2.0.8
PACKAGE_TARNAME = ccrtp
PACKAGE_URL =
-PACKAGE_VERSION = 2.0.7
+PACKAGE_VERSION = 2.0.8
PATH_SEPARATOR = :
PKG_CONFIG = /usr/bin/pkg-config
PKG_CONFIG_LIBDIR =
@@ -261,7 +261,7 @@
SET_MAKE =
SHELL = /bin/sh
STRIP = strip
-VERSION = 2.0.7
+VERSION = 2.0.8
WARN_FLAGS = -fno-strict-aliasing -Wall -ansi -pedantic
abs_builddir = /home/lisional/git/sflphone-android/jni/libccrtp/sources/src/ccrtp
abs_srcdir = /home/lisional/git/sflphone-android/jni/libccrtp/sources/src/ccrtp
diff --git a/jni/libccrtp/sources/src/ccrtp/crypto/Makefile b/jni/libccrtp/sources/src/ccrtp/crypto/Makefile
index db21f7d..144808d 100644
--- a/jni/libccrtp/sources/src/ccrtp/crypto/Makefile
+++ b/jni/libccrtp/sources/src/ccrtp/crypto/Makefile
@@ -200,12 +200,12 @@
LIPO =
LN_S = ln -s
LTLIBOBJS =
-LT_CCXX_VERSION = -version-info 2:4:0
+LT_CCXX_VERSION = -version-info 2:5:0
LT_MAJOR = 2
LT_MINOR = 0
LT_RELEASE =
LT_SUBVER = 2.0
-LT_VERSION = 2:4:0
+LT_VERSION = 2:5:0
MAINT = #
MAKEINFO = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing makeinfo
MANIFEST_TOOL = :
@@ -219,10 +219,10 @@
PACKAGE = ccrtp
PACKAGE_BUGREPORT =
PACKAGE_NAME = ccrtp
-PACKAGE_STRING = ccrtp 2.0.7
+PACKAGE_STRING = ccrtp 2.0.8
PACKAGE_TARNAME = ccrtp
PACKAGE_URL =
-PACKAGE_VERSION = 2.0.7
+PACKAGE_VERSION = 2.0.8
PATH_SEPARATOR = :
PKG_CONFIG = /usr/bin/pkg-config
PKG_CONFIG_LIBDIR =
@@ -232,7 +232,7 @@
SET_MAKE =
SHELL = /bin/sh
STRIP = strip
-VERSION = 2.0.7
+VERSION = 2.0.8
WARN_FLAGS = -fno-strict-aliasing -Wall -ansi -pedantic
abs_builddir = /home/lisional/git/sflphone-android/jni/libccrtp/sources/src/ccrtp/crypto
abs_srcdir = /home/lisional/git/sflphone-android/jni/libccrtp/sources/src/ccrtp/crypto
diff --git a/jni/libccrtp/sources/src/ccrtp/crypto/gcrypt/InitializeGcrypt.cpp b/jni/libccrtp/sources/src/ccrtp/crypto/gcrypt/InitializeGcrypt.cpp
index 78fad51..9f63418 100755
--- a/jni/libccrtp/sources/src/ccrtp/crypto/gcrypt/InitializeGcrypt.cpp
+++ b/jni/libccrtp/sources/src/ccrtp/crypto/gcrypt/InitializeGcrypt.cpp
@@ -22,6 +22,7 @@
#include <errno.h>
#include <gcrypt.h>
+#if GCRYPT_VERSION_NUMBER < 0x010600
/*
* The following macro was copied from gcrypt.h and modified to explicitly
* cast the pointer types to keep the compiler happy.
@@ -60,8 +61,6 @@
*
*/
-static int initialized = 0;
-
#ifdef __cplusplus
extern "C" {
#endif
@@ -70,13 +69,21 @@
}
#endif
+#else
+GCRY_THREAD_OPTION_PTHREAD_IMPL;
+#endif
+
+static int initialized = 0;
+
int initializeGcrypt ()
{
if (initialized) {
- return 1;
+ return 1;
}
+#if GCRYPT_VERSION_NUMBER < 0x010600
gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
+#endif
gcry_check_version(NULL);
gcry_control(GCRYCTL_DISABLE_SECMEM);
initialized = 1;
diff --git a/jni/libccrtp/sources/w32/Makefile b/jni/libccrtp/sources/w32/Makefile
index d8d9f78..b819613 100644
--- a/jni/libccrtp/sources/w32/Makefile
+++ b/jni/libccrtp/sources/w32/Makefile
@@ -177,12 +177,12 @@
LIPO =
LN_S = ln -s
LTLIBOBJS =
-LT_CCXX_VERSION = -version-info 2:4:0
+LT_CCXX_VERSION = -version-info 2:5:0
LT_MAJOR = 2
LT_MINOR = 0
LT_RELEASE =
LT_SUBVER = 2.0
-LT_VERSION = 2:4:0
+LT_VERSION = 2:5:0
MAINT = #
MAKEINFO = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing makeinfo
MANIFEST_TOOL = :
@@ -196,10 +196,10 @@
PACKAGE = ccrtp
PACKAGE_BUGREPORT =
PACKAGE_NAME = ccrtp
-PACKAGE_STRING = ccrtp 2.0.7
+PACKAGE_STRING = ccrtp 2.0.8
PACKAGE_TARNAME = ccrtp
PACKAGE_URL =
-PACKAGE_VERSION = 2.0.7
+PACKAGE_VERSION = 2.0.8
PATH_SEPARATOR = :
PKG_CONFIG = /usr/bin/pkg-config
PKG_CONFIG_LIBDIR =
@@ -209,7 +209,7 @@
SET_MAKE =
SHELL = /bin/sh
STRIP = strip
-VERSION = 2.0.7
+VERSION = 2.0.8
WARN_FLAGS = -fno-strict-aliasing -Wall -ansi -pedantic
abs_builddir = /home/lisional/git/sflphone-android/jni/libccrtp/sources/w32
abs_srcdir = /home/lisional/git/sflphone-android/jni/libccrtp/sources/w32