[Pkg-voip-commits] [pjproject] 10/42: Initialize git-dpm
tzafrir at debian.org
tzafrir at debian.org
Sat Nov 1 17:13:54 UTC 2014
This is an automated email from the git hooks/post-receive script.
tzafrir pushed a commit to branch master-2.3
in repository pjproject.
commit af63f6c7b422a1822f1d799ffd439d63ee80c990
Merge: 9fe5f87 d0bad6e
Author: Tzafrir Cohen <tzafrir at debian.org>
Date: Thu Oct 30 08:09:45 2014 +0200
Initialize git-dpm
Makefile | 1 +
aconfigure | 9 ++-
aconfigure.ac | 8 +--
build.mak.in | 9 ++-
debian/.git-dpm | 8 +++
...-Remove-pointless-linking-with-libasound.patch} | 19 ++++--
...ce-number-of-libraries-linked-with-pjlib.patch} | 74 +++++++++++++---------
...-number-of-libraries-linked-with-pjmedia.patch} | 20 ++++--
.../0004-Enable-building-python-bindings.patch | 21 ++++++
debian/patches/pjsip_python.patch | 12 ----
debian/patches/series | 8 +--
pjlib/build/Makefile | 2 +-
pjmedia/build/Makefile | 3 +
13 files changed, 127 insertions(+), 67 deletions(-)
diff --cc debian/.git-dpm
index 0000000,0000000..aebd0c0
new file mode 100644
--- /dev/null
+++ b/debian/.git-dpm
@@@ -1,0 -1,0 +1,8 @@@
++# see git-dpm(1) from git-dpm package
++d0bad6effb8f5b14eafe410a18077c9fc292582f
++d0bad6effb8f5b14eafe410a18077c9fc292582f
++0f2fb3560bfd7eccacf6e240a6a344e1dc266b2f
++0f2fb3560bfd7eccacf6e240a6a344e1dc266b2f
++pjproject_2.3~dfsg.orig.tar.bz2
++5f73a3784e4d6c2e7300f583bab27bad3ec1ae48
++4402101
diff --cc debian/patches/0001-Remove-pointless-linking-with-libasound.patch
index 8983348,0000000..0a07350
mode 100644,000000..100644
--- a/debian/patches/0001-Remove-pointless-linking-with-libasound.patch
+++ b/debian/patches/0001-Remove-pointless-linking-with-libasound.patch
@@@ -1,30 -1,0 +1,41 @@@
- Author: Jeremy Lainé <jeremy.laine at m4x.org>
- Description: Remove pointless linking with libasound
++From 043842736ad6538ac436c7c7e3159d0f25e7af94 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Jeremy=20Lain=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 | 2 --
++ aconfigure.ac | 1 -
++ 2 files changed, 3 deletions(-)
+
++diff --git a/aconfigure b/aconfigure
++index ba0e6d2..53103b7 100755
+--- a/aconfigure
++++ b/aconfigure
- @@ -5994,8 +5994,6 @@ $as_echo "Checking sound device backend.
++@@ -6100,8 +6100,6 @@ $as_echo "Checking sound device backend... null sound" >&6; }
+ if test "x$ac_cv_header_alsa_version_h" = xyes; then :
+ ac_pa_use_alsa=1
+
+- LIBS="$LIBS -lasound"
+-
+ else
+ ac_pa_use_alsa=0
+
++diff --git a/aconfigure.ac b/aconfigure.ac
++index b7bf92e..da26c98 100644
+--- a/aconfigure.ac
++++ b/aconfigure.ac
- @@ -635,7 +635,6 @@ else
++@@ -654,7 +654,6 @@ else
+ ac_pjmedia_snd=pa_unix
+ AC_CHECK_HEADER(alsa/version.h,
+ [AC_SUBST(ac_pa_use_alsa,1)
+- LIBS="$LIBS -lasound"
+ ],
+ [AC_SUBST(ac_pa_use_alsa,0)])
+ AC_MSG_RESULT([Checking sound device backend... unix])
diff --cc debian/patches/0002-Reduce-number-of-libraries-linked-with-pjlib.patch
index 8c96a09,0000000..c9181fc
mode 100644,000000..100644
--- a/debian/patches/0002-Reduce-number-of-libraries-linked-with-pjlib.patch
+++ b/debian/patches/0002-Reduce-number-of-libraries-linked-with-pjlib.patch
@@@ -1,88 -1,0 +1,104 @@@
- Author: Jeremy Lainé <jeremy.laine at m4x.org>
- Description: Reduce number of libraries linked with pjlib
++From 4fb5aa8025e519c66d8e6ebeab3fe4cf64b0c9b8 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Jeremy=20Lain=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 | 7 ++++---
++ aconfigure.ac | 7 ++++---
++ build.mak.in | 2 ++
++ pjlib/build/Makefile | 2 +-
++ 4 files changed, 11 insertions(+), 7 deletions(-)
+
++diff --git a/aconfigure b/aconfigure
++index 53103b7..33df882 100755
+--- a/aconfigure
++++ b/aconfigure
- @@ -592,6 +592,7 @@ ac_includes_default="\
++@@ -620,6 +620,7 @@ ac_includes_default="\
+
+ ac_subst_vars='LTLIBOBJS
+ LIBOBJS
++PJLIB_EXT
+ ac_main_obj
+ ac_host
+ ac_linux_poll
- @@ -4171,7 +4172,7 @@ if test "x$ac_cv_lib_uuid_uuid_generate"
++@@ -4211,7 +4212,7 @@ if test "x$ac_cv_lib_uuid_uuid_generate" = xyes; then :
+ #define HAVE_LIBUUID 1
+ _ACEOF
+
+- LIBS="-luuid $LIBS"
++ PJLIB_EXT="-luuid $PJLIB_EXT"
+
+ fi
+
- @@ -7299,7 +7300,7 @@ fi
++@@ -7665,7 +7666,7 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_ERR_load_BIO_strings" >&5
+ $as_echo "$ac_cv_lib_crypto_ERR_load_BIO_strings" >&6; }
+ if test "x$ac_cv_lib_crypto_ERR_load_BIO_strings" = xyes; then :
+- libcrypto_present=1 && LIBS="$LIBS -lcrypto"
++ libcrypto_present=1 && PJLIB_EXT="$PJLIB_EXT -lcrypto"
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_library_init in -lssl" >&5
- @@ -7339,7 +7340,7 @@ fi
++@@ -7705,7 +7706,7 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_library_init" >&5
+ $as_echo "$ac_cv_lib_ssl_SSL_library_init" >&6; }
+ if test "x$ac_cv_lib_ssl_SSL_library_init" = xyes; then :
+- libssl_present=1 && LIBS="$LIBS -lssl"
++ libssl_present=1 && PJLIB_EXT="$PJLIB_EXT -lssl"
+ fi
+
+ if test "x$openssl_h_present" = "x1" -a "x$libssl_present" = "x1" -a "x$libcrypto_present" = "x1"; then
- --- a/build.mak.in
- +++ b/build.mak.in
- @@ -28,6 +28,8 @@ export APP_THIRD_PARTY_EXT :=
- 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
- @@ -38,7 +38,7 @@ export PJLIB_OBJS += $(OS_OBJS) $(M_OBJS
- 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/aconfigure.ac b/aconfigure.ac
++index da26c98..6ac93b5 100644
+--- a/aconfigure.ac
++++ b/aconfigure.ac
+@@ -114,7 +114,8 @@ AC_CHECK_LIB(winmm,puts)
+ 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)
+
- @@ -1343,8 +1344,8 @@ AC_ARG_ENABLE(ssl,
++@@ -1513,8 +1514,8 @@ AC_ARG_ENABLE(ssl,
+ 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="$LIBS -lcrypto"])
+- AC_CHECK_LIB(ssl,SSL_library_init,[libssl_present=1 && LIBS="$LIBS -lssl"])
++ AC_CHECK_LIB(crypto,ERR_load_BIO_strings,[libcrypto_present=1 && PJLIB_EXT="$PJLIB_EXT -lcrypto"])
++ AC_CHECK_LIB(ssl,SSL_library_init,[libssl_present=1 && PJLIB_EXT="$PJLIB_EXT -lssl"])
+ 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])
+ # PJSIP_HAS_TLS_TRANSPORT setting follows PJ_HAS_SSL_SOCK
++diff --git a/build.mak.in b/build.mak.in
++index 61b156d..9f192e4 100644
++--- a/build.mak.in
+++++ b/build.mak.in
++@@ -28,6 +28,8 @@ export APP_THIRD_PARTY_EXT :=
++ 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
++diff --git a/pjlib/build/Makefile b/pjlib/build/Makefile
++index 1e64950..2bd2b90 100644
++--- a/pjlib/build/Makefile
+++++ b/pjlib/build/Makefile
++@@ -39,7 +39,7 @@ export PJLIB_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
++ 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 --cc debian/patches/0003-Reduce-number-of-libraries-linked-with-pjmedia.patch
index 921b4cf,0000000..141da8e
mode 100644,000000..100644
--- a/debian/patches/0003-Reduce-number-of-libraries-linked-with-pjmedia.patch
+++ b/debian/patches/0003-Reduce-number-of-libraries-linked-with-pjmedia.patch
@@@ -1,63 -1,0 +1,73 @@@
- Author: Jeremy Lainé <jeremy.laine at m4x.org>
- Description: Reduce number of libraries linked with pjmedia
++From 472e4b78decbce53e53499d90f34939e58a2fdfd Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= <jeremy.laine at m4x.org>
++Date: Thu, 30 Oct 2014 08:09:43 +0200
++Subject: Reduce number of libraries linked with pjmedia
+
+All libraries and applications were gratuitously linked against
+libgsm, libportaudio, libspeex and libspeexdsp but only pjmedia
+needs them.
++---
++ build.mak.in | 7 ++++---
++ pjmedia/build/Makefile | 3 +++
++ 2 files changed, 7 insertions(+), 3 deletions(-)
+
++diff --git a/build.mak.in b/build.mak.in
++index 9f192e4..b151a7f 100644
+--- a/build.mak.in
++++ b/build.mak.in
+@@ -62,7 +62,7 @@ endif
+ ifneq (@ac_no_gsm_codec@,1)
+ ifeq (@ac_external_gsm@,1)
+ # External GSM library
+-APP_THIRD_PARTY_EXT += -lgsm
++PJMEDIA_CODEC_EXT += -lgsm
+ else
+ APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libgsmcodec-$(LIB_SUFFIX)
+ ifeq ($(PJ_SHARED_LIBRARIES),)
+@@ -76,7 +76,8 @@ endif
+
+ ifneq (@ac_no_speex_codec@,1)
+ ifeq (@ac_external_speex@,1)
+-APP_THIRD_PARTY_EXT += -lspeex -lspeexdsp
++PJMEDIA_EXT += -lspeexdsp
++PJMEDIA_CODEC_EXT += -lspeex
+ else
+ APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libspeex-$(LIB_SUFFIX)
+ ifeq ($(PJ_SHARED_LIBRARIES),)
+@@ -111,7 +112,7 @@ endif
+ ifneq ($(findstring pa, at ac_pjmedia_snd@),)
+ ifeq (@ac_external_pa@,1)
+ # External PA
+-APP_THIRD_PARTY_EXT += -lportaudio
++PJMEDIA_AUDIODEV_EXT += -lportaudio
+ else
+ APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libportaudio-$(LIB_SUFFIX)
+ ifeq ($(PJ_SHARED_LIBRARIES),)
++diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile
++index 54395c3..fe6b8a1 100644
+--- a/pjmedia/build/Makefile
++++ b/pjmedia/build/Makefile
- @@ -84,6 +84,7 @@ export PJMEDIA_LDFLAGS += $(PJMEDIA_VIDE
++@@ -84,6 +84,7 @@ export PJMEDIA_LDFLAGS += $(PJMEDIA_VIDEODEV_LDLIB) \
+ $(PJLIB_LDLIB) \
+ $(PJLIB_UTIL_LDLIB) \
+ $(PJNATH_LDLIB) \
++ $(PJMEDIA_EXT) \
+ $(_LDFLAGS)
+
+
- @@ -98,6 +99,7 @@ export PJMEDIA_AUDIODEV_OBJS += audiode
++@@ -98,6 +99,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) \
++ $(PJMEDIA_AUDIODEV_EXT) \
+ $(_LDFLAGS)
+
+
- @@ -145,6 +147,7 @@ export PJMEDIA_CODEC_CXXFLAGS += $(_CXXF
++@@ -145,6 +147,7 @@ export PJMEDIA_CODEC_CXXFLAGS += $(_CXXFLAGS) $(GSM_CFLAGS) $(SPEEX_CFLAGS) \
+ $(ILBC_CFLAGS) $(IPP_CFLAGS) $(G7221_CFLAGS)
+ export PJMEDIA_CODEC_LDFLAGS += $(PJMEDIA_LDLIB) \
+ $(PJLIB_LDLIB) \
++ $(PJMEDIA_CODEC_EXT) \
+ $(_LDFLAGS)
+
+ ###############################################################################
diff --cc debian/patches/0004-Enable-building-python-bindings.patch
index 0000000,0000000..e9b1158
new file mode 100644
--- /dev/null
+++ b/debian/patches/0004-Enable-building-python-bindings.patch
@@@ -1,0 -1,0 +1,21 @@@
++From d0bad6effb8f5b14eafe410a18077c9fc292582f 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/series
index 9e710de,0000000..2d05947
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,0 +1,4 @@@
- no_libasound.patch
- reduce_pjlib_linkage.patch
- reduce_pjmedia_linkage.patch
- pjsip_python.patch
++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
--
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