[Pkg-voip-commits] [pjproject] 19/28: merge patched into master
tzafrir at debian.org
tzafrir at debian.org
Mon Dec 21 06:05:52 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 c33c16946f0ccf560b5aca625e82e1cdfde6488a
Merge: b638ab3 fcd43fe
Author: Tzafrir Cohen <tzafrir at debian.org>
Date: Sun Dec 6 07:10:44 2015 +0200
merge patched into master
Makefile | 1 -
build/os-auto.mak.in | 3 +-
debian/.git-dpm | 4 +-
...> 0001-CODEC_ID_-changed-to-AV_CODEC_ID_.patch} | 2 +-
.../0001-Enable-building-python-bindings.patch | 21 ---
...ch => 0002-Replace-deprecated-FFmpeg-API.patch} | 2 +-
...3-add-v5-suffix-to-soname-of-libpjsua2-2.patch} | 2 +-
debian/patches/0004-fix-link-order-WIP.patch | 179 +++++++++++++++++++++
debian/patches/series | 8 +-
pjlib-util/build/Makefile | 4 +-
pjlib/build/Makefile | 4 +-
pjmedia/build/Makefile | 8 +-
pjnath/build/Makefile | 4 +-
pjsip-apps/build/Makefile | 4 +-
pjsip-apps/src/python/setup.py | 2 +-
pjsip/build/Makefile | 13 +-
16 files changed, 211 insertions(+), 50 deletions(-)
diff --cc debian/.git-dpm
index 1315d39,0000000..22068d8
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
- 90e9f09ae0a9b301715b55755944ecedacbc1014
- 90e9f09ae0a9b301715b55755944ecedacbc1014
++fcd43fe4614fc0f1d3200a75170563bbaa9d8f84
++fcd43fe4614fc0f1d3200a75170563bbaa9d8f84
+8bc494943161dfa21ff5d95e9ec78efd4f35e408
+8bc494943161dfa21ff5d95e9ec78efd4f35e408
+pjproject_2.4.5~dfsg.orig.tar.bz2
+be4b2b7739c3d02d6265a4cc2ca0661df38dd151
+4449242
diff --cc debian/patches/0001-CODEC_ID_-changed-to-AV_CODEC_ID_.patch
index dd7b1f1,0000000..927dba0
mode 100644,000000..100644
--- a/debian/patches/0001-CODEC_ID_-changed-to-AV_CODEC_ID_.patch
+++ b/debian/patches/0001-CODEC_ID_-changed-to-AV_CODEC_ID_.patch
@@@ -1,36 -1,0 +1,36 @@@
- From 9e73a3713e44dc451589853001ab877afad076b2 Mon Sep 17 00:00:00 2001
++From 6a8e14095a5dc9c18401e338f7f82c8f93dcc35a 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/0002-Replace-deprecated-FFmpeg-API.patch
index 7676cd5,0000000..6667f3d
mode 100644,000000..100644
--- a/debian/patches/0002-Replace-deprecated-FFmpeg-API.patch
+++ b/debian/patches/0002-Replace-deprecated-FFmpeg-API.patch
@@@ -1,212 -1,0 +1,212 @@@
- From 977dabd3ede4a544326e3da94f045915ede4b00e Mon Sep 17 00:00:00 2001
++From 2ac2a260fe66e4ba2ef0618bd51bae7a42203e18 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/0003-add-v5-suffix-to-soname-of-libpjsua2-2.patch
index de5f0d0,0000000..46b3721
mode 100644,000000..100644
--- a/debian/patches/0003-add-v5-suffix-to-soname-of-libpjsua2-2.patch
+++ b/debian/patches/0003-add-v5-suffix-to-soname-of-libpjsua2-2.patch
@@@ -1,40 -1,0 +1,40 @@@
- From 90e9f09ae0a9b301715b55755944ecedacbc1014 Mon Sep 17 00:00:00 2001
++From f54e02e39689a29df80c20676a13fea8d42bccd7 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 074977d..7dc768c 100644
+--- a/build.mak.in
++++ b/build.mak.in
+@@ -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/0004-fix-link-order-WIP.patch
index 0000000,0000000..8a00d3a
new file mode 100644
--- /dev/null
+++ b/debian/patches/0004-fix-link-order-WIP.patch
@@@ -1,0 -1,0 +1,179 @@@
++From fcd43fe4614fc0f1d3200a75170563bbaa9d8f84 Mon Sep 17 00:00:00 2001
++From: Tzafrir Cohen <tzafrir at debian.org>
++Date: Sat, 5 Dec 2015 13:24:25 +0200
++Subject: fix link order (WIP)
++
++* Fix linking with --as-needed. Requires changing the link order to
++ place libs after library paths.
++* FIXME: add two missing libraries. There must be a better way to do
++ that
++---
++ build/os-auto.mak.in | 3 ++-
++ pjlib-util/build/Makefile | 4 ++--
++ pjlib/build/Makefile | 4 ++--
++ pjmedia/build/Makefile | 8 ++++----
++ pjnath/build/Makefile | 4 ++--
++ pjsip-apps/build/Makefile | 4 ++--
++ pjsip-apps/src/python/setup.py | 2 +-
++ pjsip/build/Makefile | 13 ++++++++-----
++ 8 files changed, 23 insertions(+), 19 deletions(-)
++
++diff --git a/build/os-auto.mak.in b/build/os-auto.mak.in
++index 3d99927..84d835c 100644
++--- a/build/os-auto.mak.in
+++++ b/build/os-auto.mak.in
++@@ -4,7 +4,8 @@ export OS_CFLAGS := $(CC_DEF)PJ_AUTOCONF=1 @CFLAGS@
++
++ export OS_CXXFLAGS := $(CC_DEF)PJ_AUTOCONF=1 @CXXFLAGS@
++
++-export OS_LDFLAGS := @LDFLAGS@ @LIBS@
+++export OS_LDFLAGS := @LDFLAGS@
+++export OS_LIBS := @LIBS@
++
++ export OS_SOURCES :=
++
++diff --git a/pjlib-util/build/Makefile b/pjlib-util/build/Makefile
++index cb601cb..08c8e14 100644
++--- a/pjlib-util/build/Makefile
+++++ b/pjlib-util/build/Makefile
++@@ -28,8 +28,8 @@ export _CFLAGS := $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \
++ $(CFLAGS) $(CC_INC)../include $(CC_INC)../../pjlib/include
++ export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
++ $(HOST_CXXFLAGS) $(CXXFLAGS)
++-export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
++- $(APP_LDFLAGS) $(LDFLAGS)
+++export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(APP_LDFLAGS) $(M_LDFLAGS) \
+++ $(HOST_LDFLAGS) $(LDFLAGS)
++
++ ###############################################################################
++ # Defines for building PJLIB-UTIL library
++diff --git a/pjlib/build/Makefile b/pjlib/build/Makefile
++index 1e64950..3d8a663 100644
++--- a/pjlib/build/Makefile
+++++ b/pjlib/build/Makefile
++@@ -22,8 +22,8 @@ export _CFLAGS := $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \
++ $(CFLAGS) $(CC_INC)../include
++ export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
++ $(HOST_CXXFLAGS) $(CXXFLAGS)
++-export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
++- $(APP_LDFLAGS) $(LDFLAGS)
+++export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(OS_LIBS) $(APP_LDFLAGS) \
+++ $(M_LDFLAGS) $(HOST_LDFLAGS) $(LDFLAGS)
++
++
++ ###############################################################################
++diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile
++index 702efdc..fcaacc7 100644
++--- a/pjmedia/build/Makefile
+++++ b/pjmedia/build/Makefile
++@@ -50,8 +50,8 @@ export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
++
++ export _LDFLAGS := $(APP_THIRD_PARTY_LIBS) \
++ $(APP_THIRD_PARTY_EXT) \
++- $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
++- $(APP_LDFLAGS) $(LDFLAGS)
+++ $(CC_LDFLAGS) $(OS_LDFLAGS) $(OS_LIBS) $(M_LDFLAGS) \
+++ $(HOST_LDFLAGS) $(APP_LDFLAGS) $(LDFLAGS)
++
++ ###############################################################################
++ # Defines for building PJMEDIA library
++@@ -98,7 +98,7 @@ export PJMEDIA_AUDIODEV_OBJS += audiodev.o audiotest.o errno.o \
++ export PJMEDIA_AUDIODEV_CFLAGS += $(_CFLAGS)
++ export PJMEDIA_AUDIODEV_CXXFLAGS += $(_CXXFLAGS)
++ export PJMEDIA_AUDIODEV_LDFLAGS += $(PJLIB_LDLIB) \
++- $(_LDFLAGS)
+++ $(_LDFLAGS) -lpjmedia
++
++
++ ###############################################################################
++@@ -111,7 +111,7 @@ export PJMEDIA_VIDEODEV_OBJS += errno.o videodev.o avi_dev.o ffmpeg_dev.o \
++ export PJMEDIA_VIDEODEV_CFLAGS += $(_CFLAGS)
++ export PJMEDIA_VIDEODEV_CXXFLAGS += $(_CXXFLAGS)
++ export PJMEDIA_VIDEODEV_LDFLAGS += $(PJLIB_LDLIB) \
++- $(_LDFLAGS)
+++ $(_LDFLAGS) -lpjmedia
++
++
++ ###############################################################################
++diff --git a/pjnath/build/Makefile b/pjnath/build/Makefile
++index 1bc08b5..cd2e63b 100644
++--- a/pjnath/build/Makefile
+++++ b/pjnath/build/Makefile
++@@ -30,8 +30,8 @@ export _CFLAGS := $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \
++ $(CC_INC)../../pjlib-util/include
++ export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
++ $(HOST_CXXFLAGS) $(CXXFLAGS)
++-export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
++- $(APP_LDFLAGS) $(LDFLAGS)
+++export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(APP_LDFLAGS) $(M_LDFLAGS) \
+++ $(HOST_LDFLAGS) $(LDFLAGS)
++
++ ###############################################################################
++ # Defines for building PJNATH library
++diff --git a/pjsip-apps/build/Makefile b/pjsip-apps/build/Makefile
++index 49ff2d7..1d082b5 100644
++--- a/pjsip-apps/build/Makefile
+++++ b/pjsip-apps/build/Makefile
++@@ -18,8 +18,8 @@ export _CFLAGS := $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \
++ $(CC_INC)../../pjmedia/include
++ export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
++ $(HOST_CXXFLAGS) $(CXXFLAGS)
++-export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
++- $(APP_LDFLAGS) $(APP_LDLIBS) $(LDFLAGS)
+++export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(APP_LDFLAGS) $(M_LDFLAGS) \
+++ $(HOST_LDFLAGS) $(APP_LDLIBS) $(LDFLAGS)
++
++ ###############################################################################
++ # Defines for building PJSUA
++diff --git a/pjsip-apps/src/python/setup.py b/pjsip-apps/src/python/setup.py
++index 9eaed9d..8855fe5 100644
++--- a/pjsip-apps/src/python/setup.py
+++++ b/pjsip-apps/src/python/setup.py
++@@ -92,7 +92,7 @@ if platform.system() == 'Darwin':
++ if version[0] == '10' and int(version[1]) >= 7:
++ extra_link_args += ["-framework", "AudioUnit"]
++ else:
++- extra_link_args = []
+++ extra_link_args = ['-lpython2.7']
++
++
++ setup(name="pjsua",
++diff --git a/pjsip/build/Makefile b/pjsip/build/Makefile
++index eef4176..29cea02 100644
++--- a/pjsip/build/Makefile
+++++ b/pjsip/build/Makefile
++@@ -48,10 +48,13 @@ export _CFLAGS := $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \
++ $(CC_INC)../../pjmedia/include
++ export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
++ $(HOST_CXXFLAGS) $(CXXFLAGS)
++-export _LDFLAGS := $(APP_THIRD_PARTY_LIBS) \
+++export _LDFLAGS := \
+++ $(CC_LDFLAGS) $(OS_LDFLAGS) $(APP_LDFLAGS) $(M_LDFLAGS) \
+++ $(APP_THIRD_PARTY_LIBS) \
++ $(APP_THIRD_PARTY_EXT) \
++- $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
++- $(APP_LDFLAGS) $(LDFLAGS)
+++ $(HOST_LDFLAGS) \
+++ $(OS_LIBS) \
+++ $(LDFLAGS)
++
++ ###############################################################################
++ # Defines for building PJSIP core library
++@@ -141,7 +144,8 @@ export PJSUA2_LIB_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
++ siptypes.o call.o presence.o media.o
++ export PJSUA2_LIB_CFLAGS += $(_CFLAGS) $(PJ_VIDEO_CFLAGS)
++ export PJSUA2_LIB_CXXFLAGS = $(PJSUA2_LIB_CFLAGS)
++-export PJSUA2_LIB_LDFLAGS += $(PJSUA_LIB_LDLIB) \
+++export PJSUA2_LIB_LDFLAGS += $(_LDFLAGS) \
+++ $(PJSUA_LIB_LDLIB) \
++ $(PJSIP_UA_LDLIB) \
++ $(PJSIP_SIMPLE_LDLIB) \
++ $(PJSIP_LDLIB) \
++@@ -152,7 +156,6 @@ export PJSUA2_LIB_LDFLAGS += $(PJSUA_LIB_LDLIB) \
++ $(PJNATH_LDLIB) \
++ $(PJLIB_UTIL_LDLIB) \
++ $(PJLIB_LDLIB) \
++- $(_LDFLAGS) \
++ -lstdc++
++
++
diff --cc debian/patches/series
index 8bc6859,0000000..fa79739
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,0 +1,4 @@@
- 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
++0001-CODEC_ID_-changed-to-AV_CODEC_ID_.patch
++0002-Replace-deprecated-FFmpeg-API.patch
++0003-add-v5-suffix-to-soname-of-libpjsua2-2.patch
++0004-fix-link-order-WIP.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