commit bdd1776c2a7a79ad4c16893aa930eedce82d01c7
Author: Jakub Bogusz <[email protected]>
Date: Sun Mar 2 18:53:32 2014 +0100
- updated to 0.23.0; now uses libzrtpcppcore >= 4
- updated i486 patch
ortp-i486.patch | 20 ++++++++++----------
ortp.spec | 19 ++++++++-----------
2 files changed, 18 insertions(+), 21 deletions(-)
---
diff --git a/ortp.spec b/ortp.spec
index a7d57a9..134846d 100644
--- a/ortp.spec
+++ b/ortp.spec
@@ -1,20 +1,17 @@
#
# Conditional build:
-%bcond_without zrtp # ZRTP (RFC 6189: Media Path Key Agreement for Unicast
Secure RTP) support; GPL v3
+%bcond_without zrtp # ZRTP (RFC 6189: Media Path Key Agreement for Unicast
Secure RTP) support
#
Summary: RTP/RTCP protocol library
Summary(pl.UTF-8): Biblioteka obsługująca protokół RTP/RTCP
Name: ortp
-Version: 0.22.0
-Release: 2
-%if %{with zrtp}
-License: GPL v3+
-%else
+Version: 0.23.0
+Release: 1
License: LGPL v2.1+
-%endif
Group: Libraries
-Source0:
http://download.savannah.nongnu.org/releases/linphone/ortp/sources/%{name}-%{version}.tar.gz
-# Source0-md5: 119357e1d904be0289e57c80e5ad90ba
+#Source0:
http://download.savannah.gnu.org/releases/linphone/ortp/sources/%{name}-%{version}.tar.gz
+Source0:
http://download.savannah.gnu.org/releases/linphone/ortp/%{name}-%{version}.tar.gz
+# Source0-md5: fb833cc7a66ec1a0c1b75016130e7e6d
Patch0: %{name}-i486.patch
Patch1: %{name}-libssl-not-required.patch
URL: http://www.linphone.org/eng/documentation/dev/ortp.html
@@ -22,7 +19,7 @@ BuildRequires: autoconf >= 2.50
BuildRequires: automake
BuildRequires: doxygen
BuildRequires: libtool >= 2:2.0
-%{?with_zrtp:BuildRequires: libzrtpcpp-devel >= 2.0.0}
+%{?with_zrtp:BuildRequires: libzrtpcpp-core-devel >= 4.0.0}
BuildRequires: openssl-devel
BuildRequires: pkgconfig
BuildRequires: srtp-devel
@@ -41,7 +38,7 @@ Summary: Header files to develop applications using ortp
Summary(pl.UTF-8): Pliki nagłówkowe do tworzenia aplikacji używających ortp
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-%{?with_zrtp:Requires: libzrtpcpp-devel >= 2.0.0}
+%{?with_zrtp:Requires: libzrtpcpp-core-devel >= 4.0.0}
Requires: openssl-devel
Requires: srtp-devel
diff --git a/ortp-i486.patch b/ortp-i486.patch
index 7629e87..6fc4a46 100644
--- a/ortp-i486.patch
+++ b/ortp-i486.patch
@@ -1,11 +1,11 @@
---- ortp-0.16.5/src/stun.c~ 2010-11-19 11:32:47.000000000 +0100
-+++ ortp-0.16.5/src/stun.c 2011-07-26 13:00:04.172190285 +0200
-@@ -1184,7 +1184,7 @@
- read(fd,&tick,sizeof(tick));
- closesocket(fd);
+--- ortp-0.23.0/src/stun.c.orig 2014-03-01 14:32:05.431008206 +0100
++++ ortp-0.23.0/src/stun.c 2014-03-01 14:33:23.847671582 +0100
+@@ -1234,7 +1234,7 @@
+ read(fd,&tick,sizeof(tick));
+ closesocket(fd);
}
--#elif defined(__GNUC__) && ( defined(__i686__) || defined(__i386__) )
-+#elif defined(__GNUC__) && ( defined(__i686__) || defined(__i386__) ||
defined(__pentium4__) || defined(__athlon__) )
- asm("rdtsc" : "=A" (tick));
- #elif defined(__GNUC__) && defined(__amd64__)
- asm("rdtsc" : "=A" (tick));
+-#elif defined(__GNUC__) && ( defined(__i686__) || defined(__i386__) ||
defined(__amd64__) )
++#elif defined(__GNUC__) && ( defined(__i686__) || defined(__i386__) ||
defined(__pentium4__) || defined(__athlon__) || defined(__amd64__) )
+ asm("rdtsc" : "=A" (tick));
+ #elif defined (__SUNPRO_CC) && defined( __sparc__ )
+ tick = gethrtime();
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ortp.git/commitdiff/bdd1776c2a7a79ad4c16893aa930eedce82d01c7
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
