diff --git a/.gitignore b/.gitignore index 96cba73..2bd077e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ ccrtp-1.7.1.tar.gz /ccrtp-2.0.2.tar.gz /ccrtp-2.0.5.tar.gz +/ccrtp-2.1.2.tar.gz diff --git a/ccrtp-1.6.0-gcc.patch b/ccrtp-1.6.0-gcc.patch deleted file mode 100644 index c0efe31..0000000 --- a/ccrtp-1.6.0-gcc.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up ccrtp-1.6.0/src/control.cpp.orig ccrtp-1.6.0/src/control.cpp ---- ccrtp-1.6.0/src/control.cpp.orig 2008-02-07 08:49:22.000000000 +0100 -+++ ccrtp-1.6.0/src/control.cpp 2008-02-07 08:50:09.000000000 +0100 -@@ -43,6 +43,7 @@ - - #include "private.h" - #include -+#include - - #ifdef CCXX_NAMESPACES - namespace ost { diff --git a/ccrtp-2.0.5-libgcrypt-no-threadcbs.patch b/ccrtp-2.0.5-libgcrypt-no-threadcbs.patch deleted file mode 100644 index 782f391..0000000 --- a/ccrtp-2.0.5-libgcrypt-no-threadcbs.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff -up ccrtp-2.0.5/src/ccrtp/crypto/gcrypt/InitializeGcrypt.cpp.threadcbs ccrtp-2.0.5/src/ccrtp/crypto/gcrypt/InitializeGcrypt.cpp ---- ccrtp-2.0.5/src/ccrtp/crypto/gcrypt/InitializeGcrypt.cpp.threadcbs 2012-06-18 17:19:04.000000000 +0200 -+++ ccrtp-2.0.5/src/ccrtp/crypto/gcrypt/InitializeGcrypt.cpp 2014-04-22 21:28:21.857233486 +0200 -@@ -16,67 +16,18 @@ - */ - - #include -- - #include --#include - #include - #include -- --/* -- * The following macro was copied from gcrypt.h and modified to explicitly -- * cast the pointer types to keep the compiler happy. -- */ --#define GCRY_THREAD_OPTION_PTHREAD_CPP_IMPL \ --static int gcry_pthread_mutex_init (void **priv) \ --{ \ -- int err = 0; \ -- pthread_mutex_t *lock = (pthread_mutex_t *)malloc (sizeof (pthread_mutex_t)); \ -- \ -- if (!lock) \ -- err = ENOMEM; \ -- if (!err) \ --{ \ -- err = pthread_mutex_init (lock, NULL); \ -- if (err) \ -- free (lock); \ -- else \ -- *priv = lock; \ --} \ -- return err; \ --} \ --static int gcry_pthread_mutex_destroy (void **lock) \ --{ int err = pthread_mutex_destroy ((pthread_mutex_t *)*lock); free (*lock); return err; } \ --static int gcry_pthread_mutex_lock (void **lock) \ --{ return pthread_mutex_lock ((pthread_mutex_t *)*lock); } \ --static int gcry_pthread_mutex_unlock (void **lock) \ --{ return pthread_mutex_unlock ((pthread_mutex_t *)*lock); } \ -- \ --static struct gcry_thread_cbs gcry_threads_pthread = \ --{ GCRY_THREAD_OPTION_PTHREAD, NULL, \ -- gcry_pthread_mutex_init, gcry_pthread_mutex_destroy, \ -- gcry_pthread_mutex_lock, gcry_pthread_mutex_unlock } -- --/** Implement the locking callback functions for libgcrypt. -- * -- */ - - static int initialized = 0; - --#ifdef __cplusplus --extern "C" { --#endif --GCRY_THREAD_OPTION_PTHREAD_CPP_IMPL; --#ifdef __cplusplus --} --#endif -- - int initializeGcrypt () - { - - if (initialized) { - return 1; - } -- gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread); - gcry_check_version(NULL); - gcry_control(GCRYCTL_DISABLE_SECMEM); - initialized = 1; diff --git a/ccrtp.spec b/ccrtp.spec index 8860869..a45d964 100644 --- a/ccrtp.spec +++ b/ccrtp.spec @@ -1,14 +1,18 @@ -Summary: Common C++ class framework for RTP/RTCP -Name: ccrtp -Version: 2.0.5 -Release: 19%{?dist} -License: GPLv2+ -Source0: http://ftp.gnu.org/pub/gnu/ccrtp/ccrtp-%{version}.tar.gz -Patch1: ccrtp-2.0.5-libgcrypt-no-threadcbs.patch -URL: http://www.gnu.org/software/commoncpp/ +Name: ccrtp +Summary: Common C++ class framework for RTP/RTCP +Version: 2.1.2 +Release: 1%{?dist} + +License: GPLv2+ +URL: http://www.gnu.org/software/commoncpp/ +Source0: http://ftp.gnu.org/pub/gnu/ccrtp/ccrtp-%{version}.tar.gz + BuildRequires: gcc-c++ BuildRequires: make -BuildRequires: commoncpp2-devel >= 1.7.0, doxygen, libgcrypt-devel, ucommon-devel +BuildRequires: commoncpp2-devel >= 1.7.0 +BuildRequires: doxygen +BuildRequires: libgcrypt-devel +BuildRequires: ucommon-devel %description ccRTP is a generic, extensible and efficient C++ framework for @@ -20,6 +24,7 @@ multi-unicast and multicast, manages multiple sources, handles RTCP automatically, supports different threading models and is generic as for underlying network and transport protocols. + %package devel Summary: Header files and libraries for %{name} development # Some of the headers are LGPLv2+ @@ -33,34 +38,38 @@ to develop programs that use the %{name} library. %prep -%setup -q -%patch1 -p1 -b .threadcbs +%autosetup -p1 chmod 644 src/ccrtp/rtp.h + %build -%configure \ - --disable-static -%{__make} # %{?_smp_mflags} smp builds disabled +%configure --disable-static +%make_build + %install -make install DESTDIR=%{buildroot} +%make_install rm -f %{buildroot}%{_infodir}/dir find %{buildroot} -name '*.la' -exec rm -f {} \; + %files -%doc COPYING README COPYING.addendum +%doc README +%license COPYING COPYING.addendum %{_libdir}/*.so.* %files devel %doc doc/html -%dir %{_includedir}/ccrtp -%{_includedir}/ccrtp/* +%{_includedir}/ccrtp/ %{_libdir}/*.so %{_libdir}/pkgconfig/libccrtp.pc %{_infodir}/ccrtp.info* %changelog +* Thu Jan 31 2019 Sandro Mani - 2.1.2-1 +- Update to 2.1.2 + * Thu Jul 12 2018 Fedora Release Engineering - 2.0.5-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index d3065c1..6c09328 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7f462f6b31c68180a93f36b06944fef4 ccrtp-2.0.5.tar.gz +SHA512 (ccrtp-2.1.2.tar.gz) = a835f57a0eef7cba11c55c93ce2f11ebd8ab4099e7c723043c51e4872f3da87af946fc50fac18b47ea5d72b2a1227b377810e9134c1f3a8982d4ce5944d043e9