Commit graph

52 commits

Author SHA1 Message Date
Guillaume BIENKOWSKI
081e941f36 Move KIF framework dependency out of CocoaPods and into a submodule. This will ease the compilation. 2015-02-18 10:29:12 +01:00
Gautier Pelloux-Prayer
73e068628b Use linphone.org copy of ffmpeg/x264 because videolan.org get lots of timeout 2015-01-28 11:09:50 +01:00
Guillaume BIENKOWSKI
ca62c24342 Fix opencore amr old scripts and fix name collision in ms2 through linphone 2014-11-19 14:28:15 +01:00
Gautier Pelloux-Prayer
05a122c892 Ignore changes in external submodules 2014-09-24 12:03:22 +02:00
Jehan Monnier
dc6c16e389 switch from http:// from git:// for opus submodule 2014-07-07 17:31:52 +02:00
Ghislain MARY
c80568fd26 Compile the iSAC codec from the mswebrtc plugin instead of the msisac plugin. 2014-06-13 16:03:56 +02:00
Simon Morlat
2eddb8ad81 merge tunnel branch into main branch so that source code is exactly the same in the two branches.
The only difference is the presence of the submodules/tunnel .
2014-04-23 09:36:55 +02:00
Simon Morlat
3376388982 Merge remote-tracking branch 'public/master' into tunnel
Conflicts:
	Classes/LinphoneCoreSettingsStore.m
	Classes/LinphoneManager.m
	linphone.xcodeproj/project.pbxproj
	submodules/build/Makefile
	submodules/build/builder-iphone-os.mk
2014-04-14 12:52:00 +02:00
Ghislain MARY
8d23daf39c Build OpenH264 in the SDK. 2014-04-04 15:39:09 +02:00
Johan Pascal
949a8c1d9c Switch to BZRTP engine 2014-04-02 09:55:54 +02:00
Guillaume BIENKOWSKI
48eb194e2f Change opus repo address to HTTP, the git:// backend seems down.. 2014-03-25 09:06:22 +01:00
Guillaume BIENKOWSKI
4e6abdf82a Add CUNIT repo to linphone-iphone, to enable unit tests to compile
+ update belle-sip and linphone to get fixes for this compilation to proceed
+ make the SDK build correctly with these tests
2014-02-28 10:36:38 +01:00
Johan Pascal
e7e583cd1d Update libzrtp to v4 in standalone mode
- update srtp to include name collision correction
- update linphone to get updated oRTP using libzrtpv4 API
2014-01-08 20:34:19 +01:00
Guillaume BIENKOWSKI
0728679785 Added msisac module to the compilation process. Only available in the SDK for now. 2014-01-03 09:38:39 +01:00
Guillaume BIENKOWSKI
1ec60999ab Merge remote-tracking branch 'public/master' into tunnel
Conflicts:
	Classes/LinphoneManager.h
	Classes/LinphoneManager.m
	linphone.xcodeproj/project.pbxproj
	submodules/build/Makefile
	submodules/build/builder-iphone-os.mk

+ Made modifications to the tunnel compilation so that it builds without openssl.
2013-11-05 10:54:23 +01:00
Ghislain MARY
b385211a15 Update git urls from sourceforge. 2013-09-04 09:24:45 +02:00
Jehan Monnier
a23d44ac11 update gitmodule to use public repo 2013-07-27 00:55:17 +02:00
Ghislain MARY
8d90c785c3 Add libxml2 dependency. 2013-06-20 14:46:51 +02:00
Jehan Monnier
8f74160e83 Merge remote-tracking branch 'origin/master' into belle-sip
Conflicts:
	.gitmodules
	linphone.xcodeproj/project.pbxproj
	submodules/build/builder-iphone-os.mk
	submodules/build/builders.d/libvpx.mk
	submodules/build/builders.d/mssilk.mk
	submodules/build/builders.d/opencore-amr.mk
	submodules/build/iphone-config.site
	submodules/liblinphone.xcodeproj/project.pbxproj
	submodules/linphone
2013-06-04 10:31:39 +02:00
Jehan Monnier
7162af2c3d add opus submodule 2013-05-27 22:07:52 +02:00
Simon Morlat
874e15fb23 change the antlr git url to public one 2013-05-10 11:06:30 +02:00
Simon Morlat
c422b7b553 Merge remote-tracking branch 'public/master' into belle-sip
and add polarssl
Conflicts:
	submodules/liblinphone.xcodeproj/project.pbxproj
	submodules/linphone
2013-05-07 22:55:03 +02:00
Simon Morlat
1e390ccd22 set correct submodules and clean unused. 2013-03-20 15:17:52 +01:00
Jehan Monnier
23a54227aa first belle-sip version 2013-02-27 14:51:03 +01:00
Simon Morlat
4e2de700fb Merge branch 'master' into tunnel
Conflicts:
	.gitmodules
	Classes/LinphoneUI/LinphoneManager.m
	linphone.xcodeproj/project.pbxproj
	submodules/build/Makefile
	submodules/build/builder-iphone-os.mk
2012-03-16 15:50:55 +01:00
Jehan Monnier
41a2a33666 g729A integration based on bcg729 2012-02-16 15:46:45 +01:00
Simon Morlat
68bb10b55e restore tunnel submodule in submodules/, update linphone submodule, update exosip 2012-01-31 13:42:33 +01:00
Jehan Monnier
26f4350636 fix wrong git module for linphone 2012-01-30 18:10:16 +01:00
Jehan Monnier
34051bf247 update with new tunnel api 2011-12-22 14:18:21 +01:00
Guillaume Beraudo
8d81fc2ba1 Multi call / conference tunnel support. 2011-12-20 18:12:40 +01:00
Simon Morlat
e03056ae6e Merge branch 'master' into tunnel
not fully working
Conflicts:
	Classes/LinphoneUI/LinphoneManager.h
	Classes/LinphoneUI/LinphoneManager.m
	linphone.xcodeproj/project.pbxproj
	submodules/build/Makefile
	submodules/build/builder-iphone-os.mk
	submodules/build/builders.d/openssl.mk
	submodules/liblinphone.xcodeproj/project.pbxproj
2011-12-12 18:28:03 +01:00
Jehan Monnier
8e2ebf38dd update speex repo to use our version
fix some compilation issue
2011-11-21 12:53:43 +01:00
Jehan Monnier
8a1c3000cd merge vios IOS with master 2011-11-18 14:23:41 +01:00
Jehan Monnier
0ad82b4cff Merge remote-tracking branch 'private/dev_videoios'
Conflicts:
	.gitmodules
	Classes/LinphoneAppDelegate.m
	Settings.bundle/Root.plist
	linphone.xcodeproj/project.pbxproj
	submodules/build/builder-iphone-os.mk
	submodules/liblinphone.xcodeproj/project.pbxproj
	submodules/linphone
2011-11-15 10:54:56 +01:00
Jehan Monnier
51915a4bac fix srtp build 2011-11-14 15:44:10 +01:00
Jehan Monnier
2b892c2cfb remove lib silk fromxcode 2011-11-04 14:35:00 +01:00
Guillaume Beraudo
fb2ddd1b33 Silk plugin for iPhone. 2011-11-03 13:44:49 +01:00
Jehan Monnier
ddeaddf92d Merge remote-tracking branch 'public/master' into dev_videoios
IOS migration

Conflicts:
	.gitignore
	.gitmodules
	linphone-Info.plist
	linphone.xcodeproj/project.pbxproj
	submodules/build/builder-iphone-os.mk
	submodules/build/iphone-config.site
	submodules/externals/osip
	submodules/liblinphone.xcodeproj/project.pbxproj
	submodules/linphone
2011-10-19 11:36:27 +02:00
Jehan Monnier
df20927668 fix for IOS 5 2011-10-14 18:03:40 +02:00
Jehan Monnier
2635db3b74 fix audio for IOS5 2011-10-14 16:14:54 +02:00
Jehan Monnier
eed3953489 update libvpx repo, update msx264 2011-10-10 12:21:13 +02:00
Jehan Monnier
d0fe563edc update libvpx repo 2011-09-05 16:48:48 +02:00
Guillaume Beraudo
63745b55fd Compilation chain for ZRTP (no implementation) 2011-08-26 18:41:46 +02:00
Pierre-Eric Pelloux-Prayer
8ae28404e1 ios: add vp8 compilation scripts 2011-08-03 15:51:23 +02:00
Jehan Monnier
60dc4634b3 fix wrong submodule repo for linphone 2011-07-13 10:58:21 +02:00
Jehan Monnier
0bfd331928 start video on ios 2011-06-10 09:30:41 +02:00
Jehan Monnier
97084dfa71 add ffmpeg compilation 2011-06-07 14:47:32 +02:00
Jehan Monnier
6e97edcafd Merge remote branch 'bc/master' into tunnel
Conflicts:
	.gitmodules
	Classes/LinphoneUI/LinphoneManager.m
	linphone.xcodeproj/project.pbxproj
2011-04-05 18:55:49 +02:00
Jehan Monnier
a9ab705dfa add AMR support. Should be use with compilation flag HAVE_AMR 2011-04-04 14:54:28 +02:00
Jehan Monnier
a0f30669db implement tunnel 2011-03-17 12:36:25 +01:00