[Pkg-voip-commits] [pjproject] 05/28: merge patched into master
tzafrir at debian.org
tzafrir at debian.org
Mon Dec 21 06:05:50 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 314d5047efaec3b0656dfa910b223e38838f84c5
Merge: 6013b43 4913c2b
Author: Tzafrir Cohen <tzafrir at debian.org>
Date: Wed Nov 11 14:47:50 2015 +0200
merge patched into master
aconfigure.ac | 10 ++-----
debian/.git-dpm | 4 +--
.../0007-Reduce-linkage-of-unused-libraries.patch | 31 ++++++++++------------
.../0008-Replace-deprecated-FFmpeg-API.patch | 2 +-
...09-add-v5-suffix-to-soname-of-libpjsua2-2.patch | 2 +-
5 files changed, 20 insertions(+), 29 deletions(-)
diff --cc debian/.git-dpm
index add1796,0000000..8793f71
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
- c9d40b9830767ef21a09eaa15272f9ca0ce08bfc
- c9d40b9830767ef21a09eaa15272f9ca0ce08bfc
++4913c2bf236ef073b5d44ac4d3bf74b684511fa3
++4913c2bf236ef073b5d44ac4d3bf74b684511fa3
+8bc494943161dfa21ff5d95e9ec78efd4f35e408
+8bc494943161dfa21ff5d95e9ec78efd4f35e408
+pjproject_2.4.5~dfsg.orig.tar.bz2
+be4b2b7739c3d02d6265a4cc2ca0661df38dd151
+4449242
diff --cc debian/patches/0007-Reduce-linkage-of-unused-libraries.patch
index 102deb3,0000000..ea2357c
mode 100644,000000..100644
--- a/debian/patches/0007-Reduce-linkage-of-unused-libraries.patch
+++ b/debian/patches/0007-Reduce-linkage-of-unused-libraries.patch
@@@ -1,211 -1,0 +1,208 @@@
- From df5f5ffdfa45cc3975c18279ac0b44212b00370f Mon Sep 17 00:00:00 2001
++From e83121f8e7b8946b25607d9b7dc64396dcf7e3b3 Mon Sep 17 00:00:00 2001
+From: Tzafrir Cohen <tzafrir at debian.org>
+Date: Thu, 13 Aug 2015 17:49:57 +0200
+Subject: Reduce linkage of unused libraries
+
+The following libraries: ffmpeg, v4l, opencore-amr and SDL are linked
+with all the libraries. But are only needed for a small part of them.
+
+Have them linked with the relevant ones explicitly.
++
++For pjlib-utils and pjnath the list of libraries is currently empty,
++and is left as a placeholder.
+---
+ aconfigure | 22 ++++++++++++++++++----
- aconfigure.ac | 24 +++++++++++++++++++-----
++ aconfigure.ac | 18 +++++++++++++-----
+ build.mak.in | 5 +++++
+ pjlib-util/build/Makefile | 2 +-
+ pjmedia/build/Makefile | 1 +
+ pjnath/build/Makefile | 3 ++-
- 6 files changed, 46 insertions(+), 11 deletions(-)
++ 6 files changed, 40 insertions(+), 11 deletions(-)
+
+diff --git a/aconfigure b/aconfigure
+index eb50910..cbebe1c 100755
+--- a/aconfigure
++++ b/aconfigure
+@@ -621,6 +621,11 @@ ac_includes_default="\
+ ac_subst_vars='LTLIBOBJS
+ LIBOBJS
+ PJLIB_EXT
++PJLIB_UTIL_EXT
++PJMEDIA_EXT
++PJMEDIA_CODEC_EXT
++PJMEDIA_VIDEODEV_EXT
++PJNATH_EXT
+ ac_main_obj
+ ac_host
+ ac_linux_poll
+@@ -6647,7 +6652,9 @@ $as_echo "not found" >&6; }
+ ac_sdl_cflags=`$SDL_CONFIG --cflags`
+ ac_sdl_cflags="-DPJMEDIA_VIDEO_DEV_HAS_SDL=1 $ac_sdl_cflags"
+ ac_sdl_ldflags=`$SDL_CONFIG --libs`
+- LIBS="$LIBS $ac_sdl_ldflags"
++ PJLIB_UTIL_EXT="$PJLIB_UTIL_EXT $ac_sdl_ldflags"
++ PJMEDIA_VIDEODEV_EXT="$PJMEDIA_VIDEODEV_EXT $ac_sdl_ldflags"
++ PJNATH_EXT="$PJNATH_EXT $ac_sdl_ldflags"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Unsupported SDL version" >&5
+ $as_echo "Unsupported SDL version" >&6; }
+@@ -7050,7 +7057,11 @@ fi
+
+ fi
+
+- LIBS="$LIBS $ac_ffmpeg_ldflags"
++ PJLIB_UTIL_EXT="$PJLIB_UTIL_EXT $ac_ffmpeg_ldflags"
++ PJMEDIA_EXT="$PJMEDIA_EXT $ac_ffmpeg_ldflags"
++ PJMEDIA_CODEC_EXT="$PJMEDIA_CODEC_EXT $ac_ffmpeg_ldflags"
++ # FIXME: only needs libavutil
++ PJNATH_EXT="$PJNATH_EXT $ac_ffmpeg_ldflags"
+ export PKG_CONFIG_PATH=$SAVED_PKG_CONFIG_PATH
+
+
+@@ -7108,7 +7119,9 @@ $as_echo "$ac_cv_lib_v4l2_v4l2_open" >&6; }
+ if test "x$ac_cv_lib_v4l2_v4l2_open" = xyes; then :
+ ac_v4l2_cflags="-DPJMEDIA_VIDEO_DEV_HAS_V4L2=1"
+ ac_v4l2_ldflags="-lv4l2"
+- LIBS="$LIBS -lv4l2"
++ PJLIB_UTIL_EXT="$PJLIB_UTIL_EXT -lv4l2"
++ PJMEDIA_VIDEODEV_EXT="$PJMEDIA_VIDEODEV_EXT -lv4l2"
++ PJNATH_EXT="$PJNATH_EXT -lv4l2"
+
+
+ fi
+@@ -7878,6 +7891,7 @@ fi
+ $as_echo "$ac_cv_lib_opencore_amrnb_Encoder_Interface_init" >&6; }
+ if test "x$ac_cv_lib_opencore_amrnb_Encoder_Interface_init" = xyes; then :
+ opencore_amrnb_present=1 && LIBS="$LIBS -lopencore-amrnb"
++ opencore_amrnb_present=1 && PJLIB_UTIL_EXT="$PJLIB_UTIL_EXT -lopencore-amrnb" && PJNATH_EXT="$PJNATH_EXT -lopencore-amrnb"
+ fi
+
+ if test "x$opencore_amrnb_h_present" = "x1" -a "x$opencore_amrnb_present" = "x1"; then
+@@ -7943,7 +7957,7 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_opencore_amrwb_D_IF_init" >&5
+ $as_echo "$ac_cv_lib_opencore_amrwb_D_IF_init" >&6; }
+ if test "x$ac_cv_lib_opencore_amrwb_D_IF_init" = xyes; then :
+- opencore_amrwb_dec_present=1 && LIBS="$LIBS -lopencore-amrwb"
++ opencore_amrwb_dec_present=1 && PJLIB_UTIL_EXT="$PJLIB_UTIL_EXT -lopencore-amrnb" && PJNATH_EXT="$PJNATH_EXT -lopencore-amrwb"
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for E_IF_init in -lvo-amrwbenc" >&5
+diff --git a/aconfigure.ac b/aconfigure.ac
- index 72446dd..db287a1 100644
++index 72446dd..8a4fee8 100644
+--- a/aconfigure.ac
++++ b/aconfigure.ac
+@@ -115,6 +115,11 @@ AC_CHECK_LIB(socket,puts)
+ AC_CHECK_LIB(rt,puts)
+ AC_CHECK_LIB(m,sin)
+ AC_SUBST(PJLIB_EXT)
++AC_SUBST(PJLIB_UTIL_EXT)
++AC_SUBST(PJMEDIA_EXT)
++AC_SUBST(PJMEDIA_CODEC_EXT)
++AC_SUBST(PJMEDIA_VIDEODEV_EXT)
++AC_SUBST(PJNATH_EXT)
+ AC_CHECK_LIB(uuid,uuid_generate,[PJLIB_EXT="-luuid $PJLIB_EXT"])
+ AC_CHECK_LIB(uuid,uuid_generate,[ac_has_uuid_lib=1])
+ AC_SEARCH_LIBS(gethostbyname,nsl)
- @@ -951,7 +956,9 @@ AC_ARG_ENABLE(sdl,
++@@ -951,7 +956,7 @@ AC_ARG_ENABLE(sdl,
+ ac_sdl_cflags=`$SDL_CONFIG --cflags`
+ ac_sdl_cflags="-DPJMEDIA_VIDEO_DEV_HAS_SDL=1 $ac_sdl_cflags"
+ ac_sdl_ldflags=`$SDL_CONFIG --libs`
+- LIBS="$LIBS $ac_sdl_ldflags"
- + PJLIB_UTIL_EXT="$PJLIB_UTIL_EXT $ac_sdl_ldflags"
++ PJMEDIA_VIDEODEV_EXT="$PJMEDIA_VIDEODEV_EXT $ac_sdl_ldflags"
- + PJNATH_EXT="$PJNATH_EXT $ac_sdl_ldflags"
+ else
+ AC_MSG_RESULT([Unsupported SDL version])
+ fi
- @@ -1088,7 +1095,11 @@ AC_ARG_ENABLE(ffmpeg,
++@@ -1088,7 +1093,9 @@ AC_ARG_ENABLE(ffmpeg,
+
+ fi
+
+- LIBS="$LIBS $ac_ffmpeg_ldflags"
- + PJLIB_UTIL_EXT="$PJLIB_UTIL_EXT $ac_ffmpeg_ldflags"
++ PJMEDIA_EXT="$PJMEDIA_EXT $ac_ffmpeg_ldflags"
++ PJMEDIA_CODEC_EXT="$PJMEDIA_CODEC_EXT $ac_ffmpeg_ldflags"
++ # FIXME: only needs libavutil
- + PJNATH_EXT="$PJNATH_EXT $ac_ffmpeg_ldflags"
+ export PKG_CONFIG_PATH=$SAVED_PKG_CONFIG_PATH
+ ]
+ )
- @@ -1109,7 +1120,10 @@ AC_ARG_ENABLE(v4l2,
++@@ -1109,7 +1116,8 @@ AC_ARG_ENABLE(v4l2,
+ v4l2_open,
+ [ac_v4l2_cflags="-DPJMEDIA_VIDEO_DEV_HAS_V4L2=1"
+ ac_v4l2_ldflags="-lv4l2"
+- LIBS="$LIBS -lv4l2"
- + PJLIB_UTIL_EXT="$PJLIB_UTIL_EXT -lv4l2"
++ PJMEDIA_VIDEODEV_EXT="$PJMEDIA_VIDEODEV_EXT -lv4l2"
- + PJNATH_EXT="$PJNATH_EXT -lv4l2"
++
+ ]
+ )
+ ])
- @@ -1611,7 +1625,7 @@ AC_ARG_ENABLE(opencore_amr,
++@@ -1611,7 +1619,7 @@ AC_ARG_ENABLE(opencore_amr,
+ AC_SUBST(opencore_amrnb_h_present)
+ AC_SUBST(opencore_amrnb_present)
+ AC_CHECK_HEADER(opencore-amrnb/interf_enc.h,[opencore_amrnb_h_present=1])
+- AC_CHECK_LIB(opencore-amrnb,Encoder_Interface_init,[opencore_amrnb_present=1 && LIBS="$LIBS -lopencore-amrnb"])
- + AC_CHECK_LIB(opencore-amrnb,Encoder_Interface_init,[opencore_amrnb_present=1 && PJLIB_UTIL_EXT="$PJLIB_UTIL_EXT -lopencore-amrnb" && PJNATH_EXT="$PJNATH_EXT -lopencore-amrnb" ])
+++ AC_CHECK_LIB(opencore-amrnb,Encoder_Interface_init,[opencore_amrnb_present=1])
+ if test "x$opencore_amrnb_h_present" = "x1" -a "x$opencore_amrnb_present" = "x1"; then
+ AC_MSG_RESULT([OpenCORE AMR-NB library found, AMR-NB support enabled])
+ AC_DEFINE(PJMEDIA_HAS_OPENCORE_AMRNB_CODEC,1)
- @@ -1625,7 +1639,7 @@ AC_ARG_ENABLE(opencore_amr,
++@@ -1625,7 +1633,7 @@ AC_ARG_ENABLE(opencore_amr,
+ AC_SUBST(opencore_amrwb_dec_present)
+ AC_CHECK_HEADER(vo-amrwbenc/enc_if.h,[opencore_amrwb_enc_h_present=1])
+ AC_CHECK_HEADER(opencore-amrwb/dec_if.h,[opencore_amrwb_dec_h_present=1])
+- AC_CHECK_LIB(opencore-amrwb,D_IF_init,[opencore_amrwb_dec_present=1 && LIBS="$LIBS -lopencore-amrwb"])
- + AC_CHECK_LIB(opencore-amrwb,D_IF_init,[opencore_amrwb_dec_present=1 && PJLIB_UTIL_EXT="$PJLIB_UTIL_EXT -lopencore-amrnb" && PJNATH_EXT="$PJNATH_EXT -lopencore-amrwb" ])
+++ AC_CHECK_LIB(opencore-amrwb,D_IF_init,[opencore_amrwb_dec_present=1])
+ AC_CHECK_LIB(vo-amrwbenc,E_IF_init,[opencore_amrwb_enc_present=1 && LIBS="$LIBS -lvo-amrwbenc"])
+ if test "x$opencore_amrwb_enc_h_present" = "x1" -a "x$opencore_amrwb_dec_h_present" = "x1" -a "x$opencore_amrwb_enc_present" = "x1" -a "x$opencore_amrwb_dec_present" = "x1"; then
+ AC_MSG_RESULT([OpenCORE AMR-WB library found, AMR-WB support enabled])
+diff --git a/build.mak.in b/build.mak.in
+index 5c4fc40..4555ae9 100644
+--- a/build.mak.in
++++ b/build.mak.in
+@@ -29,6 +29,11 @@ export APP_THIRD_PARTY_LIBS :=
+ export APP_THIRD_PARTY_LIB_FILES :=
+
+ PJLIB_EXT = @PJLIB_EXT@
++PJLIB_UTIL_EXT = @PJLIB_UTIL_EXT@
++PJMEDIA_EXT = @PJMEDIA_EXT@
++PJMEDIA_CODEC_EXT = @PJMEDIA_CODEC_EXT@
++PJMEDIA_VIDEODEV_EXT = @PJMEDIA_VIDEODEV_EXT@
++PJNATH_EXT = @PJNATH_EXT@
+
+ ifeq (@ac_external_srtp@,1)
+ # External SRTP library
+diff --git a/pjlib-util/build/Makefile b/pjlib-util/build/Makefile
+index a03a558..56bc055 100644
+--- a/pjlib-util/build/Makefile
++++ b/pjlib-util/build/Makefile
+@@ -43,7 +43,7 @@ export PJLIB_UTIL_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
+ stun_simple_client.o xml.o
+ export PJLIB_UTIL_CFLAGS += $(_CFLAGS)
+ export PJLIB_UTIL_CXXFLAGS += $(_CXXFLAGS)
+-export PJLIB_UTIL_LDFLAGS += $(PJLIB_LDLIB) $(_LDFLAGS)
++export PJLIB_UTIL_LDFLAGS += $(PJLIB_LDLIB) $(PJLIB_UTIL_EXT) $(_LDFLAGS)
+
+ ###############################################################################
+ # Defines for building test application
+diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile
+index 340bfc4..83d852a 100644
+--- a/pjmedia/build/Makefile
++++ b/pjmedia/build/Makefile
+@@ -85,6 +85,7 @@ export PJMEDIA_LDFLAGS += $(PJMEDIA_VIDEODEV_LDLIB) \
+ $(PJLIB_UTIL_LDLIB) \
+ $(PJNATH_LDLIB) \
+ $(PJMEDIA_EXT) \
++ $(PJMEDIA_VIDEODEV_EXT) \
+ $(_LDFLAGS)
+
+
+diff --git a/pjnath/build/Makefile b/pjnath/build/Makefile
+index 5f08a8a..8fb976d 100644
+--- a/pjnath/build/Makefile
++++ b/pjnath/build/Makefile
+@@ -43,7 +43,8 @@ export PJNATH_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
+ stun_transaction.o turn_session.o turn_sock.o
+ export PJNATH_CFLAGS += $(_CFLAGS)
+ export PJNATH_CXXFLAGS += $(_CXXFLAGS)
+-export PJNATH_LDFLAGS += $(PJLIB_UTIL_LDLIB) $(PJLIB_LDLIB) $(_LDFLAGS)
++export PJNATH_LDFLAGS += $(PJLIB_UTIL_LDLIB) $(PJLIB_LDLIB) $(PJNATH_EXT) \
++ $(_LDFLAGS)
+
+ ###############################################################################
+ # Defines for building test application
diff --cc debian/patches/0008-Replace-deprecated-FFmpeg-API.patch
index 04eb153,0000000..a18aeb5
mode 100644,000000..100644
--- a/debian/patches/0008-Replace-deprecated-FFmpeg-API.patch
+++ b/debian/patches/0008-Replace-deprecated-FFmpeg-API.patch
@@@ -1,212 -1,0 +1,212 @@@
- From 6dc6353dfc8009504c17367d9e6a14dba12d2d02 Mon Sep 17 00:00:00 2001
++From 5cc014539ad566cfcf24bb340c5af59a61d8bdb7 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/0009-add-v5-suffix-to-soname-of-libpjsua2-2.patch
index 914e596,0000000..7cae1a1
mode 100644,000000..100644
--- a/debian/patches/0009-add-v5-suffix-to-soname-of-libpjsua2-2.patch
+++ b/debian/patches/0009-add-v5-suffix-to-soname-of-libpjsua2-2.patch
@@@ -1,40 -1,0 +1,40 @@@
- From c9d40b9830767ef21a09eaa15272f9ca0ce08bfc Mon Sep 17 00:00:00 2001
++From 4913c2bf236ef073b5d44ac4d3bf74b684511fa3 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
+--- 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
+
+ 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
+
+ ###############################################################################
--
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