← Back to branch summary

~ubuntu-branches/ubuntu/wily/sflphone/wily

« back to all changes in this revision

Viewing changes to daemon/globals.mak

  • Committer: Package Import Robot
  • Author(s): Mark Purcell
  • Date: 2014-01-28 18:23:36 UTC
  • mfrom: (1.1.11)
  • mto: This revision was merged to the branch mainline in revision 24.
  • Revision ID: package-import@ubuntu.com-20140128182336-3xenud1kbnwmf3mz
http://bugs.debian.org/735846
http://bugs.debian.org/727164
http://bugs.debian.org/718178
http://bugs.debian.org/736583
http://bugs.debian.org/722040
http://bugs.debian.org/736746
* New upstream release 
  - Fixes "New Upstream Release" (Closes: #735846)
  - Fixes "Ringtone does not stop" (Closes: #727164)
  - Fixes "[sflphone-kde] crash on startup" (Closes: #718178)
  - Fixes "sflphone GUI crashes when call is hung up" (Closes: #736583)
* Build-Depends: ensure GnuTLS 2.6
  - libucommon-dev (>= 6.0.7-1.1), libccrtp-dev (>= 2.0.6-3)
  - Fixes "FTBFS Build-Depends libgnutls{26,28}-dev" (Closes: #722040)
* Fix "boost 1.49 is going away" unversioned Build-Depends: (Closes: #736746)
* Add Build-Depends: libsndfile-dev, nepomuk-core-dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
daemon/globals.mak
7
7
 
8
8
ASTYLERC="$(top_srcdir)/../astylerc"
9
9
indent="/usr/bin/astyle"
 
10
PJPROJECT_DIR=pjproject-2.1.0
10
11
 
11
12
# for pjsip
12
 
include $(src)/libs/pjproject-2.0.1/build.mak
 
13
include $(src)/libs/$(PJPROJECT_DIR)/build.mak
13
14
PJSIP_LIBS=$(APP_LDFLAGS) $(APP_LDLIBS)
14
15
 
15
 
SIP_CFLAGS=-I$(src)/libs/pjproject-2.0.1/pjsip/include \
16
 
                   -I$(src)/libs/pjproject-2.0.1/pjlib/include \
17
 
                   -I$(src)/libs/pjproject-2.0.1/pjlib-util/include \
18
 
                   -I$(src)/libs/pjproject-2.0.1/pjmedia/include \
19
 
                   -I$(src)/libs/pjproject-2.0.1/pjnath/include \
 
16
SIP_CFLAGS=-I$(src)/libs/$(PJPROJECT_DIR)/pjsip/include \
 
17
                   -I$(src)/libs/$(PJPROJECT_DIR)/pjlib/include \
 
18
                   -I$(src)/libs/$(PJPROJECT_DIR)/pjlib-util/include \
 
19
                   -I$(src)/libs/$(PJPROJECT_DIR)/pjmedia/include \
 
20
                   -I$(src)/libs/$(PJPROJECT_DIR)/pjnath/include \
20
21
                   -DPJ_AUTOCONF=1
21
22
 
22
23
if BUILD_SPEEX
25
26
SPEEXCODEC=
26
27
endif
27
28
 
 
29
if BUILD_OPUS
 
30
OPUSCODEC=-DHAVE_OPUS
 
31
else
 
32
OPUSCODEC=
 
33
endif
 
34
 
28
35
if BUILD_GSM
29
36
GSMCODEC=-DHAVE_GSM_CODEC
30
37
else
35
42
AM_CPPFLAGS = \
36
43
        -I$(src)/libs \
37
44
        -I$(src)/libs/iax2 \
38
 
        -I$(src)/libs/pjproject-2.0.1 \
 
45
        -I$(src)/libs/$(PJPROJECT_DIR) \
39
46
        -I$(src)/src \
40
47
        -I$(src)/src/config \
41
48
        -I$(src)/test \
46
53
        -DCODECS_DIR=\""$(sflcodecdir)"\" \
47
54
        -DPLUGINS_DIR=\""$(sflplugindir)"\" \
48
55
        -DENABLE_TRACE \
49
 
         $(SPEEXCODEC) \
50
 
         $(GSMCODEC)
 
56
        $(SPEEXCODEC) \
 
57
        $(GSMCODEC) \
 
58
        $(OPUSCODEC)
51
59
 
52
60
 
53
61
indent: