summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-01-22 04:43:37 +0000
committerMike Frysinger <vapier@gentoo.org>2008-01-22 04:43:37 +0000
commit372d3854d5a2d5dc36b455b0a14136631b0892b2 (patch)
tree36181a6e34127fd242170809a3878ee67a2adcd2
parentFix from upstream for building with USE=-alsa. (diff)
downloadgentoo-2-372d3854d5a2d5dc36b455b0a14136631b0892b2.tar.gz
gentoo-2-372d3854d5a2d5dc36b455b0a14136631b0892b2.tar.bz2
gentoo-2-372d3854d5a2d5dc36b455b0a14136631b0892b2.zip
original upstream commit was broken ... need a few of the changes to keep from breaking USE=alsa
-rw-r--r--net-voip/linphone/files/linphone-2.0.1-no-alsa.patch16
1 files changed, 12 insertions, 4 deletions
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);
}