rpm/ccrtp
SHA256
1
0
Fork 0
forked from pool/ccrtp
Code Pull Requests Activity

Accepting request 239656 from network:telephony

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/239656
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ccrtp?expand=0&rev=12
This commit is contained in:
Stephan Kulow 2014-07-13 12:06:12 +00:00 committed by Git OBS Bridge
commit 67d5eb58e4
8 changed files with 13 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
0001-build-properly-use-autotools.patch
View File

@ -1,122 +0,0 @@
From e060ed1f4ce7d54d092dee5dc02a90361e78392c Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Thu, 6 Jun 2013 00:23:09 +0200
X-Upstream-Status: submitted, waiting for merge
Subject: [PATCH] build: properly use autotools
---
Makefile.am | 1 -
configure.ac | 5 +++--
demo/Makefile.am | 18 +++++++++---------
src/Makefile.am | 5 +++--
4 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index eec516b..046d815 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,6 @@
# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-AUTOMAKE_OPTIONS = no-dependencies dist-shar dist-zip
ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = autogen.sh ccrtp.spec ccrtp.spec.in COPYING.addendum \
ccrtp.list ccrtp.list.in libccrtp.pc libccrtp.pc.in autoconf/* \
diff --git a/configure.ac b/configure.ac
index b5d8a10..5108a20 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,8 @@
# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-AC_INIT(src/ccrtp/rtp.h)
+AC_INIT([ccrtp], [2.0.3])
+AC_CONFIG_SRCDIR([src/ccrtp/rtp.h])
cfg_options=""
if test -z "$*" ; then
@@ -42,7 +43,7 @@ AC_PROG_CXXCPP
AC_PROG_CXX
# OST_PROG_CC_POSIX
AM_PROG_LIBTOOL
-AM_INIT_AUTOMAKE(ccrtp,[$VERSION])
+AM_INIT_AUTOMAKE([no-dependencies dist-shar dist-zip])
AM_CONFIG_HEADER(ccrtp-config.h)
AC_C_RESTRICT
diff --git a/demo/Makefile.am b/demo/Makefile.am
index 5e6e3a0..5a11837 100644
--- a/demo/Makefile.am
+++ b/demo/Makefile.am
@@ -19,35 +19,35 @@ ccxxincludedir=$(includedir)/cc++
if SRTP_GCRYPT
srtp_src = ccsrtptest
ccsrtptest_SOURCES = ccsrtptest.cpp
-ccsrtptest_LDFLAGS = ../src/libccrtp.la @GNULIBS@
+ccsrtptest_LDADD = ../src/libccrtp.la @GNULIBS@
endif
if SRTP_OPENSSL
srtp_src = ccsrtptest
ccsrtptest_SOURCES = ccsrtptest.cpp
-ccsrtptest_LDFLAGS = ../src/libccrtp.la @GNULIBS@
+ccsrtptest_LDADD = ../src/libccrtp.la @GNULIBS@
endif
noinst_PROGRAMS = rtpsend rtplisten rtphello rtpduphello audiorx audiotx \
ccrtptest $(srtp_src)
rtpsend_SOURCES = rtpsend.cpp
-rtpsend_LDFLAGS = ../src/libccrtp.la @GNULIBS@
+rtpsend_LDADD = ../src/libccrtp.la @GNULIBS@
rtplisten_SOURCES = rtplisten.cpp
-rtplisten_LDFLAGS = ../src/libccrtp.la @GNULIBS@
+rtplisten_LDADD = ../src/libccrtp.la @GNULIBS@
rtphello_SOURCES = rtphello.cpp
-rtphello_LDFLAGS = ../src/libccrtp.la @GNULIBS@
+rtphello_LDADD = ../src/libccrtp.la @GNULIBS@
rtpduphello_SOURCES = rtpduphello.cpp
-rtpduphello_LDFLAGS = ../src/libccrtp.la @GNULIBS@
+rtpduphello_LDADD = ../src/libccrtp.la @GNULIBS@
audiorx_SOURCES = audiorx.cpp audio.h
-audiorx_LDFLAGS = ../src/libccrtp.la @GNULIBS@
+audiorx_LDADD = ../src/libccrtp.la @GNULIBS@
audiotx_SOURCES = audiotx.cpp
-audiotx_LDFLAGS = ../src/libccrtp.la @GNULIBS@
+audiotx_LDADD = ../src/libccrtp.la @GNULIBS@
ccrtptest_SOURCES = ccrtptest.cpp
-ccrtptest_LDFLAGS = ../src/libccrtp.la @GNULIBS@
+ccrtptest_LDADD = ../src/libccrtp.la @GNULIBS@
diff --git a/src/Makefile.am b/src/Makefile.am
index 58cf4c1..1683a2d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,7 +16,7 @@ AM_CXXFLAGS= @WARN_FLAGS@ -I$(top_srcdir)/src/ccrtp
AM_CPPFLAGS= @WARN_FLAGS@ -I$(top_srcdir)/src/ccrtp
# RELEASE = $(LT_VERSION) -release $(LT_RELEASE)
-RELEASE = --version-info $(LT_VERSION)
+RELEASE = -version-info $(LT_VERSION)
lib_LTLIBRARIES = libccrtp.la
@@ -43,6 +43,7 @@ libccrtp_la_SOURCES = rtppkt.cpp rtcppkt.cpp source.cpp data.cpp incqueue.cpp \
outqueue.cpp queue.cpp control.cpp members.cpp socket.cpp duplex.cpp pool.cpp \
CryptoContext.cpp CryptoContextCtrl.cpp $(srtp_src_g) $(srtp_src_o) $(skein_srcs)
-libccrtp_la_LDFLAGS = $(RELEASE) @GNULIBS@
+libccrtp_la_LDFLAGS = $(RELEASE)
+libccrtp_la_LIBADD = @GNULIBS@
noinst_HEADERS = private.h
--
1.8.2

3
ccrtp-2.0.6.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:39fe4cd98635f710800b1d3f4090cae7110cbfee97ad42c77233eac2c5e4381b
size 735455

BIN
ccrtp-2.0.6.tar.gz.sig
View File

Binary file not shown.

3
ccrtp-2.0.9.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2032176f7d64db05d7bc557a045d0b24ec76f264448a30a7de9f12c5a31530df
size 751786

BIN
ccrtp-2.0.9.tar.gz.sig Normal file
View File

Binary file not shown.

8
ccrtp.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Sat Jun 28 01:25:42 UTC 2014 - jengelh@inai.de
- Update to new upstream release 2.0.9
* Fix for initial RTCP sequence number
- Remove 0001-build-properly-use-autotools.patch (merged upstream),
libgcrypt-1.6.diff (merged upstream)
-------------------------------------------------------------------
Mon Jan 6 12:45:33 UTC 2014 - dmueller@suse.com

17
ccrtp.spec
View File

@ -18,7 +18,7 @@
Name: ccrtp
%define lname libccrtp2
Version: 2.0.6
Version: 2.0.9
Release: 0
Summary: A Common C++ Class Framework for RTP Packets
License: SUSE-GPL-2.0+-with-openssl-exception
@ -30,23 +30,15 @@ Url: http://gnu.org/software/ccrtp/
Source: ftp://ftp.gnu.org/pub/gnu/ccrtp/%name-%version.tar.gz
Source2: ftp://ftp.gnu.org/pub/gnu/ccrtp/%name-%version.tar.gz.sig
Source3: %name.keyring
Patch1: 0001-build-properly-use-autotools.patch
Patch2: libgcrypt-1.6.diff
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: doxygen
BuildRequires: gcc-c++
BuildRequires: libgcrypt-devel
BuildRequires: libstdc++-devel
BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: ucommon-devel >= 5.0.0
%if 0%{?suse_version}
BuildRequires: fdupes
%endif
%if 0%{?suse_version} >= 1230
BuildRequires: gpg-offline
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -90,16 +82,11 @@ Generated class documentation for the ccrtp library from header
files, html browsable.
%prep
%{?gpg_verify: %gpg_verify %{S:2}}
%setup -q
%patch -P 1 -p1
%patch2
%build
# Got patches to .am
autoreconf -fi;
%configure --disable-static
make %{?_smp_mflags} V=1;
make %{?_smp_mflags}
%install
make install DESTDIR="%buildroot";

43
libgcrypt-1.6.diff
View File

@ -1,43 +0,0 @@
--- src/ccrtp/crypto/gcrypt/InitializeGcrypt.cpp
+++ 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,23 @@
}
#endif
+#else
+GCRY_THREAD_OPTION_PTHREAD_IMPL;
+#endif
+
+
+static int initialized = 0;
+
+
int initializeGcrypt ()
{
if (initialized) {
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;