Attachment #99812 for bug #138992

View | Details | Raw Unified | Return to bug 138992
Collapse All | Expand All




#

PORTNAME=	linphone
PORTVERSION=	3.2.0
PORTEPOCH=	1
CATEGORIES?=	net
MASTER_SITES=	SAVANNAH/${PORTNAME}/stable/sources

MAINTAINER=	scjamorim@bsd.com.br
COMMENT=	A web phone that supports SIP protocol

LIB_DEPENDS=	gsm.1:${PORTSDIR}/audio/gsm \

.endif

.if defined(LINPHONE_GUI)
BUILD_DEPENDS+=	linphone-base>=${PORTVERSION}:${PORTSDIR}/net/linphone-base
RUN_DEPENDS+=	linphone-base>=${PORTVERSION}:${PORTSDIR}/net/linphone-base
DESCR=		${PKGDIR}/pkg-descr.gui
PLIST=		${PKGDIR}/pkg-plist.gui
USE_GNOME+=	libglade2

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (linphone-3.1.2.tar.gz) = f0a6e48a2b3cf276f78f8499444be732	1	MD5 (linphone-3.2.0.tar.gz) = e5b99322b0de6e8ae4a22eb27fb56b77
2	SHA256 (linphone-3.1.2.tar.gz) = 2e676f2bc6aeed7753458079355fc64362c75b530913e9226cd4abd9257cbf17	2	SHA256 (linphone-3.2.0.tar.gz) = f7b8db970e20898f5cefb8bb9a5133ebb3064d6d466301241e659d93e52e6cef
3	SIZE (linphone-3.1.2.tar.gz) = 7732132	3	SIZE (linphone-3.2.0.tar.gz) = 7880590




include/linphone/sipsetup.h
include/mediastreamer2/allfilters.h
include/mediastreamer2/dtmfgen.h
include/mediastreamer2/dsptools.h
include/mediastreamer2/ice.h
include/mediastreamer2/mediastream.h
include/mediastreamer2/mscommon.h
include/mediastreamer2/msequalizer.h
include/mediastreamer2/msfileplayer.h
include/mediastreamer2/msfilerec.h
include/mediastreamer2/msfilter.h
include/mediastreamer2/msqueue.h
include/mediastreamer2/msrtp.h
include/mediastreamer2/mssndcard.h
include/mediastreamer2/msspeexec.h
include/mediastreamer2/mstee.h
include/mediastreamer2/msticker.h
include/mediastreamer2/msv4l.h

lib/liblinphone.a
lib/liblinphone.la
lib/liblinphone.so
lib/liblinphone.so.5
lib/libmediastreamer.a
lib/libmediastreamer.la
lib/libmediastreamer.so




bin/linphone
bin/linphone-3
share/applications/linphone.desktop
%%DATADIR%%/COPYING
%%DATADIR%%/about.glade
%%DATADIR%%/buddylookup.glade
%%DATADIR%%/call_logs.glade

%%DATADIR%%/sip_account.glade
%%DATADIR%%/stock_people.png
%%DATADIR%%/waiting.glade
share/pixmaps/linphone/green.png
share/pixmaps/linphone/linphone.png
share/pixmaps/linphone/linphone2.png
share/pixmaps/linphone/linphone2.xpm
share/pixmaps/linphone/red.png
share/pixmaps/linphone/sip-away.png
share/pixmaps/linphone/sip-bifm.png
share/pixmaps/linphone/sip-busy.png




--- coreapi/linphonecore.c.orig	2009-03-10 00:22:47.000000000 +0900
+++ coreapi/linphonecore.c	2009-03-26 01:38:40.000000000 +0900
@@ -29,11 +29,9 @@
 #include "exevents.h"
 
 
-#ifdef INET6  
 #ifndef WIN32
 #include <netdb.h>  
 #endif
-#endif
 
 #ifdef WIN32
 #define HAVE_EXOSIP_GET_VERSION 1
@@ -341,7 +339,7 @@
 	const char **devices;
 	int ndev;
 	int i;
-#ifndef WIN32
+#ifdef __linux
 	/*alsadev let the user use custom alsa device within linphone*/
 	devid=lp_config_get_string(lc->config,"sound","alsadev",NULL);
 	if (devid){




--- coreapi/linphonecore.c.orig	2009-09-19 13:56:58.000000000 -0300
+++ coreapi/linphonecore.c	2009-09-19 13:58:01.000000000 -0300
@@ -31,11 +31,9 @@
 #include "exevents.h"
 
 
-#ifdef INET6  
 #ifndef WIN32
 #include <netdb.h>  
 #endif
-#endif
 
 #ifdef WIN32
 #define HAVE_EXOSIP_GET_VERSION 1




--- gtk-glade/Makefile.in.orig	2009-09-18 20:07:22.000000000 -0300
+++ gtk-glade/Makefile.in	2009-09-18 20:38:19.000000000 -0300
@@ -77,9 +77,6 @@
 @BUILD_GLADE_UI_TRUE@@BUILD_WIN32_TRUE@am__DEPENDENCIES_2 =  \
 @BUILD_GLADE_UI_TRUE@@BUILD_WIN32_TRUE@	linphone.res
 @BUILD_GLADE_UI_TRUE@linphone_3_DEPENDENCIES =  \
-@BUILD_GLADE_UI_TRUE@	$(top_builddir)/oRTP/src/libortp.la \
-@BUILD_GLADE_UI_TRUE@	$(top_builddir)/mediastreamer2/src/libmediastreamer.la \
-@BUILD_GLADE_UI_TRUE@	$(top_builddir)/coreapi/liblinphone.la \
 @BUILD_GLADE_UI_TRUE@	$(am__DEPENDENCIES_1) \
 @BUILD_GLADE_UI_TRUE@	$(am__DEPENDENCIES_1) \
 @BUILD_GLADE_UI_TRUE@	$(am__DEPENDENCIES_1) \
@@ -335,9 +332,9 @@
 @BUILD_GLADE_UI_TRUE@			linphone.h 
 
 @BUILD_GLADE_UI_TRUE@linphone_3_LDADD =  \
-@BUILD_GLADE_UI_TRUE@	$(top_builddir)/oRTP/src/libortp.la \
-@BUILD_GLADE_UI_TRUE@	$(top_builddir)/mediastreamer2/src/libmediastreamer.la \
-@BUILD_GLADE_UI_TRUE@	$(top_builddir)/coreapi/liblinphone.la \
+@BUILD_GLADE_UI_TRUE@	`$(PKG_CONFIG) --libs ortp` \
+@BUILD_GLADE_UI_TRUE@	`$(PKG_CONFIG) --libs mediastreamer` \
+@BUILD_GLADE_UI_TRUE@	`$(PKG_CONFIG) --libs linphone` \
 @BUILD_GLADE_UI_TRUE@	$(LIBGTK_LIBS) $(INTLLIBS) \
 @BUILD_GLADE_UI_TRUE@	$(LIBGLADE_LIBS) $(am__append_1)
 @BUILD_GLADE_UI_TRUE@@BUILD_WIN32_FALSE@linphone_3_LDFLAGS = -export-dynamic
@@ -349,10 +346,12 @@
 
 #gtk-linphone.ui:	gtk-linphone.glade
 #	gtk-builder-convert gtk-linphone.glade $@
-AM_CFLAGS = -DIN_LINPHONE -I$(top_srcdir)/coreapi/ \
-		-I$(top_srcdir)/mediastreamer2/include/ \
+AM_CFLAGS = -DIN_LINPHONE \
+		`$(PKG_CONFIG) --cflags ortp` \
+		`$(PKG_CONFIG) --cflags mediastreamer` \
+		`$(PKG_CONFIG) --cflags linphone` \
 		$(LIBGLADE_CFLAGS) $(STRICT_OPTIONS) $(LIBGTK_CFLAGS) $(IPV6_CFLAGS) \
-		$(ORTP_CFLAGS) $(OSIP_CFLAGS) 
+		$(OSIP_CFLAGS) 
 
 CLEANFILES = version_date.h
 all: $(BUILT_SOURCES)




--- gtk-glade/Makefile.in.orig	2009-03-17 21:12:10.000000000 +0900
+++ gtk-glade/Makefile.in	2009-03-17 21:17:21.000000000 +0900
@@ -69,9 +69,6 @@
 linphone_3_OBJECTS = $(am_linphone_3_OBJECTS)
 am__DEPENDENCIES_1 =
 @BUILD_GLADE_UI_TRUE@linphone_3_DEPENDENCIES =  \
-@BUILD_GLADE_UI_TRUE@	$(top_builddir)/oRTP/src/libortp.la \
-@BUILD_GLADE_UI_TRUE@	$(top_builddir)/mediastreamer2/src/libmediastreamer.la \
-@BUILD_GLADE_UI_TRUE@	$(top_builddir)/coreapi/liblinphone.la \
 @BUILD_GLADE_UI_TRUE@	$(am__DEPENDENCIES_1) \
 @BUILD_GLADE_UI_TRUE@	$(am__DEPENDENCIES_1) \
 @BUILD_GLADE_UI_TRUE@	$(am__DEPENDENCIES_1)
@@ -315,9 +312,9 @@
 @BUILD_GLADE_UI_TRUE@			buddylookup.c \
 @BUILD_GLADE_UI_TRUE@			linphone.h
 
-@BUILD_GLADE_UI_TRUE@linphone_3_LDADD = $(top_builddir)/oRTP/src/libortp.la \
-@BUILD_GLADE_UI_TRUE@		$(top_builddir)/mediastreamer2/src/libmediastreamer.la \
-@BUILD_GLADE_UI_TRUE@		$(top_builddir)/coreapi/liblinphone.la \
+@BUILD_GLADE_UI_TRUE@linphone_3_LDADD = `$(PKG_CONFIG) --libs ortp` \
+@BUILD_GLADE_UI_TRUE@		`$(PKG_CONFIG) --libs mediastreamer` \
+@BUILD_GLADE_UI_TRUE@		`$(PKG_CONFIG) --libs linphone` \
 @BUILD_GLADE_UI_TRUE@			$(LIBGTK_LIBS) $(INTLLIBS) \
 @BUILD_GLADE_UI_TRUE@			$(LIBGLADE_LIBS)
 
@@ -329,10 +326,12 @@
 
 #gtk-linphone.ui:	gtk-linphone.glade
 #	gtk-builder-convert gtk-linphone.glade $@
-AM_CFLAGS = -DIN_LINPHONE -I$(top_srcdir)/coreapi/ \
-		-I$(top_srcdir)/mediastreamer2/include/ \
+AM_CFLAGS = -DIN_LINPHONE \
+		`$(PKG_CONFIG) --cflags ortp` \
+		`$(PKG_CONFIG) --cflags mediastreamer` \
+		`$(PKG_CONFIG) --cflags linphone` \
 		$(LIBGLADE_CFLAGS) $(STRICT_OPTIONS) $(LIBGTK_CFLAGS) $(IPV6_CFLAGS) \
-		$(ORTP_CFLAGS) $(OSIP_CFLAGS) 
+		$(OSIP_CFLAGS) 
 
 all: all-am
 




--- mediastreamer2/src/ice.c.orig	2007-10-18 22:05:10.000000000 +0200
+++ mediastreamer2/src/ice.c	2008-03-31 10:12:57.000000000 +0200
@@ -18,9 +18,7 @@
 */
 
 #if !defined(WIN32) && !defined(_WIN32_WCE)
-#ifdef __APPLE__
 #include <sys/types.h>
-#endif
 #include <sys/socket.h>
 #include <netdb.h>
 #endif




--- mediastreamer2/src/dsptools.c.orig	2009-09-19 14:00:35.000000000 -0300
+++ mediastreamer2/src/dsptools.c	2009-09-19 14:01:21.000000000 -0300
@@ -56,10 +56,6 @@
 
 #ifdef HAVE_ALLOCA_H
 #include <alloca.h>
-#else
-#if !defined(__APPLE__)
-#include <malloc.h>
-#endif
 #endif
 
 #define ALLOC(var,size,type) var = alloca(sizeof(type)*(size))




--- mediastreamer2/src/ice.c.orig	2007-10-18 22:05:10.000000000 +0200
+++ mediastreamer2/src/ice.c	2008-03-31 10:12:57.000000000 +0200
@@ -18,9 +18,7 @@
 */
 
 #if !defined(WIN32) && !defined(_WIN32_WCE)
-#ifdef __APPLE__
 #include <sys/types.h>
-#endif
 #include <sys/socket.h>
 #include <netdb.h>
 #endif

Return to bug 138992

Lines 6-17 Link Here

(-)Makefile (-4 / +4 lines)
6	#	6	#
7		7
8	PORTNAME= linphone	8	PORTNAME= linphone
9	PORTVERSION= 3.1.2	9	PORTVERSION= 3.2.0
10	PORTEPOCH= 1	10	PORTEPOCH= 1
11	CATEGORIES?= net	11	CATEGORIES?= net
12	MASTER_SITES= SAVANNAH/${PORTNAME}/stable/sources	12	MASTER_SITES= SAVANNAH/${PORTNAME}/stable/sources
13		13
14	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= scjamorim@bsd.com.br
15	COMMENT= A web phone that supports SIP protocol	15	COMMENT= A web phone that supports SIP protocol
16		16
17	LIB_DEPENDS= gsm.1:${PORTSDIR}/audio/gsm \	17	LIB_DEPENDS= gsm.1:${PORTSDIR}/audio/gsm \
Lines 45-52 Link Here
45	.endif	45	.endif
46		46
47	.if defined(LINPHONE_GUI)	47	.if defined(LINPHONE_GUI)
48	BUILD_DEPENDS+= linphone-base>=3.1.2:${PORTSDIR}/net/linphone-base	48	BUILD_DEPENDS+= linphone-base>=${PORTVERSION}:${PORTSDIR}/net/linphone-base
49	RUN_DEPENDS+= linphone-base>=3.1.2:${PORTSDIR}/net/linphone-base	49	RUN_DEPENDS+= linphone-base>=${PORTVERSION}:${PORTSDIR}/net/linphone-base
50	DESCR= ${PKGDIR}/pkg-descr.gui	50	DESCR= ${PKGDIR}/pkg-descr.gui
51	PLIST= ${PKGDIR}/pkg-plist.gui	51	PLIST= ${PKGDIR}/pkg-plist.gui
52	USE_GNOME+= libglade2	52	USE_GNOME+= libglade2

Lines 7-21 Link Here

(-)pkg-plist (-1 / +4 lines)
7	include/linphone/sipsetup.h	7	include/linphone/sipsetup.h
8	include/mediastreamer2/allfilters.h	8	include/mediastreamer2/allfilters.h
9	include/mediastreamer2/dtmfgen.h	9	include/mediastreamer2/dtmfgen.h
		10	include/mediastreamer2/dsptools.h
10	include/mediastreamer2/ice.h	11	include/mediastreamer2/ice.h
11	include/mediastreamer2/mediastream.h	12	include/mediastreamer2/mediastream.h
12	include/mediastreamer2/mscommon.h	13	include/mediastreamer2/mscommon.h
		14	include/mediastreamer2/msequalizer.h
13	include/mediastreamer2/msfileplayer.h	15	include/mediastreamer2/msfileplayer.h
14	include/mediastreamer2/msfilerec.h	16	include/mediastreamer2/msfilerec.h
15	include/mediastreamer2/msfilter.h	17	include/mediastreamer2/msfilter.h
16	include/mediastreamer2/msqueue.h	18	include/mediastreamer2/msqueue.h
17	include/mediastreamer2/msrtp.h	19	include/mediastreamer2/msrtp.h
18	include/mediastreamer2/mssndcard.h	20	include/mediastreamer2/mssndcard.h
		21	include/mediastreamer2/msspeexec.h
19	include/mediastreamer2/mstee.h	22	include/mediastreamer2/mstee.h
20	include/mediastreamer2/msticker.h	23	include/mediastreamer2/msticker.h
21	include/mediastreamer2/msv4l.h	24	include/mediastreamer2/msv4l.h
Lines 43-49 Link Here
43	lib/liblinphone.a	46	lib/liblinphone.a
44	lib/liblinphone.la	47	lib/liblinphone.la
45	lib/liblinphone.so	48	lib/liblinphone.so
46	lib/liblinphone.so.4	49	lib/liblinphone.so.5
47	lib/libmediastreamer.a	50	lib/libmediastreamer.a
48	lib/libmediastreamer.la	51	lib/libmediastreamer.la
49	lib/libmediastreamer.so	52	lib/libmediastreamer.so

Lines 1-6 Link Here

(-)pkg-plist.gui (+3 lines)
1	bin/linphone	1	bin/linphone
2	bin/linphone-3	2	bin/linphone-3
3	share/applications/linphone.desktop	3	share/applications/linphone.desktop
		4	%%DATADIR%%/COPYING
4	%%DATADIR%%/about.glade	5	%%DATADIR%%/about.glade
5	%%DATADIR%%/buddylookup.glade	6	%%DATADIR%%/buddylookup.glade
6	%%DATADIR%%/call_logs.glade	7	%%DATADIR%%/call_logs.glade
Lines 16-24 Link Here
16	%%DATADIR%%/sip_account.glade	17	%%DATADIR%%/sip_account.glade
17	%%DATADIR%%/stock_people.png	18	%%DATADIR%%/stock_people.png
18	%%DATADIR%%/waiting.glade	19	%%DATADIR%%/waiting.glade
		20	share/pixmaps/linphone/green.png
19	share/pixmaps/linphone/linphone.png	21	share/pixmaps/linphone/linphone.png
20	share/pixmaps/linphone/linphone2.png	22	share/pixmaps/linphone/linphone2.png
21	share/pixmaps/linphone/linphone2.xpm	23	share/pixmaps/linphone/linphone2.xpm
		24	share/pixmaps/linphone/red.png
22	share/pixmaps/linphone/sip-away.png	25	share/pixmaps/linphone/sip-away.png
23	share/pixmaps/linphone/sip-bifm.png	26	share/pixmaps/linphone/sip-bifm.png
24	share/pixmaps/linphone/sip-busy.png	27	share/pixmaps/linphone/sip-busy.png

Removed Link Here

(-)files/patch-coreapi::linphonecore.c (-23 lines)
1	--- coreapi/linphonecore.c.orig 2009-03-10 00:22:47.000000000 +0900
2	+++ coreapi/linphonecore.c 2009-03-26 01:38:40.000000000 +0900
3	@@ -29,11 +29,9 @@
4	#include "exevents.h"
5
6
7	-#ifdef INET6
8	#ifndef WIN32
9	#include <netdb.h>
10	#endif
11	-#endif
12
13	#ifdef WIN32
14	#define HAVE_EXOSIP_GET_VERSION 1
15	@@ -341,7 +339,7 @@
16	const char **devices;
17	int ndev;
18	int i;
19	-#ifndef WIN32
20	+#ifdef __linux
21	/alsadev let the user use custom alsa device within linphone/
22	devid=lp_config_get_string(lc->config,"sound","alsadev",NULL);
23	if (devid){

Added Link Here

(-)files/patch-coreapi_linphonecore.c (+14 lines)
1	--- coreapi/linphonecore.c.orig 2009-09-19 13:56:58.000000000 -0300
2	+++ coreapi/linphonecore.c 2009-09-19 13:58:01.000000000 -0300
3	@@ -31,11 +31,9 @@
4	#include "exevents.h"
5
6
7	-#ifdef INET6
8	#ifndef WIN32
9	#include <netdb.h>
10	#endif
11	-#endif
12
13	#ifdef WIN32
14	#define HAVE_EXOSIP_GET_VERSION 1

Added Link Here

(-)files/patch-gtk-glade_Makefile.in (+41 lines)
1	--- gtk-glade/Makefile.in.orig 2009-09-18 20:07:22.000000000 -0300
2	+++ gtk-glade/Makefile.in 2009-09-18 20:38:19.000000000 -0300
3	@@ -77,9 +77,6 @@
4	@BUILD_GLADE_UI_TRUE@@BUILD_WIN32_TRUE@am__DEPENDENCIES_2 = \
5	@BUILD_GLADE_UI_TRUE@@BUILD_WIN32_TRUE@ linphone.res
6	@BUILD_GLADE_UI_TRUE@linphone_3_DEPENDENCIES = \
7	-@BUILD_GLADE_UI_TRUE@ $(top_builddir)/oRTP/src/libortp.la \
8	-@BUILD_GLADE_UI_TRUE@ $(top_builddir)/mediastreamer2/src/libmediastreamer.la \
9	-@BUILD_GLADE_UI_TRUE@ $(top_builddir)/coreapi/liblinphone.la \
10	@BUILD_GLADE_UI_TRUE@ $(am__DEPENDENCIES_1) \
11	@BUILD_GLADE_UI_TRUE@ $(am__DEPENDENCIES_1) \
12	@BUILD_GLADE_UI_TRUE@ $(am__DEPENDENCIES_1) \
13	@@ -335,9 +332,9 @@
14	@BUILD_GLADE_UI_TRUE@ linphone.h
15
16	@BUILD_GLADE_UI_TRUE@linphone_3_LDADD = \
17	-@BUILD_GLADE_UI_TRUE@ $(top_builddir)/oRTP/src/libortp.la \
18	-@BUILD_GLADE_UI_TRUE@ $(top_builddir)/mediastreamer2/src/libmediastreamer.la \
19	-@BUILD_GLADE_UI_TRUE@ $(top_builddir)/coreapi/liblinphone.la \
20	+@BUILD_GLADE_UI_TRUE@ `$(PKG_CONFIG) --libs ortp` \
21	+@BUILD_GLADE_UI_TRUE@ `$(PKG_CONFIG) --libs mediastreamer` \
22	+@BUILD_GLADE_UI_TRUE@ `$(PKG_CONFIG) --libs linphone` \
23	@BUILD_GLADE_UI_TRUE@ $(LIBGTK_LIBS) $(INTLLIBS) \
24	@BUILD_GLADE_UI_TRUE@ $(LIBGLADE_LIBS) $(am__append_1)
25	@BUILD_GLADE_UI_TRUE@@BUILD_WIN32_FALSE@linphone_3_LDFLAGS = -export-dynamic
26	@@ -349,10 +346,12 @@
27
28	#gtk-linphone.ui: gtk-linphone.glade
29	# gtk-builder-convert gtk-linphone.glade $@
30	-AM_CFLAGS = -DIN_LINPHONE -I$(top_srcdir)/coreapi/ \
31	- -I$(top_srcdir)/mediastreamer2/include/ \
32	+AM_CFLAGS = -DIN_LINPHONE \
33	+ `$(PKG_CONFIG) --cflags ortp` \
34	+ `$(PKG_CONFIG) --cflags mediastreamer` \
35	+ `$(PKG_CONFIG) --cflags linphone` \
36	$(LIBGLADE_CFLAGS) $(STRICT_OPTIONS) $(LIBGTK_CFLAGS) $(IPV6_CFLAGS) \
37	- $(ORTP_CFLAGS) $(OSIP_CFLAGS)
38	+ $(OSIP_CFLAGS)
39
40	CLEANFILES = version_date.h
41	all: $(BUILT_SOURCES)

Removed Link Here

(-)files/patch-gtk-glade__Makefile.in (-41 lines)
1	--- gtk-glade/Makefile.in.orig 2009-03-17 21:12:10.000000000 +0900
2	+++ gtk-glade/Makefile.in 2009-03-17 21:17:21.000000000 +0900
3	@@ -69,9 +69,6 @@
4	linphone_3_OBJECTS = $(am_linphone_3_OBJECTS)
5	am__DEPENDENCIES_1 =
6	@BUILD_GLADE_UI_TRUE@linphone_3_DEPENDENCIES = \
7	-@BUILD_GLADE_UI_TRUE@ $(top_builddir)/oRTP/src/libortp.la \
8	-@BUILD_GLADE_UI_TRUE@ $(top_builddir)/mediastreamer2/src/libmediastreamer.la \
9	-@BUILD_GLADE_UI_TRUE@ $(top_builddir)/coreapi/liblinphone.la \
10	@BUILD_GLADE_UI_TRUE@ $(am__DEPENDENCIES_1) \
11	@BUILD_GLADE_UI_TRUE@ $(am__DEPENDENCIES_1) \
12	@BUILD_GLADE_UI_TRUE@ $(am__DEPENDENCIES_1)
13	@@ -315,9 +312,9 @@
14	@BUILD_GLADE_UI_TRUE@ buddylookup.c \
15	@BUILD_GLADE_UI_TRUE@ linphone.h
16
17	-@BUILD_GLADE_UI_TRUE@linphone_3_LDADD = $(top_builddir)/oRTP/src/libortp.la \
18	-@BUILD_GLADE_UI_TRUE@ $(top_builddir)/mediastreamer2/src/libmediastreamer.la \
19	-@BUILD_GLADE_UI_TRUE@ $(top_builddir)/coreapi/liblinphone.la \
20	+@BUILD_GLADE_UI_TRUE@linphone_3_LDADD = `$(PKG_CONFIG) --libs ortp` \
21	+@BUILD_GLADE_UI_TRUE@ `$(PKG_CONFIG) --libs mediastreamer` \
22	+@BUILD_GLADE_UI_TRUE@ `$(PKG_CONFIG) --libs linphone` \
23	@BUILD_GLADE_UI_TRUE@ $(LIBGTK_LIBS) $(INTLLIBS) \
24	@BUILD_GLADE_UI_TRUE@ $(LIBGLADE_LIBS)
25
26	@@ -329,10 +326,12 @@
27
28	#gtk-linphone.ui: gtk-linphone.glade
29	# gtk-builder-convert gtk-linphone.glade $@
30	-AM_CFLAGS = -DIN_LINPHONE -I$(top_srcdir)/coreapi/ \
31	- -I$(top_srcdir)/mediastreamer2/include/ \
32	+AM_CFLAGS = -DIN_LINPHONE \
33	+ `$(PKG_CONFIG) --cflags ortp` \
34	+ `$(PKG_CONFIG) --cflags mediastreamer` \
35	+ `$(PKG_CONFIG) --cflags linphone` \
36	$(LIBGLADE_CFLAGS) $(STRICT_OPTIONS) $(LIBGTK_CFLAGS) $(IPV6_CFLAGS) \
37	- $(ORTP_CFLAGS) $(OSIP_CFLAGS)
38	+ $(OSIP_CFLAGS)
39
40	all: all-am
41

Removed Link Here

(-)files/patch-mediastreamer2__src__ice.c (-12 lines)
1	--- mediastreamer2/src/ice.c.orig 2007-10-18 22:05:10.000000000 +0200
2	+++ mediastreamer2/src/ice.c 2008-03-31 10:12:57.000000000 +0200
3	@@ -18,9 +18,7 @@
4	*/
5
6	#if !defined(WIN32) && !defined(_WIN32_WCE)
7	-#ifdef __APPLE__
8	#include <sys/types.h>
9	-#endif
10	#include <sys/socket.h>
11	#include <netdb.h>
12	#endif

Added Link Here

(-)files/patch-mediastreamer2_src_dsptools.c (+13 lines)
1	--- mediastreamer2/src/dsptools.c.orig 2009-09-19 14:00:35.000000000 -0300
2	+++ mediastreamer2/src/dsptools.c 2009-09-19 14:01:21.000000000 -0300
3	@@ -56,10 +56,6 @@
4
5	#ifdef HAVE_ALLOCA_H
6	#include <alloca.h>
7	-#else
8	-#if !defined(__APPLE__)
9	-#include <malloc.h>
10	-#endif
11	#endif
12
13	#define ALLOC(var,size,type) var = alloca(sizeof(type)*(size))

Added Link Here

(-)files/patch-mediastreamer2_src_ice.c (+12 lines)
1	--- mediastreamer2/src/ice.c.orig 2007-10-18 22:05:10.000000000 +0200
2	+++ mediastreamer2/src/ice.c 2008-03-31 10:12:57.000000000 +0200
3	@@ -18,9 +18,7 @@
4	*/
5
6	#if !defined(WIN32) && !defined(_WIN32_WCE)
7	-#ifdef __APPLE__
8	#include <sys/types.h>
9	-#endif
10	#include <sys/socket.h>
11	#include <netdb.h>
12	#endif