[Pkg-voip-commits] [pjproject] 04/14: merge patched into master
tzafrir at debian.org
tzafrir at debian.org
Mon Aug 17 10:41:26 UTC 2015
This is an automated email from the git hooks/post-receive script.
tzafrir pushed a commit to branch master-broken
in repository pjproject.
commit 0ab2f1fdb356425043ab8515e528666d601688e2
Merge: 31723e7 4761f0b
Author: Tzafrir Cohen <tzafrir at debian.org>
Date: Fri Aug 14 09:45:20 2015 +0200
merge patched into master
aconfigure | 22 ++-
aconfigure.ac | 24 ++-
build.mak.in | 5 +
debian/.git-dpm | 4 +-
.../0008-Reduce-linkage-of-unused-libraries.patch | 211 +++++++++++++++++++++
debian/patches/series | 1 +
pjlib-util/build/Makefile | 2 +-
pjmedia/build/Makefile | 1 +
pjnath/build/Makefile | 3 +-
9 files changed, 260 insertions(+), 13 deletions(-)
diff --cc debian/.git-dpm
index d9ca0eb,0000000..5922582
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
- 1e1e3085f4541a11c3b6688476047218783fb4ba
- 1e1e3085f4541a11c3b6688476047218783fb4ba
++4761f0bc6664cb4f6e640257653f67cd66f33c22
++4761f0bc6664cb4f6e640257653f67cd66f33c22
+def680d5e127e3964d3b965931d9588a6b87170d
+def680d5e127e3964d3b965931d9588a6b87170d
+pjproject_2.4~dfsg.orig.tar.bz2
+5c8ab2ae101bafb132bf84a34159ac1371618b46
+4429619
diff --cc debian/patches/0008-Reduce-linkage-of-unused-libraries.patch
index 0000000,0000000..f5f9c87
new file mode 100644
--- /dev/null
+++ b/debian/patches/0008-Reduce-linkage-of-unused-libraries.patch
@@@ -1,0 -1,0 +1,211 @@@
++From 4761f0bc6664cb4f6e640257653f67cd66f33c22 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.
++---
++ aconfigure | 22 ++++++++++++++++++----
++ aconfigure.ac | 24 +++++++++++++++++++-----
++ build.mak.in | 5 +++++
++ pjlib-util/build/Makefile | 2 +-
++ pjmedia/build/Makefile | 1 +
++ pjnath/build/Makefile | 3 ++-
++ 6 files changed, 46 insertions(+), 11 deletions(-)
++
++diff --git a/aconfigure b/aconfigure
++index ea868d2..840c6c2 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
++@@ -7921,6 +7934,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
++@@ -7986,7 +8000,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 9d9bc26..876af02 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,
++ 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,
++
++ 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,
++ 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"
+++
++ ]
++ )
++ ])
++@@ -1615,7 +1629,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" ])
++ 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)
++@@ -1629,7 +1643,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(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 d8c7a55..615cbd5 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 fe6b8a1..926da47 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/series
index ef764f6,0000000..fd3704e
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,7 -1,0 +1,8 @@@
+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-Use-the-OpenSSL-RNG-if-available-for-SRTP.patch
++0008-Reduce-linkage-of-unused-libraries.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