[Pkg-voip-commits] [sflphone] 16/30: * NOT RELEASED YET * New upstream release * changeset_rb68857a4b485b7d43f92714cd5792595ff895f82.diff - fix QTest * pjproject ./configure --disable-sound --disable-video
tzafrir at debian.org
tzafrir at debian.org
Mon Sep 22 22:23:32 UTC 2014
This is an automated email from the git hooks/post-receive script.
tzafrir pushed a commit to branch master
in repository sflphone.
commit 1d20b6f71d665c1ecb04164b5c2206d3339b149b
Author: Mark Purcell <msp at debian.org>
Date: Sat Jun 1 10:15:52 2013 +0000
* NOT RELEASED YET
* New upstream release
* changeset_rb68857a4b485b7d43f92714cd5792595ff895f82.diff - fix QTest
* pjproject ./configure --disable-sound --disable-video
git-svn-id: svn://anonscm.alioth.debian.org/svn/pkg-voip/sflphone/trunk@10211 5e74be4b-f5d6-0310-a852-e9e23c5afa6a
---
debian/changelog | 10 +++++++++
..._rb68857a4b485b7d43f92714cd5792595ff895f82.diff | 19 ++++++++++++++++
debian/patches/disable-ilbc.patch | 11 +++++++++
debian/patches/series | 6 +++--
debian/rules | 26 ++++++++++------------
5 files changed, 56 insertions(+), 16 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 945d6c5..355d3ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+sflphone (1.2.2-1) UNRELEASED; urgency=low
+
+ * NOT RELEASED YET
+
+ * New upstream release
+ * changeset_rb68857a4b485b7d43f92714cd5792595ff895f82.diff - fix QTest
+ * pjproject ./configure --disable-sound --disable-video
+
+ -- Mark Purcell <msp at debian.org> Mon, 21 Jan 2013 14:27:46 +1100
+
sflphone (1.2.0-3) unstable; urgency=low
* Upload to unstable
diff --git a/debian/patches/changeset_rb68857a4b485b7d43f92714cd5792595ff895f82.diff b/debian/patches/changeset_rb68857a4b485b7d43f92714cd5792595ff895f82.diff
new file mode 100644
index 0000000..8562b52
--- /dev/null
+++ b/debian/patches/changeset_rb68857a4b485b7d43f92714cd5792595ff895f82.diff
@@ -0,0 +1,19 @@
+commit b68857a4b485b7d43f92714cd5792595ff895f82
+Author: Montel Laurent <montel at kde.org>
+Date: Tue Feb 12 07:48:24 2013 +0100
+
+ Fix include (but account_test doesn't compile account::save is private)
+
+diff --git a/src/test/account_test.cpp b/src/test/account_test.cpp
+index 44ab5a9..c6eb6fe 100644
+--- a/kde/src/test/account_test.cpp
++++ b/kde/rc/test/account_test.cpp
+@@ -16,7 +16,7 @@
+ * along with this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+ #include <QtCore/QString>
+-#include <QtTest/QtTest/QtTest>
++#include <QtTest/QtTest>
+ //#include <QtCore>
+
+ #include "../src/lib/configurationmanager_interface_singleton.h"
diff --git a/debian/patches/disable-ilbc.patch b/debian/patches/disable-ilbc.patch
new file mode 100644
index 0000000..5983a08
--- /dev/null
+++ b/debian/patches/disable-ilbc.patch
@@ -0,0 +1,11 @@
+Index: sflphone-1.2.1/daemon/libs/pjproject-2.0.1/third_party/build/os-linux.mak
+===================================================================
+--- sflphone-1.2.1.orig/daemon/libs/pjproject-2.0.1/third_party/build/os-linux.mak 2013-01-10 09:12:15.000000000 +1100
++++ sflphone-1.2.1/daemon/libs/pjproject-2.0.1/third_party/build/os-linux.mak 2013-01-12 09:57:06.000000000 +1100
+@@ -1,5 +1,5 @@
+ DIRS += gsm
+-DIRS += ilbc
++#DIRS += ilbc
+ DIRS += speex
+ DIRS += portaudio
+ DIRS += g7221
diff --git a/debian/patches/series b/debian/patches/series
index 3dbbc80..bd1744c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,6 @@
-gcc47-fixes.patch
+disable-ilbc.patch
+#gcc47-fixes.patch
02_target_s390.patch
#03_binutils-gold.patch
-04_target_s4.patch
+#04_target_s4.patch
+changeset_rb68857a4b485b7d43f92714cd5792595ff895f82.diff
diff --git a/debian/rules b/debian/rules
index 8f77ac3..d7b230d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,21 +1,18 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+PJPROJECT_VERSION := 2.0.1
+
%:
dh $@
override_dh_auto_configure:
- cd daemon/libs/pjproject && ./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --disable-ilbc-codec
+# cd daemon/libs/ && ./compile_pjsip.sh
+ cd daemon/libs/pjproject-$(PJPROJECT_VERSION) && CFLAGS=-fPIC ./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --disable-sound --disable-video
cd daemon && ./autogen.sh --prefix=/usr
- cd daemon && ./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" --disable-doxygen --without-ilbc
+ cd daemon && ./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS) -fPIC" LDFLAGS="-Wl,-z,defs" --disable-doxygen
cd gnome && ./autogen.sh --prefix=/usr
cd gnome && ./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
cd kde && ./config.sh --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
@@ -23,14 +20,15 @@ override_dh_auto_configure:
cd plugins && ./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
override_dh_auto_build:
- cd daemon/libs/pjproject && make V=1
- cd daemon && make V=1
- cd gnome && make V=1
- cd kde/build && make V=1
- cd plugins && make V=1
+# cd daemon/libs/ && ./compile_pjsip.sh
+ cd daemon/libs/pjproject-$(PJPROJECT_VERSION) && make
+ cd daemon && make
+ cd gnome && make
+ cd kde/build && make
+ cd plugins && make
override_dh_auto_clean:
- cd daemon/libs/pjproject && [ ! -f build.mak ] || $(MAKE) distclean
+ cd daemon/libs/pjproject-$(PJPROJECT_VERSION) && [ ! -f build.mak ] || $(MAKE) distclean
cd daemon && [ ! -f Makefile ] || $(MAKE) distclean
cd gnome && [ ! -f Makefile ] || $(MAKE) distclean
cd kde && [ ! -f Makefile ] || $(MAKE) distclean
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/sflphone.git
More information about the Pkg-voip-commits
mailing list