Fix from upstream for building with USE=-alsa.

Package-Manager: portage-2.1.4

4 files changed, 43 insertions, 13 deletions

diff --git a/net-voip/linphone/ChangeLog b/net-voip/linphone/ChangeLog
index 25c58f7b882b..dbefb14e448c 100644
--- a/net-voip/linphone/ChangeLog
+++ b/net-voip/linphone/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-voip/linphone
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/ChangeLog,v 1.8 2008/01/20 04:17:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/ChangeLog,v 1.9 2008/01/22 04:32:19 vapier Exp $
+
+  22 Jan 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/linphone-2.0.1-no-alsa.patch, linphone-2.0.1-r1.ebuild:
+  Fix from upstream for building with USE=-alsa.
 
   20 Jan 2008; Mike Frysinger <vapier@gentoo.org> linphone-2.0.1-r1.ebuild:
   Change USE=novideo to USE=video and force newer gsm as the older one
diff --git a/net-voip/linphone/Manifest b/net-voip/linphone/Manifest
index 54884b8f9c21..d2e153bcf40c 100644
--- a/net-voip/linphone/Manifest
+++ b/net-voip/linphone/Manifest
@@ -17,6 +17,10 @@ AUX linphone-2.0.1-mediastreamer-deps.patch 2171 RMD160 282caddf2314583a5c562041
 MD5 2eea70782859312a61e8542d74edb136 files/linphone-2.0.1-mediastreamer-deps.patch 2171
 RMD160 282caddf2314583a5c5620413b70811c6dee03d7 files/linphone-2.0.1-mediastreamer-deps.patch 2171
 SHA256 249c5863c31b2e040f73cd0d0a6b9667b42622c6c27e9e9b67121a9d5de60910 files/linphone-2.0.1-mediastreamer-deps.patch 2171
+AUX linphone-2.0.1-no-alsa.patch 758 RMD160 1309870236de3f34a6db3924eae88976bc2b3cd9 SHA1 a7bcd11a5356424c7e98c6b301cc937d1e88a1a9 SHA256 0762f51a0438573b304e6d355d7dc8beeb2c6285a51f496ec014426cc9806c4c
+MD5 2375412fedd78473de3cd10789ab2081 files/linphone-2.0.1-no-alsa.patch 758
+RMD160 1309870236de3f34a6db3924eae88976bc2b3cd9 files/linphone-2.0.1-no-alsa.patch 758
+SHA256 0762f51a0438573b304e6d355d7dc8beeb2c6285a51f496ec014426cc9806c4c files/linphone-2.0.1-no-alsa.patch 758
 AUX linphone-2.0.1-speexdsp.patch 4124 RMD160 ce630327e4f691920ac1d868aff85cce813be1fb SHA1 c47d6e519f1e45c98ce74bdea794d5e97271b78a SHA256 d01c8f5bec88bfc5b87ebe5f1a13b8494a0f898c81741754b930cd07b34b8cef
 MD5 54a8aeee8a4a0473bc554a31f4f59212 files/linphone-2.0.1-speexdsp.patch 4124
 RMD160 ce630327e4f691920ac1d868aff85cce813be1fb files/linphone-2.0.1-speexdsp.patch 4124
@@ -31,18 +35,18 @@ EBUILD linphone-1.7.1.ebuild 2079 RMD160 1468451776de6dfd69b1efefe413a9be558ac51
 MD5 cc6ef2e51a0a52f971c5998a0d5d0571 linphone-1.7.1.ebuild 2079
 RMD160 1468451776de6dfd69b1efefe413a9be558ac51d linphone-1.7.1.ebuild 2079
 SHA256 92009903c30c552aa1ac3d81dd3d5a1336a61cf9bb6c6e58ac586952b41f863f linphone-1.7.1.ebuild 2079
-EBUILD linphone-2.0.1-r1.ebuild 3060 RMD160 2bee2a0b1efba852d809ae22d9be5d405c21e613 SHA1 8ddfce969c7e64b01cdda73af18eb1cf49c6ea66 SHA256 562322c71c6f09b7788d11cb454309a4b94b4550d8a4c74175ee3b2f65057384
-MD5 670875fa8389dfa57ec7291099bba0b2 linphone-2.0.1-r1.ebuild 3060
-RMD160 2bee2a0b1efba852d809ae22d9be5d405c21e613 linphone-2.0.1-r1.ebuild 3060
-SHA256 562322c71c6f09b7788d11cb454309a4b94b4550d8a4c74175ee3b2f65057384 linphone-2.0.1-r1.ebuild 3060
+EBUILD linphone-2.0.1-r1.ebuild 3111 RMD160 0987a55d4cb7d6137a7539d13c3684323a801adc SHA1 8f11b15964d7a9fefbc156721a013fc4bbf96452 SHA256 46eaaac8f2677bec147294ed432c29208a918ab4594be75c97a058dcc30f8b28
+MD5 42a1fb8244838ab169998d404ec57c05 linphone-2.0.1-r1.ebuild 3111
+RMD160 0987a55d4cb7d6137a7539d13c3684323a801adc linphone-2.0.1-r1.ebuild 3111
+SHA256 46eaaac8f2677bec147294ed432c29208a918ab4594be75c97a058dcc30f8b28 linphone-2.0.1-r1.ebuild 3111
 EBUILD linphone-2.0.1.ebuild 2629 RMD160 d3e8faa69a4555005064f9f32af4d1d01743fb68 SHA1 a3f11664fb0d776a9c77dd030b959bddf082cbc8 SHA256 ad68e2b918c7a7ede1ca029da667dce1b2756b511bceeac9d453efc21b9dc6cf
 MD5 c1395e756c6e2ba7ce176a1544ba585e linphone-2.0.1.ebuild 2629
 RMD160 d3e8faa69a4555005064f9f32af4d1d01743fb68 linphone-2.0.1.ebuild 2629
 SHA256 ad68e2b918c7a7ede1ca029da667dce1b2756b511bceeac9d453efc21b9dc6cf linphone-2.0.1.ebuild 2629
-MISC ChangeLog 7658 RMD160 8626f2bf3a96175a78361cd71bce28433c4fee09 SHA1 3ab5b20e0ac44063ba36834320a1499eb6fc52da SHA256 58b30e6cb040d8c3e4503decbd428e64e2f0d1c331179fb6bc2c5e14303ff24b
-MD5 394a3180542c363b181e2e2fc47e4e99 ChangeLog 7658
-RMD160 8626f2bf3a96175a78361cd71bce28433c4fee09 ChangeLog 7658
-SHA256 58b30e6cb040d8c3e4503decbd428e64e2f0d1c331179fb6bc2c5e14303ff24b ChangeLog 7658
+MISC ChangeLog 7823 RMD160 7e681ed0eca7bdea8e33a120a2b156ae6739e8ed SHA1 e2252eade054aa764cfeadec241eb3b89420393b SHA256 51e2510e8bce20e6cc97d1fc4f9d0baf00b0e3a1a17463c0845da447ca2ad9e6
+MD5 14d1c5b3ea8fb01ef4281353fd9968f9 ChangeLog 7823
+RMD160 7e681ed0eca7bdea8e33a120a2b156ae6739e8ed ChangeLog 7823
+SHA256 51e2510e8bce20e6cc97d1fc4f9d0baf00b0e3a1a17463c0845da447ca2ad9e6 ChangeLog 7823
 MISC metadata.xml 312 RMD160 e3c2d66f793654c3d1ab1b70aa2b3b87731c04e7 SHA1 17015753e1e8e33227e3bf6260fff1a6447d32a0 SHA256 008abe484ed1f0a62e625789a99281919f3c933a222bbecef1bf9652728e6d38
 MD5 4147a43d9c89e23a84621861984e010e metadata.xml 312
 RMD160 e3c2d66f793654c3d1ab1b70aa2b3b87731c04e7 metadata.xml 312
@@ -62,7 +66,7 @@ SHA256 0188b5b395f8a9f060e085021891a3d5f98850ed47c567a1a2f8f1edbd8a5ac7 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHkssmj9hvisErhMIRAgQeAJwKjVpHGht/ATY/vpIrAu3kwb4LiACfdh7b
-aGC+rdHdQSQekpGwTvQC9QE=
-=srHn
+iD8DBQFHlXHcj9hvisErhMIRAqGyAJ0cI0F0Zp4R6rp7pnu71BMIu1pqpQCgy7ik
+Z5BgXvPgATdwT4qwUDhojQg=
+=jxGu
 -----END PGP SIGNATURE-----
diff --git a/net-voip/linphone/files/linphone-2.0.1-no-alsa.patch b/net-voip/linphone/files/linphone-2.0.1-no-alsa.patch
new file mode 100644
index 000000000000..934b46f8c41b
--- /dev/null
+++ b/net-voip/linphone/files/linphone-2.0.1-no-alsa.patch
@@ -0,0 +1,21 @@
+fix from upstream for building with alsa disabled
+
+Index: mediastreamer2/src/mssndcard.c
+===================================================================
+RCS file: /sources/linphone/linphone/mediastreamer2/src/mssndcard.c,v
+retrieving revision 1.7
+retrieving revision 1.8
+diff -u -p -r1.7 -r1.8
+--- mediastreamer2/src/mssndcard.c	12 Oct 2007 13:31:54 -0000	1.7
++++ mediastreamer2/src/mssndcard.c	10 Dec 2007 17:12:40 -0000	1.8
+@@ -152,3 +152,10 @@ void ms_snd_card_destroy(MSSndCard *obj)
+ 	if (obj->id!=NULL)	ms_free(obj->id);
+ 	ms_free(obj);
+ }
++
++#ifndef __ALSA_ENABLED__
++MSSndCard * ms_alsa_card_new_custom(const char *pcmdev, const char *mixdev){
++	ms_warning("Alsa support not available in this build of mediastreamer2");
++	return NULL;
++}
++#endif
diff --git a/net-voip/linphone/linphone-2.0.1-r1.ebuild b/net-voip/linphone/linphone-2.0.1-r1.ebuild
index 2f749f0ae1f1..1b77f3f88314 100644
--- a/net-voip/linphone/linphone-2.0.1-r1.ebuild
+++ b/net-voip/linphone/linphone-2.0.1-r1.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/net-voip/linphone/linphone-2.0.1-r1.ebuild,v 1.3 2008/01/20 04:17:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/linphone-2.0.1-r1.ebuild,v 1.4 2008/01/22 04:32:20 vapier Exp $
 
 # Note: video support in linphone relies on swscaler being disabled
 #       in ffmpeg.  this is because the video code in linphone is old
@@ -56,6 +56,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/linphone-2.0.1-configure-gsm.patch
 	epatch "${FILESDIR}"/linphone-2.0.1-speexdsp.patch #205893
 	epatch "${FILESDIR}"/linphone-2.0.1-mediastreamer-deps.patch
+	epatch "${FILESDIR}"/linphone-2.0.1-no-alsa.patch
 }
 
 src_compile() {