Djam/libzrtpcpp
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/libzrtpcpp.git synced 2025-02-23 09:52:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

New version 4.6.4

Browse source 
New library major 4
This commit is contained in:
Andrey Bondrov 2016-12-09 04:19:50 +10:00
parent 9a613912e0
commit 3a8b63c43c
4 changed files with 46 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.abf.yml
View file

@ -1,2 +1,2 @@
sources:
libzrtpcpp-2.3.4.tar.gz: 5c2f268519e83e288229acd2aa6d61137c32a8a9
libzrtpcpp-4.6.4.tar.gz: 3cad810561b54e775f2179539efbbb616542c45e

12
libzrtpcpp-4.4.0-no-warning.patch Normal file
View file

@ -0,0 +1,12 @@
diff -rupN ZRTPCPP-4.4.0/zrtp/libzrtpcpp/ZrtpCWrapper.h ZRTPCPP-4.4.0-new/zrtp/libzrtpcpp/ZrtpCWrapper.h
--- ZRTPCPP-4.4.0/zrtp/libzrtpcpp/ZrtpCWrapper.h 2015-03-29 12:38:44.000000000 +0200
+++ ZRTPCPP-4.4.0-new/zrtp/libzrtpcpp/ZrtpCWrapper.h 2015-08-05 08:09:30.159277364 +0200
@@ -982,7 +982,7 @@ extern "C"
*/
const char* zrtp_getSasType(ZrtpContext* zrtpContext);
#ifdef __GNUC__
-#warning zrtp_getSasType(...) API changed - caller shall free() returned data
+/* warning zrtp_getSasType(...) API changed - caller shall free() returned data */
#endif
/**

21
libzrtpcpp-4.6.4_deprecated.patch Normal file
View file

@ -0,0 +1,21 @@
diff -rupN ZRTPCPP-4.6.4/clients/ccrtp/ZrtpQueue.h ZRTPCPP-4.6.4-new/clients/ccrtp/ZrtpQueue.h
--- ZRTPCPP-4.6.4/clients/ccrtp/ZrtpQueue.h 2016-11-10 19:28:11.000000000 +0100
+++ ZRTPCPP-4.6.4-new/clients/ccrtp/ZrtpQueue.h 2016-11-11 09:26:10.302426785 +0100
@@ -430,7 +430,7 @@ public:
*
* @see setMultiStrParams()
*/
- DEPRECATED std::string getMultiStrParams() {return getMultiStrParams(NULL); }
+ DEPRECATED_ZRTP std::string getMultiStrParams() {return getMultiStrParams(NULL); }
/**
* Set Multi-stream parameters.
@@ -450,7 +450,7 @@ public:
*
* @see getMultiStrParams()
*/
- DEPRECATED void setMultiStrParams(std::string parameters) { setMultiStrParams(parameters, NULL);}
+ DEPRECATED_ZRTP void setMultiStrParams(std::string parameters) { setMultiStrParams(parameters, NULL);}
/**
* Get Multi-stream parameters.

19
libzrtpcpp.spec
View file

@ -1,19 +1,19 @@
%define major 2
%define major 4
%define libname %mklibname zrtpcpp %{major}
%define devname %mklibname zrtpcpp -d
Summary: A ccrtp extension for zrtp/Zfone support
Name: libzrtpcpp
Version: 2.3.4
Release: 3
Version: 4.6.4
Release: 1
License: GPLv2+
Group: System/Libraries
Url: http://www.gnu.org/software/commoncpp/commoncpp.html
Source0: ftp://ftp.gnu.org/gnu/ccrtp/libzrtpcpp-%{version}.tar.gz
Source1: ftp://ftp.gnu.org/gnu/ccrtp/libzrtpcpp-%{version}.tar.gz.sig
Patch0: libzrtpcpp-4.4.0-no-warning.patch
Patch1: libzrtpcpp-4.6.4_deprecated.patch
BuildRequires: cmake
BuildRequires: stdc++-devel
BuildRequires: pkgconfig(libccext2)
BuildRequires: pkgconfig(libccrtp)
BuildRequires: pkgconfig(libgcrypt)
@ -53,17 +53,22 @@ building applications that use libzrtpcpp.
%files -n %{devname}
%doc AUTHORS COPYING
%dir %{_includedir}/libzrtpcpp
%dir %{_includedir}/libzrtpcpp/common
%{_includedir}/libzrtpcpp/*.h
%{_includedir}/libzrtpcpp/common/osSpecifics.h
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
#----------------------------------------------------------------------------
%prep
%setup -q
%setup -qn ZRTPCPP-%{version}
%patch0 -p1
%patch1 -p1
%build
%cmake
%cmake \
-DCCRTP:BOOL=ON
%make
%install