original upstream commit was broken ... need a few of the changes to keep from breaking USE=alsa

2 files changed, 27 insertions, 19 deletions

diff --git a/net-voip/linphone/Manifest b/net-voip/linphone/Manifest
index d2e153bcf40c..e2056c7136b5 100644
--- a/net-voip/linphone/Manifest
+++ b/net-voip/linphone/Manifest
@@ -17,10 +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-no-alsa.patch 937 RMD160 fcf6ebdf6cf8223ec3fef6dcdaef629a104a243c SHA1 35222fc6d7e0d36d6f9011093604cb773478eda1 SHA256 a2ab3fb6f45d9747227f8458b4068009990ae75aad01998366536fdc3b64dc22
+MD5 afc2baa9932ee09d98da830f2d3802b3 files/linphone-2.0.1-no-alsa.patch 937
+RMD160 fcf6ebdf6cf8223ec3fef6dcdaef629a104a243c files/linphone-2.0.1-no-alsa.patch 937
+SHA256 a2ab3fb6f45d9747227f8458b4068009990ae75aad01998366536fdc3b64dc22 files/linphone-2.0.1-no-alsa.patch 937
 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
@@ -35,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 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-r1.ebuild 3125 RMD160 bff762767665d9012cff5844a048eaf65310b98c SHA1 994a06a556020115dec68e5253c4ea495dcf8832 SHA256 3773b6ddc0c1bd3835a10d576367ede5f9f3d2e41dfc7552fea0376a9d6445fb
+MD5 7fda642638b107a17c763bacf6ac720c linphone-2.0.1-r1.ebuild 3125
+RMD160 bff762767665d9012cff5844a048eaf65310b98c linphone-2.0.1-r1.ebuild 3125
+SHA256 3773b6ddc0c1bd3835a10d576367ede5f9f3d2e41dfc7552fea0376a9d6445fb linphone-2.0.1-r1.ebuild 3125
 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 7823 RMD160 7e681ed0eca7bdea8e33a120a2b156ae6739e8ed SHA1 e2252eade054aa764cfeadec241eb3b89420393b SHA256 51e2510e8bce20e6cc97d1fc4f9d0baf00b0e3a1a17463c0845da447ca2ad9e6
-MD5 14d1c5b3ea8fb01ef4281353fd9968f9 ChangeLog 7823
-RMD160 7e681ed0eca7bdea8e33a120a2b156ae6739e8ed ChangeLog 7823
-SHA256 51e2510e8bce20e6cc97d1fc4f9d0baf00b0e3a1a17463c0845da447ca2ad9e6 ChangeLog 7823
+MISC ChangeLog 8012 RMD160 cd7415008aee40b4daf41d04aa9e5504dc6cb7b2 SHA1 25d988e51beff5385d06b6c9cdb040d21b812560 SHA256 1c7d296c9fc753ffad25b5869cf530f38f4320305e35d86c7d154d43e0065fc5
+MD5 0f82ef8b267c3e7fa4914cef684d1d1b ChangeLog 8012
+RMD160 cd7415008aee40b4daf41d04aa9e5504dc6cb7b2 ChangeLog 8012
+SHA256 1c7d296c9fc753ffad25b5869cf530f38f4320305e35d86c7d154d43e0065fc5 ChangeLog 8012
 MISC metadata.xml 312 RMD160 e3c2d66f793654c3d1ab1b70aa2b3b87731c04e7 SHA1 17015753e1e8e33227e3bf6260fff1a6447d32a0 SHA256 008abe484ed1f0a62e625789a99281919f3c933a222bbecef1bf9652728e6d38
 MD5 4147a43d9c89e23a84621861984e010e metadata.xml 312
 RMD160 e3c2d66f793654c3d1ab1b70aa2b3b87731c04e7 metadata.xml 312
@@ -66,7 +66,7 @@ SHA256 0188b5b395f8a9f060e085021891a3d5f98850ed47c567a1a2f8f1edbd8a5ac7 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHlXHcj9hvisErhMIRAqGyAJ0cI0F0Zp4R6rp7pnu71BMIu1pqpQCgy7ik
-Z5BgXvPgATdwT4qwUDhojQg=
-=jxGu
+iD8DBQFHlXTCj9hvisErhMIRAvm3AJsFsshQ7XLoywsfnP0dQ6MZx72aGQCdHqCq
+7DIQbNHLu9jKuICo/mDL8/0=
+=uRn3
 -----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
index 934b46f8c41b..53e6be8805f7 100644
--- a/net-voip/linphone/files/linphone-2.0.1-no-alsa.patch
+++ b/net-voip/linphone/files/linphone-2.0.1-no-alsa.patch
@@ -4,11 +4,19 @@ 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
+retrieving revision 1.9
+diff -u -p -r1.7 -r1.9
 --- 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)
++++ mediastreamer2/src/mssndcard.c	11 Dec 2007 10:36:06 -0000	1.9
+@@ -18,6 +18,7 @@ Foundation, Inc., 59 Temple Place - Suit
+ */
+ 
+ #include "mediastreamer2/mssndcard.h"
++#include "mediastreamer-config.h"
+ 
+ static MSSndCardManager *scm=NULL;
+ 
+@@ -152,3 +153,10 @@ void ms_snd_card_destroy(MSSndCard *obj)
  	if (obj->id!=NULL)	ms_free(obj->id);
  	ms_free(obj);
  }