[Pkg-voip-commits] [pjproject] 14/28: merge patched into master

tzafrir at debian.org tzafrir at debian.org
Mon Dec 21 06:05:51 UTC 2015


This is an automated email from the git hooks/post-receive script.

tzafrir pushed a commit to branch master-broken-2
in repository pjproject.

commit b638ab3edce3eb8d1aa515f7ee0f20a684e8e471
Merge: 51ab792 90e9f09
Author: Tzafrir Cohen <tzafrir at debian.org>
Date:   Mon Nov 30 23:45:43 2015 +0200

    merge patched into master

 aconfigure                                         |  25 +--
 aconfigure.ac                                      |  26 +--
 build.mak.in                                       |  15 +-
 debian/.git-dpm                                    |   4 +-
 ... => 0001-Enable-building-python-bindings.patch} |   2 +-
 ...1-Remove-pointless-linking-with-libasound.patch |  41 -----
 ...> 0002-CODEC_ID_-changed-to-AV_CODEC_ID_.patch} |   2 +-
 ...uce-number-of-libraries-linked-with-pjlib.patch | 104 -----------
 ...e-number-of-libraries-linked-with-pjmedia.patch |  73 --------
 ...ch => 0003-Replace-deprecated-FFmpeg-API.patch} |   2 +-
 ...4-add-v5-suffix-to-soname-of-libpjsua2-2.patch} |   6 +-
 ...o-libs-dependency-for-pj-utils-and-pjnath.patch |  52 ------
 .../0007-Reduce-linkage-of-unused-libraries.patch  | 202 ---------------------
 debian/patches/series                              |  13 +-
 pjlib-util/build/Makefile                          |   4 +-
 pjlib/build/Makefile                               |   2 +-
 pjmedia/build/Makefile                             |   4 -
 pjnath/build/Makefile                              |   5 +-
 18 files changed, 39 insertions(+), 543 deletions(-)

diff --cc debian/.git-dpm
index cdc6d3f,0000000..1315d39
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- ca754da6e51cb0911885faf62989663dedc5494f
- ca754da6e51cb0911885faf62989663dedc5494f
++90e9f09ae0a9b301715b55755944ecedacbc1014
++90e9f09ae0a9b301715b55755944ecedacbc1014
 +8bc494943161dfa21ff5d95e9ec78efd4f35e408
 +8bc494943161dfa21ff5d95e9ec78efd4f35e408
 +pjproject_2.4.5~dfsg.orig.tar.bz2
 +be4b2b7739c3d02d6265a4cc2ca0661df38dd151
 +4449242
diff --cc debian/patches/0001-Enable-building-python-bindings.patch
index 3aa0bea,0000000..ca258f5
mode 100644,000000..100644
--- a/debian/patches/0001-Enable-building-python-bindings.patch
+++ b/debian/patches/0001-Enable-building-python-bindings.patch
@@@ -1,21 -1,0 +1,21 @@@
- From 8b0626ecfcfcfa7ab676e5bec7a3623a4f347d9f Mon Sep 17 00:00:00 2001
++From 7f596883e2c8c3400982e7d247f42181e2b06186 Mon Sep 17 00:00:00 2001
 +From: Tzafrir Cohen <tzafrir at debian.org>
 +Date: Thu, 30 Oct 2014 08:09:44 +0200
 +Subject: Enable building python bindings
 +
 +---
 + Makefile | 1 +
 + 1 file changed, 1 insertion(+)
 +
 +diff --git a/Makefile b/Makefile
 +index 20af077..1dfac1f 100644
 +--- a/Makefile
 ++++ b/Makefile
 +@@ -4,6 +4,7 @@ include build/host-$(HOST_NAME).mak
 + include version.mak
 + 
 + LIB_DIRS = pjlib/build pjlib-util/build pjnath/build third_party/build pjmedia/build pjsip/build
 ++EXTRA_DIRS = pjsip-apps/src/python
 + DIRS = $(LIB_DIRS) pjsip-apps/build $(EXTRA_DIRS)
 + 
 + ifdef MINSIZE
diff --cc debian/patches/0002-CODEC_ID_-changed-to-AV_CODEC_ID_.patch
index 9d26fd6,0000000..dd7b1f1
mode 100644,000000..100644
--- a/debian/patches/0002-CODEC_ID_-changed-to-AV_CODEC_ID_.patch
+++ b/debian/patches/0002-CODEC_ID_-changed-to-AV_CODEC_ID_.patch
@@@ -1,36 -1,0 +1,36 @@@
- From 054f4253a2f2584d134997ed2fc5814226bd5a64 Mon Sep 17 00:00:00 2001
++From 9e73a3713e44dc451589853001ab877afad076b2 Mon Sep 17 00:00:00 2001
 +From: Tzafrir Cohen <tzafrir at debian.org>
 +Date: Thu, 30 Oct 2014 09:15:03 +0200
 +Subject: CODEC_ID_* changed to AV_CODEC_ID_*
 +
 +---
 + pjmedia/src/pjmedia/ffmpeg_util.c | 16 ++++++++--------
 + 1 file changed, 8 insertions(+), 8 deletions(-)
 +
 +diff --git a/pjmedia/src/pjmedia/ffmpeg_util.c b/pjmedia/src/pjmedia/ffmpeg_util.c
 +index ba01a3c..300bad3 100644
 +--- a/pjmedia/src/pjmedia/ffmpeg_util.c
 ++++ b/pjmedia/src/pjmedia/ffmpeg_util.c
 +@@ -68,14 +68,14 @@ static const struct ffmpeg_codec_table_t
 +     unsigned		codec_id;
 + } ffmpeg_codec_table[] =
 + {
 +-    {PJMEDIA_FORMAT_H261,	CODEC_ID_H261},
 +-    {PJMEDIA_FORMAT_H263,	CODEC_ID_H263},
 +-    {PJMEDIA_FORMAT_H263P,	CODEC_ID_H263P},
 +-    {PJMEDIA_FORMAT_H264,	CODEC_ID_H264},
 +-    {PJMEDIA_FORMAT_MPEG1VIDEO,	CODEC_ID_MPEG1VIDEO},
 +-    {PJMEDIA_FORMAT_MPEG2VIDEO, CODEC_ID_MPEG2VIDEO},
 +-    {PJMEDIA_FORMAT_MPEG4,	CODEC_ID_MPEG4},
 +-    {PJMEDIA_FORMAT_MJPEG,	CODEC_ID_MJPEG}
 ++    {PJMEDIA_FORMAT_H261,	AV_CODEC_ID_H261},
 ++    {PJMEDIA_FORMAT_H263,	AV_CODEC_ID_H263},
 ++    {PJMEDIA_FORMAT_H263P,	AV_CODEC_ID_H263P},
 ++    {PJMEDIA_FORMAT_H264,	AV_CODEC_ID_H264},
 ++    {PJMEDIA_FORMAT_MPEG1VIDEO,	AV_CODEC_ID_MPEG1VIDEO},
 ++    {PJMEDIA_FORMAT_MPEG2VIDEO, AV_CODEC_ID_MPEG2VIDEO},
 ++    {PJMEDIA_FORMAT_MPEG4,	AV_CODEC_ID_MPEG4},
 ++    {PJMEDIA_FORMAT_MJPEG,	AV_CODEC_ID_MJPEG}
 + };
 + 
 + static int pjmedia_ffmpeg_ref_cnt;
diff --cc debian/patches/0003-Replace-deprecated-FFmpeg-API.patch
index 6514f71,0000000..7676cd5
mode 100644,000000..100644
--- a/debian/patches/0003-Replace-deprecated-FFmpeg-API.patch
+++ b/debian/patches/0003-Replace-deprecated-FFmpeg-API.patch
@@@ -1,212 -1,0 +1,212 @@@
- From 969cff2daf79871a2a6d5a33362dd1ca32794e79 Mon Sep 17 00:00:00 2001
++From 977dabd3ede4a544326e3da94f045915ede4b00e Mon Sep 17 00:00:00 2001
 +From: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
 +Date: Thu, 5 Nov 2015 05:01:32 +0200
 +Subject: Replace deprecated FFmpeg API
 +
 +---
 + pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c | 10 ++---
 + pjmedia/src/pjmedia-videodev/ffmpeg_dev.c     |  2 +-
 + pjmedia/src/pjmedia/converter_libswscale.c    |  2 +-
 + pjmedia/src/pjmedia/ffmpeg_util.c             | 54 +++++++++++++--------------
 + pjmedia/src/pjmedia/ffmpeg_util.h             |  4 +-
 + 5 files changed, 36 insertions(+), 36 deletions(-)
 +
 +diff --git a/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c b/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c
 +index 812a9d7..8ae1a98 100644
 +--- a/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c
 ++++ b/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c
 +@@ -194,7 +194,7 @@ typedef struct ffmpeg_private
 +     /* The ffmpeg decoder cannot set the output format, so format conversion
 +      * may be needed for post-decoding.
 +      */
 +-    enum PixelFormat		     expected_dec_fmt;
 ++    enum AVPixelFormat		     expected_dec_fmt;
 + 						/**< Expected output format of 
 + 						     ffmpeg decoder	    */
 + 
 +@@ -673,7 +673,7 @@ PJ_DEF(pj_status_t) pjmedia_codec_ffmpeg_vid_init(pjmedia_vid_codec_mgr *mgr,
 + 	    pjmedia_format_id raw_fmt[PJMEDIA_VID_CODEC_MAX_DEC_FMT_CNT];
 + 	    unsigned raw_fmt_cnt = 0;
 + 	    unsigned raw_fmt_cnt_should_be = 0;
 +-	    const enum PixelFormat *p = c->pix_fmts;
 ++	    const enum AVPixelFormat *p = c->pix_fmts;
 + 
 + 	    for(;(p && *p != -1) &&
 + 		 (raw_fmt_cnt < PJMEDIA_VID_CODEC_MAX_DEC_FMT_CNT);
 +@@ -1096,7 +1096,7 @@ static void print_ffmpeg_err(int err)
 + static pj_status_t open_ffmpeg_codec(ffmpeg_private *ff,
 +                                      pj_mutex_t *ff_mutex)
 + {
 +-    enum PixelFormat pix_fmt;
 ++    enum AVPixelFormat pix_fmt;
 +     pjmedia_video_format_detail *vfd;
 +     pj_bool_t enc_opened = PJ_FALSE, dec_opened = PJ_FALSE;
 +     pj_status_t status;
 +@@ -1429,7 +1429,7 @@ static pj_status_t ffmpeg_codec_encode_whole(pjmedia_vid_codec *codec,
 +     /* Check if encoder has been opened */
 +     PJ_ASSERT_RETURN(ff->enc_ctx, PJ_EINVALIDOP);
 + 
 +-    avcodec_get_frame_defaults(&avframe);
 ++    av_frame_unref(&avframe);
 + 
 +     // Let ffmpeg manage the timestamps
 +     /*
 +@@ -1679,7 +1679,7 @@ static pj_status_t ffmpeg_codec_decode_whole(pjmedia_vid_codec *codec,
 +      * whole decoding session, and seems to be freed when the codec context
 +      * closed).
 +      */
 +-    avcodec_get_frame_defaults(&avframe);
 ++    av_frame_unref(&avframe);
 + 
 +     /* Init packet, the container of the encoded data */
 +     av_init_packet(&avpacket);
 +diff --git a/pjmedia/src/pjmedia-videodev/ffmpeg_dev.c b/pjmedia/src/pjmedia-videodev/ffmpeg_dev.c
 +index 849b760..4a83f65 100644
 +--- a/pjmedia/src/pjmedia-videodev/ffmpeg_dev.c
 ++++ b/pjmedia/src/pjmedia-videodev/ffmpeg_dev.c
 +@@ -176,7 +176,7 @@ static pj_status_t ffmpeg_capture_open(AVFormatContext **ctx,
 +     fp.prealloced_context = 1;
 +     fp.width = vfd->size.w;
 +     fp.height = vfd->size.h;
 +-    fp.pix_fmt = PIX_FMT_BGR24;
 ++    fp.pix_fmt = AV_PIX_FMT_BGR24;
 +     fp.time_base.num = vfd->fps.denum;
 +     fp.time_base.den = vfd->fps.num;
 + 
 +diff --git a/pjmedia/src/pjmedia/converter_libswscale.c b/pjmedia/src/pjmedia/converter_libswscale.c
 +index 3bb1c6a..86fa766 100644
 +--- a/pjmedia/src/pjmedia/converter_libswscale.c
 ++++ b/pjmedia/src/pjmedia/converter_libswscale.c
 +@@ -66,7 +66,7 @@ static pj_status_t factory_create_converter(pjmedia_converter_factory *cf,
 + 					    const pjmedia_conversion_param *prm,
 + 					    pjmedia_converter **p_cv)
 + {
 +-    enum PixelFormat srcFormat, dstFormat;
 ++    enum AVPixelFormat srcFormat, dstFormat;
 +     const pjmedia_video_format_detail *src_detail, *dst_detail;
 +     const pjmedia_video_format_info *src_fmt_info, *dst_fmt_info;
 +     struct SwsContext *sws_ctx;
 +diff --git a/pjmedia/src/pjmedia/ffmpeg_util.c b/pjmedia/src/pjmedia/ffmpeg_util.c
 +index 300bad3..a38609b 100644
 +--- a/pjmedia/src/pjmedia/ffmpeg_util.c
 ++++ b/pjmedia/src/pjmedia/ffmpeg_util.c
 +@@ -26,39 +26,39 @@
 + #include "ffmpeg_util.h"
 + #include <libavformat/avformat.h>
 + 
 +-/* PIX_FMT_GBR24P hassle:
 +- * - PIX_FMT_GBR24P is introduced (perhaps in avutil 51.20.1)
 +- * - suddenly PIX_FMT_GBR24P is replaced by PIX_FMT_GBRP, no alias defined,
 +- *   so PIX_FMT_GBR24P is just gone! (perhaps in avutil 51.42.0)
 +- * - then lately PIX_FMT_GBR24P is defined as PIX_FMT_GBRP
 ++/* AV_PIX_FMT_GBR24P hassle:
 ++ * - AV_PIX_FMT_GBR24P is introduced (perhaps in avutil 51.20.1)
 ++ * - suddenly AV_PIX_FMT_GBR24P is replaced by AV_PIX_FMT_GBRP, no alias defined,
 ++ *   so AV_PIX_FMT_GBR24P is just gone! (perhaps in avutil 51.42.0)
 ++ * - then lately AV_PIX_FMT_GBR24P is defined as AV_PIX_FMT_GBRP
 +  */
 +-#if !defined(PIX_FMT_GBR24P) && \
 ++#if !defined(AV_PIX_FMT_GBR24P) && \
 +     LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,42,0)
 +-#  define PIX_FMT_GBR24P PIX_FMT_GBRP
 ++#  define AV_PIX_FMT_GBR24P AV_PIX_FMT_GBRP
 + #endif
 + 
 +-/* Conversion table between pjmedia_format_id and PixelFormat */
 ++/* Conversion table between pjmedia_format_id and AVPixelFormat */
 + static const struct ffmpeg_fmt_table_t
 + {
 +     pjmedia_format_id	id;
 +-    enum PixelFormat	pf;
 ++    enum AVPixelFormat	pf;
 + } ffmpeg_fmt_table[] =
 + {
 +-    { PJMEDIA_FORMAT_RGBA, PIX_FMT_RGBA},
 +-    { PJMEDIA_FORMAT_RGB24,PIX_FMT_BGR24},
 +-    { PJMEDIA_FORMAT_BGRA, PIX_FMT_BGRA},
 ++    { PJMEDIA_FORMAT_RGBA, AV_PIX_FMT_RGBA},
 ++    { PJMEDIA_FORMAT_RGB24,AV_PIX_FMT_BGR24},
 ++    { PJMEDIA_FORMAT_BGRA, AV_PIX_FMT_BGRA},
 + #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 20, 1)
 +-    { PJMEDIA_FORMAT_GBRP, PIX_FMT_GBR24P},
 ++    { PJMEDIA_FORMAT_GBRP, AV_PIX_FMT_GBR24P},
 + #endif
 + 
 +-    { PJMEDIA_FORMAT_AYUV, PIX_FMT_NONE},
 +-    { PJMEDIA_FORMAT_YUY2, PIX_FMT_YUYV422},
 +-    { PJMEDIA_FORMAT_UYVY, PIX_FMT_UYVY422},
 +-    { PJMEDIA_FORMAT_I420, PIX_FMT_YUV420P},
 +-    //{ PJMEDIA_FORMAT_YV12, PIX_FMT_YUV420P},
 +-    { PJMEDIA_FORMAT_I422, PIX_FMT_YUV422P},
 +-    { PJMEDIA_FORMAT_I420JPEG, PIX_FMT_YUVJ420P},
 +-    { PJMEDIA_FORMAT_I422JPEG, PIX_FMT_YUVJ422P},
 ++    { PJMEDIA_FORMAT_AYUV, AV_PIX_FMT_NONE},
 ++    { PJMEDIA_FORMAT_YUY2, AV_PIX_FMT_YUYV422},
 ++    { PJMEDIA_FORMAT_UYVY, AV_PIX_FMT_UYVY422},
 ++    { PJMEDIA_FORMAT_I420, AV_PIX_FMT_YUV420P},
 ++    //{ PJMEDIA_FORMAT_YV12, AV_PIX_FMT_YUV420P},
 ++    { PJMEDIA_FORMAT_I422, AV_PIX_FMT_YUV422P},
 ++    { PJMEDIA_FORMAT_I420JPEG, AV_PIX_FMT_YUVJ420P},
 ++    { PJMEDIA_FORMAT_I422JPEG, AV_PIX_FMT_YUVJ422P},
 + };
 + 
 + /* Conversion table between pjmedia_format_id and CodecID */
 +@@ -139,22 +139,22 @@ static void ffmpeg_log_cb(void* ptr, int level, const char* fmt, va_list vl)
 + 
 + 
 + pj_status_t pjmedia_format_id_to_PixelFormat(pjmedia_format_id fmt_id,
 +-					     enum PixelFormat *pixel_format)
 ++					     enum AVPixelFormat *pixel_format)
 + {
 +     unsigned i;
 +     for (i=0; i<PJ_ARRAY_SIZE(ffmpeg_fmt_table); ++i) {
 + 	const struct ffmpeg_fmt_table_t *t = &ffmpeg_fmt_table[i];
 +-	if (t->id==fmt_id && t->pf != PIX_FMT_NONE) {
 ++	if (t->id==fmt_id && t->pf != AV_PIX_FMT_NONE) {
 + 	    *pixel_format = t->pf;
 + 	    return PJ_SUCCESS;
 + 	}
 +     }
 + 
 +-    *pixel_format = PIX_FMT_NONE;
 ++    *pixel_format = AV_PIX_FMT_NONE;
 +     return PJ_ENOTFOUND;
 + }
 + 
 +-pj_status_t PixelFormat_to_pjmedia_format_id(enum PixelFormat pf,
 ++pj_status_t PixelFormat_to_pjmedia_format_id(enum AVPixelFormat pf,
 + 					     pjmedia_format_id *fmt_id)
 + {
 +     unsigned i;
 +@@ -175,13 +175,13 @@ pj_status_t pjmedia_format_id_to_CodecID(pjmedia_format_id fmt_id,
 +     unsigned i;
 +     for (i=0; i<PJ_ARRAY_SIZE(ffmpeg_codec_table); ++i) {
 + 	const struct ffmpeg_codec_table_t *t = &ffmpeg_codec_table[i];
 +-	if (t->id==fmt_id && t->codec_id != PIX_FMT_NONE) {
 ++	if (t->id==fmt_id && t->codec_id != AV_PIX_FMT_NONE) {
 + 	    *codec_id = t->codec_id;
 + 	    return PJ_SUCCESS;
 + 	}
 +     }
 + 
 +-    *codec_id = (unsigned)PIX_FMT_NONE;
 ++    *codec_id = (unsigned)AV_PIX_FMT_NONE;
 +     return PJ_ENOTFOUND;
 + }
 + 
 +diff --git a/pjmedia/src/pjmedia/ffmpeg_util.h b/pjmedia/src/pjmedia/ffmpeg_util.h
 +index 558347d..0b6f9c9 100644
 +--- a/pjmedia/src/pjmedia/ffmpeg_util.h
 ++++ b/pjmedia/src/pjmedia/ffmpeg_util.h
 +@@ -41,9 +41,9 @@ void pjmedia_ffmpeg_add_ref();
 + void pjmedia_ffmpeg_dec_ref();
 + 
 + pj_status_t pjmedia_format_id_to_PixelFormat(pjmedia_format_id fmt_id,
 +-					     enum PixelFormat *pixel_format);
 ++					     enum AVPixelFormat *pixel_format);
 + 
 +-pj_status_t PixelFormat_to_pjmedia_format_id(enum PixelFormat pf,
 ++pj_status_t PixelFormat_to_pjmedia_format_id(enum AVPixelFormat pf,
 + 					     pjmedia_format_id *fmt_id);
 + 
 + pj_status_t pjmedia_format_id_to_CodecID(pjmedia_format_id fmt_id,
diff --cc debian/patches/0004-add-v5-suffix-to-soname-of-libpjsua2-2.patch
index 2c664bd,0000000..de5f0d0
mode 100644,000000..100644
--- a/debian/patches/0004-add-v5-suffix-to-soname-of-libpjsua2-2.patch
+++ b/debian/patches/0004-add-v5-suffix-to-soname-of-libpjsua2-2.patch
@@@ -1,40 -1,0 +1,40 @@@
- From ca754da6e51cb0911885faf62989663dedc5494f Mon Sep 17 00:00:00 2001
++From 90e9f09ae0a9b301715b55755944ecedacbc1014 Mon Sep 17 00:00:00 2001
 +From: Tzafrir Cohen <tzafrir at debian.org>
 +Date: Thu, 5 Nov 2015 04:55:06 +0200
 +Subject: add 'v5' suffix to soname of libpjsua2-2
 +
 +pjsua2 is a C++ library and its SONAME needs to be bumped as its ABI has
 +changed with GCC 5 (using C++11 ABI).
 +
 +Remove this patch once the ABI for all libraries has been bumped.
 +---
 + build.mak.in         | 2 +-
 + pjsip/build/Makefile | 2 +-
 + 2 files changed, 2 insertions(+), 2 deletions(-)
 +
 +diff --git a/build.mak.in b/build.mak.in
- index 4555ae9..93d3ff7 100644
++index 074977d..7dc768c 100644
 +--- a/build.mak.in
 ++++ b/build.mak.in
- @@ -252,7 +252,7 @@ export ADD_LIB_FILES := $(PJ_DIR)/pjsip/lib/libpjsua.$(SHLIB_SUFFIX).$(PJ_VERSIO
++@@ -245,7 +245,7 @@ export ADD_LIB_FILES := $(PJ_DIR)/pjsip/lib/libpjsua.$(SHLIB_SUFFIX).$(PJ_VERSIO
 + 
 + APP_LIB_FILES += $(ADD_LIB_FILES)
 + 
 +-APP_LIBXX_FILES += $(PJ_DIR)/pjsip/lib/libpjsua2.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/pjsip/lib/libpjsua2.$(SHLIB_SUFFIX) \
 ++APP_LIBXX_FILES += $(PJ_DIR)/pjsip/lib/libpjsua2.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR)v5 $(PJ_DIR)/pjsip/lib/libpjsua2.$(SHLIB_SUFFIX) \
 + 	$(ADD_LIB_FILES)
 + endif
 + 
 +diff --git a/pjsip/build/Makefile b/pjsip/build/Makefile
 +index a9bd5ad..eef4176 100644
 +--- a/pjsip/build/Makefile
 ++++ b/pjsip/build/Makefile
 +@@ -34,7 +34,7 @@ export PJSIP_SIMPLE_SHLIB := $(PJSIP_SIMPLE_SONAME).$(PJ_VERSION_MAJOR)
 + export PJSUA_LIB_SONAME := libpjsua.$(SHLIB_SUFFIX)
 + export PJSUA_LIB_SHLIB := $(PJSUA_LIB_SONAME).$(PJ_VERSION_MAJOR)
 + export PJSUA2_LIB_SONAME := libpjsua2.$(SHLIB_SUFFIX)
 +-export PJSUA2_LIB_SHLIB := $(PJSUA2_LIB_SONAME).$(PJ_VERSION_MAJOR)
 ++export PJSUA2_LIB_SHLIB := $(PJSUA2_LIB_SONAME).$(PJ_VERSION_MAJOR)v5
 + endif
 + 
 + ###############################################################################
diff --cc debian/patches/series
index 1062c55,0000000..8bc6859
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,9 -1,0 +1,4 @@@
- 0001-Remove-pointless-linking-with-libasound.patch
- 0002-Reduce-number-of-libraries-linked-with-pjlib.patch
- 0003-Reduce-number-of-libraries-linked-with-pjmedia.patch
- 0004-Enable-building-python-bindings.patch
- 0005-CODEC_ID_-changed-to-AV_CODEC_ID_.patch
- 0006-Remove-video-libs-dependency-for-pj-utils-and-pjnath.patch
- 0007-Reduce-linkage-of-unused-libraries.patch
- 0008-Replace-deprecated-FFmpeg-API.patch
- 0009-add-v5-suffix-to-soname-of-libpjsua2-2.patch
++0001-Enable-building-python-bindings.patch
++0002-CODEC_ID_-changed-to-AV_CODEC_ID_.patch
++0003-Replace-deprecated-FFmpeg-API.patch
++0004-add-v5-suffix-to-soname-of-libpjsua2-2.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/pjproject.git



More information about the Pkg-voip-commits mailing list