diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-01-14 03:47:29 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-01-14 03:47:29 +0000 |
| commit | 271da49386e259723ef574713339f04886630604 (patch) | |
| tree | 3357a1b3aa15cfd25145095c41b0a94612ce3635 /extra/ccrtp | |
| parent | bcefa96cbc68f340b2aa11c108353993db074e76 (diff) | |
Tue Jan 14 03:40:13 UTC 2014
Diffstat (limited to 'extra/ccrtp')
| -rw-r--r-- | extra/ccrtp/PKGBUILD | 15 | ||||
| -rw-r--r-- | extra/ccrtp/libgcrypt160.patch | 52 |
2 files changed, 63 insertions, 4 deletions
diff --git a/extra/ccrtp/PKGBUILD b/extra/ccrtp/PKGBUILD index c17444702..6b1294c38 100644 --- a/extra/ccrtp/PKGBUILD +++ b/extra/ccrtp/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 197587 2013-10-27 03:20:07Z eric $ +# $Id: PKGBUILD 203569 2014-01-13 17:11:59Z andyrtr $ # Maintainer: # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jeff Mickey <jeff@archlinux.org> @@ -7,16 +7,23 @@ pkgname=ccrtp pkgver=2.0.6 -pkgrel=1 +pkgrel=2 pkgdesc="An implementation of RTP, the real-time transport protocol from the IETF" arch=('i686' 'x86_64') url="http://www.gnu.org/software/ccrtp/" license=('GPL' 'custom') depends=('ucommon' 'libgcrypt') install=$pkgname.install -source=("ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}) +source=("ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig} + 'libgcrypt160.patch') md5sums=('ca0a7a184b242d660d81caf6101a2c0c' - 'SKIP') + 'SKIP' + '8ca785e2613b4e056685d3dca3fe8670') + +prepare() { + cd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/libgcrypt160.patch +} build() { cd ${pkgname}-${pkgver} diff --git a/extra/ccrtp/libgcrypt160.patch b/extra/ccrtp/libgcrypt160.patch new file mode 100644 index 000000000..f8a21dc51 --- /dev/null +++ b/extra/ccrtp/libgcrypt160.patch @@ -0,0 +1,52 @@ +--- ccrtp-2.0.6/src/ccrtp/crypto/gcrypt/InitializeGcrypt.cpp~ 2013-12-24 09:48:10.679538751 +0000 ++++ ccrtp-2.0.6/src/ccrtp/crypto/gcrypt/InitializeGcrypt.cpp 2013-12-24 09:48:29.149404720 +0000 +@@ -22,40 +22,6 @@ + #include <errno.h> + #include <gcrypt.h> + +-/* +- * 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. + * + */ +@@ -65,7 +31,7 @@ + #ifdef __cplusplus + extern "C" { + #endif +-GCRY_THREAD_OPTION_PTHREAD_CPP_IMPL; ++GCRY_THREAD_OPTION_PTHREAD_IMPL; + #ifdef __cplusplus + } + #endif |