[Pkg-voip-commits] [sflphone] 23/30: Patch system_pjproject: use system copy of pjproject

[tzafrir at debian.org]

This is an automated email from the git hooks/post-receive script.

tzafrir pushed a commit to branch master
in repository sflphone.

commit 92026aaddd9feb5650263d044bc844c31ccf840e
Author: Tzafrir Cohen <tzafrir at debian.org>
Date:   Tue Jul 30 16:40:07 2013 +0000

    Patch system_pjproject: use system copy of pjproject
    
    Add a patch (not enabled in the series file for now) to build sflphone
    using the system copy of pjproject.
    
    git-svn-id: svn://anonscm.alioth.debian.org/svn/pkg-voip/sflphone/trunk@10261 5e74be4b-f5d6-0310-a852-e9e23c5afa6a
---
 debian/patches/system_pjproject.patch | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/debian/patches/system_pjproject.patch b/debian/patches/system_pjproject.patch
new file mode 100644
index 0000000..0a0b04a
--- /dev/null
+++ b/debian/patches/system_pjproject.patch
@@ -0,0 +1,34 @@
+Description: Initial support for building with system pjproject
+Author: Tzafrir Cohen <tzafrir at debian.org>
+Forwarded: no
+
+A patch intended to demonstrate building with a system copy of pjproject.
+
+--- a/daemon/globals.mak
++++ b/daemon/globals.mak
+@@ -9,15 +9,9 @@ ASTYLERC="$(top_srcdir)/../astylerc"
+ indent="/usr/bin/astyle"
+ 
+ # for pjsip
+-include $(src)/libs/pjproject-2.0.1/build.mak
+-PJSIP_LIBS=$(APP_LDFLAGS) $(APP_LDLIBS)
++PJSIP_LIBS=$(shell pkg-config --libs libpjproject) -lpj
+ 
+-SIP_CFLAGS=-I$(src)/libs/pjproject-2.0.1/pjsip/include \
+-		   -I$(src)/libs/pjproject-2.0.1/pjlib/include \
+-		   -I$(src)/libs/pjproject-2.0.1/pjlib-util/include \
+-		   -I$(src)/libs/pjproject-2.0.1/pjmedia/include \
+-		   -I$(src)/libs/pjproject-2.0.1/pjnath/include \
+-		   -DPJ_AUTOCONF=1
++SIP_CFLAGS=$(shell pkg-config --cflags libpjproject)
+ 
+ if BUILD_SPEEX
+ SPEEXCODEC=-DHAVE_SPEEX_CODEC
+@@ -35,7 +29,6 @@ endif
+ AM_CPPFLAGS = \
+ 	-I$(src)/libs \
+ 	-I$(src)/libs/iax2 \
+-	-I$(src)/libs/pjproject-2.0.1 \
+ 	-I$(src)/src \
+ 	-I$(src)/src/config \
+ 	-I$(src)/test \

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