[Pkg-voip-commits] [pjproject] 39/42: merge patched into master

[tzafrir at debian.org]

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 3b8ad4926a47936a76e95f9bc5e53bc52c2721a9
Merge: 6c393b7 f6f091a
Author: Tzafrir Cohen <tzafrir at debian.org>
Date:   Sat Nov 1 12:15:13 2014 +0200

    merge patched into master

 build.mak.in                                       |  1 -
 debian/.git-dpm                                    |  4 +-
 ...umber-of-libraries-linked-with-pjlib-util.patch | 24 ----------
 ...o-libs-dependency-for-pj-utils-and-pjnath.patch | 52 ++++++++++++++++++++++
 debian/patches/series                              |  2 +-
 pjlib-util/build/Makefile                          |  4 +-
 pjnath/build/Makefile                              |  2 +-
 7 files changed, 58 insertions(+), 31 deletions(-)

diff --cc debian/.git-dpm
index ac3a361,0000000..4342a2a
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
- 7fb336c5cf412a5edc516c752476b4c3b0f618ac
- 7fb336c5cf412a5edc516c752476b4c3b0f618ac
++f6f091a5e5f419d36ebcd08c32698a5856a27c18
++f6f091a5e5f419d36ebcd08c32698a5856a27c18
 +0f2fb3560bfd7eccacf6e240a6a344e1dc266b2f
 +0f2fb3560bfd7eccacf6e240a6a344e1dc266b2f
 +pjproject_2.3~dfsg.orig.tar.bz2
 +5f73a3784e4d6c2e7300f583bab27bad3ec1ae48
 +4402101
diff --cc debian/patches/0006-Remove-video-libs-dependency-for-pj-utils-and-pjnath.patch
index 0000000,0000000..ef22860
new file mode 100644
--- /dev/null
+++ b/debian/patches/0006-Remove-video-libs-dependency-for-pj-utils-and-pjnath.patch
@@@ -1,0 -1,0 +1,52 @@@
++From f6f091a5e5f419d36ebcd08c32698a5856a27c18 Mon Sep 17 00:00:00 2001
++From: Tzafrir Cohen <tzafrir at debian.org>
++Date: Fri, 31 Oct 2014 23:14:49 +0200
++Subject: Remove video libs dependency for pj-utils and pjnath
++
++The video LD flags were duplicated on the app LD flags and the HOST
++LD flags. Remove them from the app LD flags. Remove HOST_LDFLAGS for
++some projects.
++---
++ build.mak.in              | 1 -
++ pjlib-util/build/Makefile | 2 +-
++ pjnath/build/Makefile     | 2 +-
++ 3 files changed, 2 insertions(+), 3 deletions(-)
++
++diff --git a/build.mak.in b/build.mak.in
++index b151a7f..d737572 100644
++--- a/build.mak.in
+++++ b/build.mak.in
++@@ -183,7 +183,6 @@ export APP_LDFLAGS := -L$(PJDIR)/pjlib/lib\
++ 	-L$(PJDIR)/pjmedia/lib\
++ 	-L$(PJDIR)/pjsip/lib\
++ 	-L$(PJDIR)/third_party/lib\
++-	$(PJ_VIDEO_LDFLAGS) \
++ 	@LDFLAGS@
++ export APP_LDXXFLAGS := $(APP_LDFLAGS)
++ 
++diff --git a/pjlib-util/build/Makefile b/pjlib-util/build/Makefile
++index cb601cb..a03a558 100644
++--- a/pjlib-util/build/Makefile
+++++ b/pjlib-util/build/Makefile
++@@ -28,7 +28,7 @@ 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) \
+++export _LDFLAGS := $(CC_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
++ 		   $(APP_LDFLAGS) $(LDFLAGS)
++ 
++ ###############################################################################
++diff --git a/pjnath/build/Makefile b/pjnath/build/Makefile
++index 1bc08b5..5f08a8a 100644
++--- a/pjnath/build/Makefile
+++++ b/pjnath/build/Makefile
++@@ -30,7 +30,7 @@ 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) \
+++export _LDFLAGS := $(CC_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
++ 		   $(APP_LDFLAGS) $(LDFLAGS) 
++ 
++ ###############################################################################
diff --cc debian/patches/series
index 3ec1260,0000000..8fc0a99
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,6 -1,0 +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-CODEC_ID_-changed-to-AV_CODEC_ID_.patch
- 0006-Reduce-number-of-libraries-linked-with-pjlib-util.patch
++0006-Remove-video-libs-dependency-for-pj-utils-and-pjnath.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/pjproject.git