Fixed build problem with >=spandsp-0.0.6_pre2, bug #249338, thank Yaroslav Gorbunov for report and patch. Fixed build issue with --as-needed, bug #247807, thank Diego E. 'Flameeyes' Pettenò for report. Force to use up-to-date spandsp library.

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.26-openvz.git-89451f9 i686

5 files changed, 51 insertions, 5 deletions

diff --git a/media-radio/svxlink/ChangeLog b/media-radio/svxlink/ChangeLog
index c0ed3c1c18bd..09dd5de9f646 100644
--- a/media-radio/svxlink/ChangeLog
+++ b/media-radio/svxlink/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-radio/svxlink
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/svxlink/ChangeLog,v 1.5 2008/09/23 03:48:53 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/svxlink/ChangeLog,v 1.6 2008/12/15 12:27:51 pva Exp $
+
+  15 Dec 2008; Peter Volkov <pva@gentoo.org>
+  +files/svxlink-080730--as-needed.patch,
+  +files/svxlink-080730-spandsp-0.0.6_pre2.patch, svxlink-080730.ebuild:
+  Fixed build problem with >=spandsp-0.0.6_pre2, bug #249338, thank Yaroslav
+  Gorbunov for report and patch. Fixed build issue with --as-needed, bug
+  #247807, thank Diego E. 'Flameeyes' Pettenò for report. Force to use
+  up-to-date spandsp library.
 
 *svxlink-080730 (23 Sep 2008)
 *svxlink-080102-r1 (23 Sep 2008)
diff --git a/media-radio/svxlink/Manifest b/media-radio/svxlink/Manifest
index 752370d9eeda..6d6ddb479cb1 100644
--- a/media-radio/svxlink/Manifest
+++ b/media-radio/svxlink/Manifest
@@ -1,7 +1,9 @@
+AUX svxlink-080730--as-needed.patch 381 RMD160 ec62feb75329b2dd881f022556995c23f038ccf3 SHA1 bc6a015d28cc29af87fd2d738a159323360ccba7 SHA256 0a84adf6f6d65e5b8bd07a0a7a70153dd8194edf6007a0e83700fc1152e527a4
+AUX svxlink-080730-spandsp-0.0.6_pre2.patch 705 RMD160 4598f710a750b03808fddb4ef8881f09506b94a4 SHA1 80ac24ded8c53da8a75b196db81341a9a1b00240 SHA256 c44f4554e505abbd37348d13b6ce0056372f5b42f089bf61c742ee79b0012a11
 AUX svxlink-fix-Makefile.diff 511 RMD160 e09f6f72bccff74c3b7fcd9c28a94c574f71612a SHA1 d9d0918e66ecfababd15ea468824553738eb6595 SHA256 3fad27f574fc9bff0b04dd5da7471fce43596b682a7aaa5ce7f76b5590f1c657
 DIST svxlink-080102.tar.gz 416383 RMD160 869fe904eb00514a02c54af6f060a4404630cc1f SHA1 f87b8557f3adf819dcfcaddd408c3e3ee192be6e SHA256 2701a486c2ec670c3e2bbdd5e4b0842b1b3ead3bbb8790688265ca2e51e04b07
 DIST svxlink-080730.tar.gz 484464 RMD160 1a65d361e200fda309a1ce11f88c39a8e37d535d SHA1 edd7318211d35894124aaa1e071a703041e3a4fd SHA256 68039508fa77ac3daf648bc26b99029c867068a03b43aab6650101c2fc2ef107
 EBUILD svxlink-080102-r1.ebuild 891 RMD160 b3882e75f7780260e69d32d8ec08e27e5ada055e SHA1 5d6b79136d4cad0842dba11ea93839665bc452ab SHA256 90a07bf2a95d83729c20a78948836a917563019a0689e413b1c16d028c94d001
-EBUILD svxlink-080730.ebuild 888 RMD160 cb84585972a345f6d4d71114e4f1b69bfa4bd90e SHA1 933d3cafe0862ba9cb2a6ef3ef74f776dbac7504 SHA256 7dd7d76e8fb34ab7ecbd2ee7032350773574791fd9681ac65094dc9b0fcd0fc9
-MISC ChangeLog 1167 RMD160 bcc1068d15b8312cfc1f221ad270773e73079681 SHA1 a1832b0c989a4bdd4edc0e6e5d0465a3a7686a38 SHA256 989d619d24ecfef5d8efe65588b5213c0540d48ec0075470fd5c99956841599e
+EBUILD svxlink-080730.ebuild 992 RMD160 c3f2a5150f1e51d3329ebd6674487df4d4a41a90 SHA1 90e163ecd35834a010963da35cd73449da7a3acb SHA256 88641ebf6ec4db8d2b9a8dd0fe7fb00ca6dc851c38a6843921b21860ccbf8d5b
+MISC ChangeLog 1575 RMD160 3bee1fc72ff519a5501352ef6116725924b9b915 SHA1 1b09aabb2f0ce6aafc655b6152ec59346b1948d3 SHA256 9b3e2ee90906fe0e095d201211616fb061c416fd581cb1852a8c317fb4928e77
 MISC metadata.xml 569 RMD160 754ed1324af1015713873dfe99b869472551f9af SHA1 cc1ad26d8b879ffd422e1d365cc9f02e653a311c SHA256 b8ddf42532511911fb36967cb6ccd670345bf004255259cb7e7ecfb35989011b
diff --git a/media-radio/svxlink/files/svxlink-080730--as-needed.patch b/media-radio/svxlink/files/svxlink-080730--as-needed.patch
new file mode 100644
index 000000000000..c6ca9d9c4fc5
--- /dev/null
+++ b/media-radio/svxlink/files/svxlink-080730--as-needed.patch
@@ -0,0 +1,13 @@
+=== modified file 'async/demo/Makefile.default'
+--- async/demo/Makefile.default	2008-11-30 12:25:03 +0000
++++ async/demo/Makefile.default	2008-11-30 12:34:18 +0000
+@@ -62,7 +62,7 @@
+ PRGSRC		= 
+ 
+ # Libraries compiled in the project (in $(LIB)).
+-PROJLIBS	= -lasynccpp -lasyncaudio
++PROJLIBS	= -lasynccpp -lasyncaudio -lasynccore
+ ifdef QT_BIN
+ PROJLIBS      	+= -lasyncqt
+ endif
+
diff --git a/media-radio/svxlink/files/svxlink-080730-spandsp-0.0.6_pre2.patch b/media-radio/svxlink/files/svxlink-080730-spandsp-0.0.6_pre2.patch
new file mode 100644
index 000000000000..8a248dec4436
--- /dev/null
+++ b/media-radio/svxlink/files/svxlink-080730-spandsp-0.0.6_pre2.patch
@@ -0,0 +1,21 @@
+=== modified file 'svxlink/trx/SpanDtmfDecoder.cpp'
+--- svxlink/trx/SpanDtmfDecoder.cpp	2008-12-07 18:35:58 +0000
++++ svxlink/trx/SpanDtmfDecoder.cpp	2008-12-07 18:38:37 +0000
+@@ -40,6 +40,7 @@
+ #include <stdlib.h>
+ #include <stdint.h>
+ #include <spandsp.h>
++#include <spandsp/expose.h>
+ 
+ 
+ /****************************************************************************
+@@ -166,7 +167,7 @@
+   }
+   
+   dtmf_rx_init(&p->rx_state, NULL, this);
+-  dtmf_rx_parms(&p->rx_state, FALSE, max_fwd_twist, max_rev_twist);
++  dtmf_rx_parms(&p->rx_state, FALSE, max_fwd_twist, max_rev_twist, -99);
+   dtmf_rx_set_realtime_callback(&p->rx_state, SpanDtmfDecoder::toneReportCb,
+       	      	      	        this);
+   
+
diff --git a/media-radio/svxlink/svxlink-080730.ebuild b/media-radio/svxlink/svxlink-080730.ebuild
index 4494ff213b77..f560718a7808 100644
--- a/media-radio/svxlink/svxlink-080730.ebuild
+++ b/media-radio/svxlink/svxlink-080730.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/svxlink/svxlink-080730.ebuild,v 1.1 2008/09/23 03:48:53 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/svxlink/svxlink-080730.ebuild,v 1.2 2008/12/15 12:27:51 pva Exp $
 
 EAPI=1
 
@@ -19,7 +19,7 @@ RDEPEND="dev-lang/tcl
 	media-sound/gsm
 	x11-libs/qt:3
 	dev-libs/libsigc++:1.2
-	media-libs/spandsp
+	>=media-libs/spandsp-0.0.6_pre2
 	dev-libs/popt"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
@@ -28,6 +28,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/${PN}-fix-Makefile.diff"
+	epatch "${FILESDIR}/${P}--as-needed.patch"
+	epatch "${FILESDIR}/${P}-spandsp-0.0.6_pre2.patch"
 }
 
 src_compile() {