Update to pjsua 2.0.

dcoppa@ ok
This commit is contained in:
fgsch 2012-06-05 23:15:22 +00:00
parent b5a5e949ca
commit 1b967e9939
7 changed files with 76 additions and 10 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.24 2012/05/24 09:44:50 dcoppa Exp $
# $OpenBSD: Makefile,v 1.25 2012/06/05 23:15:22 fgsch Exp $
COMMENT= lightweight sip client
VERSION= 1.14.2
VERSION= 2.0
DISTNAME= pjproject-${VERSION}
PKGNAME= pjsua-${VERSION}
EXTRACT_SUFX= .tar.bz2
@ -18,12 +18,15 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB+= c crypto gsm>=1.0 m portaudio
WANTLIB+= pthread sndio speex speexdsp ssl
WANTLIB = avcodec avformat avutil bz2 c crypto gsm m mp3lame \
ogg orc-0.4 portaudio pthread schroedinger-1.0 speex \
speexdsp ssl swscale theoradec theoraenc vorbis vorbisenc \
vpx x264 xvidcore z
LIB_DEPENDS= audio/gsm \
audio/portaudio-svn \
audio/speex
audio/speex \
graphics/ffmpeg
CONFIGURE_STYLE= autoconf no-autoheader
AUTOCONF_VERSION= 2.61

View File

@ -1,5 +1,5 @@
MD5 (pjproject-1.14.2.tar.bz2) = BUKFAjhMFuer2F8Efm4vbA==
RMD160 (pjproject-1.14.2.tar.bz2) = 2zr/h1T+V9j0rqBRnwnGMzfxduM=
SHA1 (pjproject-1.14.2.tar.bz2) = JLdLDM8LMBmvE0/i5stk2VMWOzs=
SHA256 (pjproject-1.14.2.tar.bz2) = HV/QyQBoxnGxlClQtQepKaQAegSXe4sX7G+hRkcz7kY=
SIZE (pjproject-1.14.2.tar.bz2) = 3862563
MD5 (pjproject-2.0.tar.bz2) = bXKRlg8vNB6zlpR1RYbg6Q==
RMD160 (pjproject-2.0.tar.bz2) = K1ZOb32hmWKpoBqc+En3ebZAgdQ=
SHA1 (pjproject-2.0.tar.bz2) = pL40LkHWt0XASRa2cu9YPFwzbIk=
SHA256 (pjproject-2.0.tar.bz2) = HUWZqOUxOpW0RGX+Um+Ln0AuDkBmdloGVXqaLtEG61Y=
SIZE (pjproject-2.0.tar.bz2) = 4157747

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-pjmedia_src_pjmedia-codec_l16_c,v 1.1 2012/06/05 23:15:23 fgsch Exp $
--- pjmedia/src/pjmedia-codec/l16.c.orig Tue Jul 19 04:42:28 2011
+++ pjmedia/src/pjmedia-codec/l16.c Sun Jun 3 04:09:23 2012
@@ -229,6 +229,7 @@ PJ_DEF(pj_status_t) pjmedia_codec_l16_deinit(void)
l16_factory.endpt = NULL;
/* Destroy mutex. */
+ pj_mutex_unlock(l16_factory.mutex);
pj_mutex_destroy(l16_factory.mutex);
l16_factory.mutex = NULL;

View File

@ -0,0 +1,19 @@
$OpenBSD: patch-pjmedia_src_pjmedia-codec_speex_codec_c,v 1.1 2012/06/05 23:15:23 fgsch Exp $
--- pjmedia/src/pjmedia-codec/speex_codec.c.orig Tue Jul 19 04:42:28 2011
+++ pjmedia/src/pjmedia-codec/speex_codec.c Sun Jun 3 04:09:23 2012
@@ -379,6 +379,7 @@ PJ_DEF(pj_status_t) pjmedia_codec_speex_deinit(void)
if (!codec_mgr) {
pj_pool_release(spx_factory.pool);
spx_factory.pool = NULL;
+ pj_mutex_unlock(spx_factory.mutex);
return PJ_EINVALIDOP;
}
@@ -387,6 +388,7 @@ PJ_DEF(pj_status_t) pjmedia_codec_speex_deinit(void)
&spx_factory.base);
/* Destroy mutex. */
+ pj_mutex_unlock(spx_factory.mutex);
pj_mutex_destroy(spx_factory.mutex);
/* Destroy pool. */

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-pjmedia_src_pjmedia_g711_c,v 1.1 2012/06/05 23:15:23 fgsch Exp $
--- pjmedia/src/pjmedia/g711.c.orig Tue Jul 19 04:42:28 2011
+++ pjmedia/src/pjmedia/g711.c Sun Jun 3 04:09:23 2012
@@ -221,6 +221,7 @@ PJ_DEF(pj_status_t) pjmedia_codec_g711_deinit(void)
g711_factory.endpt = NULL;
/* Destroy mutex. */
+ pj_mutex_unlock(g711_factory.mutex);
pj_mutex_destroy(g711_factory.mutex);
g711_factory.mutex = NULL;

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-pjmedia_src_pjmedia_stream_c,v 1.1 2012/06/05 23:15:23 fgsch Exp $
--- pjmedia/src/pjmedia/stream.c.orig Sat May 12 08:18:09 2012
+++ pjmedia/src/pjmedia/stream.c Sun Jun 3 04:09:23 2012
@@ -2442,6 +2442,7 @@ PJ_DEF(pj_status_t) pjmedia_stream_destroy( pjmedia_st
/* Free mutex */
if (stream->jb_mutex) {
+ pj_mutex_unlock(stream->jb_mutex);
pj_mutex_destroy(stream->jb_mutex);
stream->jb_mutex = NULL;
}

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-pjsip_src_pjsip_sip_dialog_c,v 1.1 2012/06/05 23:15:23 fgsch Exp $
--- pjsip/src/pjsip/sip_dialog.c.orig Fri Jun 1 03:38:55 2012
+++ pjsip/src/pjsip/sip_dialog.c Fri Jun 1 03:39:01 2012
@@ -111,6 +111,7 @@ on_error:
static void destroy_dialog( pjsip_dialog *dlg )
{
if (dlg->mutex_) {
+ pj_mutex_unlock(dlg->mutex_);
pj_mutex_destroy(dlg->mutex_);
dlg->mutex_ = NULL;
}