[Pkg-voip-commits] [pjproject] 03/10: Drop 0002-Reduce-number-of-libraries-linked-with-pjlib.patch
Bernhard Schmidt
berni at moszumanska.debian.org
Thu Oct 5 21:38:13 UTC 2017
This is an automated email from the git hooks/post-receive script.
berni pushed a commit to branch master
in repository pjproject.
commit df9464116d32d9bc5114b6ad7c30f15627ed8b9c
Author: Bernhard Schmidt <berni at debian.org>
Date: Thu Oct 5 22:58:03 2017 +0200
Drop 0002-Reduce-number-of-libraries-linked-with-pjlib.patch
Largely ineffective with -Wl,--as-needed
Also remove old patches not in use anymore
---
...1-Remove-pointless-linking-with-libasound.patch | 27 -----
...uce-number-of-libraries-linked-with-pjlib.patch | 57 ---------
.../0006-Reduce-linkage-of-unused-libraries.patch | 131 ---------------------
debian/patches/series | 3 -
4 files changed, 218 deletions(-)
diff --git a/debian/patches/0001-Remove-pointless-linking-with-libasound.patch b/debian/patches/0001-Remove-pointless-linking-with-libasound.patch
deleted file mode 100644
index 20c025b..0000000
--- a/debian/patches/0001-Remove-pointless-linking-with-libasound.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: =?utf-8?q?Jeremy_Lain=C3=A9?= <jeremy.laine at m4x.org>
-Date: Thu, 30 Oct 2014 08:09:41 +0200
-Subject: Remove pointless linking with libasound
-
-Upstream: no
-
-All libraries and applications were being linked against libasound,
-but it was not being used anywhere.
-
-Upstream says: this cannot be merged as-is.
----
- aconfigure.ac | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
---- a/aconfigure.ac
-+++ b/aconfigure.ac
-@@ -726,9 +726,7 @@
- dnl # Check if ALSA is available
- ac_pjmedia_snd=alsa
- AC_SUBST(ac_pa_use_alsa,1)
-- AC_CHECK_HEADER(alsa/version.h,
-- [LIBS="$LIBS -lasound"],
-- [ac_pa_use_alsa=0])
-+ AC_CHECK_HEADER(alsa/version.h, [], [ac_pa_use_alsa=0])
- AC_MSG_RESULT([Checking sound device backend... unix])
-
- dnl # Check if OSS is disabled
diff --git a/debian/patches/0002-Reduce-number-of-libraries-linked-with-pjlib.patch b/debian/patches/0002-Reduce-number-of-libraries-linked-with-pjlib.patch
deleted file mode 100644
index 17d9fa8..0000000
--- a/debian/patches/0002-Reduce-number-of-libraries-linked-with-pjlib.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From: =?utf-8?q?Jeremy_Lain=C3=A9?= <jeremy.laine at m4x.org>
-Date: Thu, 30 Oct 2014 08:09:42 +0200
-Subject: Reduce number of libraries linked with pjlib
-
-All libraries and applications were gratuitously linked against
-libcrypto, libssl and libuuid, but only libpj needs them.
----
- aconfigure.ac | 7 ++++---
- build.mak.in | 2 ++
- pjlib/build/Makefile | 2 +-
- 3 files changed, 7 insertions(+), 4 deletions(-)
-
---- a/aconfigure.ac
-+++ b/aconfigure.ac
-@@ -113,7 +113,8 @@
- AC_CHECK_LIB(socket,puts)
- AC_CHECK_LIB(rt,puts)
- AC_CHECK_LIB(m,sin)
--AC_CHECK_LIB(uuid,uuid_generate)
-+AC_SUBST(PJLIB_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)
-
-@@ -1552,8 +1553,8 @@
- AC_SUBST(libssl_present)
- AC_SUBST(libcrypto_present)
- AC_CHECK_HEADER(openssl/ssl.h,[openssl_h_present=1])
-- AC_CHECK_LIB(crypto,ERR_load_BIO_strings,[libcrypto_present=1 && LIBS="-lcrypto $LIBS"])
-- AC_CHECK_LIB(ssl,SSL_CTX_new,[libssl_present=1 && LIBS="-lssl $LIBS"])
-+ AC_CHECK_LIB(crypto,ERR_load_BIO_strings,[libcrypto_present=1 && PJLIB_EXT="-lcrypto $PJLIB_EXT"])
-+ AC_CHECK_LIB(ssl,SSL_CTX_new,[libssl_present=1 && PJLIB_EXT="-lssl $PJLIB_EXT"])
- if test "x$openssl_h_present" = "x1" -a "x$libssl_present" = "x1" -a "x$libcrypto_present" = "x1"; then
- AC_MSG_RESULT([OpenSSL library found, SSL support enabled])
-
---- a/build.mak.in
-+++ b/build.mak.in
-@@ -28,6 +28,8 @@
- export APP_THIRD_PARTY_LIBS :=
- export APP_THIRD_PARTY_LIB_FILES :=
-
-+PJLIB_EXT = @PJLIB_EXT@
-+
- ifeq (@ac_external_srtp@,1)
- # External SRTP library
- APP_THIRD_PARTY_EXT += -lsrtp
---- a/pjlib/build/Makefile
-+++ b/pjlib/build/Makefile
-@@ -39,7 +39,7 @@
- string.o timer.o types.o
- export PJLIB_CFLAGS += $(_CFLAGS)
- export PJLIB_CXXFLAGS += $(_CXXFLAGS)
--export PJLIB_LDFLAGS += $(_LDFLAGS)
-+export PJLIB_LDFLAGS += $(PJLIB_EXT) $(_LDFLAGS)
-
- ###############################################################################
- # Defines for building test application
diff --git a/debian/patches/0006-Reduce-linkage-of-unused-libraries.patch b/debian/patches/0006-Reduce-linkage-of-unused-libraries.patch
deleted file mode 100644
index 910ba2d..0000000
--- a/debian/patches/0006-Reduce-linkage-of-unused-libraries.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-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.ac | 24 +++++++++++++++++++-----
- build.mak.in | 5 +++++
- pjlib-util/build/Makefile | 2 +-
- pjmedia/build/Makefile | 1 +
- pjnath/build/Makefile | 3 ++-
- 5 files changed, 28 insertions(+), 7 deletions(-)
-
---- a/aconfigure.ac
-+++ b/aconfigure.ac
-@@ -114,6 +114,11 @@
- 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)
-@@ -1044,7 +1049,9 @@
- 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
-@@ -1183,7 +1190,11 @@
- [[#include <libavformat/avformat.h>]]
- )
-
-- 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
- ]
- )
-@@ -1204,7 +1215,10 @@
- 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"
-+
- ]
- )
- ])
-@@ -1645,7 +1659,7 @@
- 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)
-@@ -1659,7 +1673,7 @@
- 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])
---- a/build.mak.in
-+++ b/build.mak.in
-@@ -29,6 +29,11 @@
- 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
---- a/pjlib-util/build/Makefile
-+++ b/pjlib-util/build/Makefile
-@@ -43,7 +43,7 @@
- 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
---- a/pjmedia/build/Makefile
-+++ b/pjmedia/build/Makefile
-@@ -83,6 +83,7 @@
- $(PJLIB_UTIL_LDLIB) \
- $(PJNATH_LDLIB) \
- $(PJMEDIA_EXT) \
-+ $(PJMEDIA_VIDEODEV_EXT) \
- $(_LDFLAGS)
-
-
---- a/pjnath/build/Makefile
-+++ b/pjnath/build/Makefile
-@@ -43,7 +43,8 @@
- 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 --git a/debian/patches/series b/debian/patches/series
index eef2bc3..bfe91e9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,6 @@
-#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-Remove-video-libs-dependency-for-pj-utils-and-pjnath.patch
-#0006-Reduce-linkage-of-unused-libraries.patch
0007-add-v5-suffix-to-soname-of-libpjsua2-2.patch
asterisk/0019-Parse-zero-length-multipart-body-parts-correctly.patch
asterisk/0020-Ensure-2543-transaction-key-buffer-is-large-enough.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