Commit graph

247 commits

Author SHA1 Message Date
Simon Morlat
5db768ff29 update sip stack for new debug traces 2013-05-31 18:24:03 +02:00
Jehan Monnier
7162af2c3d add opus submodule 2013-05-27 22:07:52 +02:00
Ghislain MARY
f870e7b6a2 Merge branch 'master' of git.linphone.org:linphone-iphone into tunnel 2013-05-23 11:40:37 +02:00
Jehan Monnier
bd5fccb963 update libvpx to v1.2.0 2013-05-22 16:13:35 +02:00
Jehan Monnier
5ea8097ddd update libvpx to v1.2.0 2013-05-22 16:13:35 +02:00
Simon Morlat
479031cbc8 add polarssl into the build and update srtp to fix duplicated symbols 2013-05-09 18:08:47 +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
Ghislain MARY
49baee893d Install the tutorials source code in the sdk zip and use this installed source code in the tutorials xcode project. 2013-04-10 12:27:29 +02:00
Ghislain MARY
814545b13c Install the tutorials source code in the sdk zip and use this installed source code in the tutorials xcode project. 2013-04-10 12:27:29 +02:00
Jehan Monnier
b01f675674 enable push with belle-sip 2013-03-08 15:47:57 +01:00
Jehan Monnier
23a54227aa first belle-sip version 2013-02-27 14:51:03 +01:00
Yann Diorcet
233f22e5d7 Merge branch 'master' into tunnel
Conflicts:
	Classes/LinphoneUI/LinphoneManager.h
	Classes/LinphoneUI/LinphoneManager.m
	Settings.bundle/Root.plist
	Settings/InAppSettings.bundle/Root.plist
	linphone.xcodeproj/project.pbxproj
	submodules/build/builders.d/x264.mk
2013-01-15 12:58:42 +01:00
Ghislain MARY
c0c3d29058 Merge branch 'branch_1.x' of git.linphone.org:linphone-iphone into tunnel 2012-12-20 08:46:28 +01:00
Ghislain MARY
4aa170c387 Fix x264 build. 2012-12-20 08:45:16 +01:00
Ghislain MARY
9686dce6d3 Merge branch 'branch_1.x' of git.linphone.org:linphone-iphone into tunnel 2012-12-17 11:49:40 +01:00
Jehan Monnier
93c8a62dbd fix x264 bug on iphone5 2012-11-09 02:04:10 +01:00
Simon Morlat
8fac0fa65e update openssl 2012-09-26 22:46:07 +02:00
Jehan Monnier
c126a5172d remove armv6 build
Conflicts:

	README
2012-09-26 16:43:55 +02:00
Jehan Monnier
286efef8ae remove armv6 build 2012-09-21 22:29:33 +02:00
Jehan Monnier
8a50dae15a fix build for xcode4.4 2012-09-18 15:55:36 +02:00
Jehan Monnier
20ef4a2469 xcode 4.6/ios6 support
Conflicts:

	submodules/linphone
2012-09-18 15:55:11 +02:00
Jehan Monnier
b226d0de32 fix build for xcode4.4 2012-09-18 15:04:47 +02:00
Jehan Monnier
0cfc20b8da xcode 4.6/ios6 support 2012-09-18 10:32:00 +02:00
Jehan Monnier
5aa42780c1 Merge remote-tracking branch 'origin/master' into tunnel
Conflicts:
	Classes/LinphoneUI/LinphoneManager.m
2012-05-14 12:12:09 +02:00
Sylvain Berfini
3835bb24d8 make ios build release instrad of adhoc 2012-05-03 16:59:31 +02:00
Jehan Monnier
b4ece1c7e1 implement wifi only mode 2012-05-02 09:25:39 +02:00
Simon Morlat
74c7a81c07 fix crash at startup because of missing srtp_shutdown 2012-04-27 17:12:25 +02:00
Simon Morlat
9af95dc58e Merge remote-tracking branch 'origin/master' into tunnel
Conflicts:
	Classes/LinphoneUI/LinphoneManager.m
	linphone.xcodeproj/project.pbxproj
	submodules/build/Makefile
	submodules/externals/exosip
	submodules/liblinphone.xcodeproj/project.pbxproj
	submodules/linphone
	submodules/mssilk
2012-04-26 15:09:04 +02:00
Jehan Monnier
c4f494a537 put all target first 2012-04-03 11:04:22 +02:00
Simon Morlat
46f934eaf2 repair gpl build 2012-03-26 17:13:06 +02:00
Simon Morlat
da017901fc make zrtp compilation optional 2012-03-26 12:27:24 +02: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
Simon Morlat
447556710d port to Xcode 4.3 (libvpx patch added) 2012-03-13 23:30:16 +01:00
Simon Morlat
bf174fe05a update README and config site to work with Xcode 4.3 2012-03-09 22:05:04 +01:00
Jehan Monnier
41a2a33666 g729A integration based on bcg729 2012-02-16 15:46:45 +01:00
Yann Diorcet
0de57c7d28 Fix ipa rule 2012-02-15 14:12:08 +01:00
Yann Diorcet
8fb0c59da9 Add rule to make ipa 2012-02-15 13:01:24 +01:00
Jehan Monnier
122fa2601d replace PKG_CONFIG_PATH by PKG_CONFIG_LIBDIR 2012-02-09 10:27:15 +01:00
Pierre-Eric Pelloux-Prayer
17cc55d854 Merge remote-tracking branch 'public/master' into tunnel
Conflicts:
	Classes/LinphoneUI/LinphoneManager.h
	Settings.bundle/Root.plist
	linphone.xcodeproj/project.pbxproj
	nogpl-thirdparties/Settings.bundle/Root.plist
	submodules/build/builder-iphone-os.mk
	submodules/linphone
2012-02-06 13:22:39 +01:00
Simon Morlat
68bb10b55e restore tunnel submodule in submodules/, update linphone submodule, update exosip 2012-01-31 13:42:33 +01:00
Pierre-Eric Pelloux-Prayer
4d321f9055 Define MS2_MINIMAL_SIZE when building mediastreamer2
This avoids embedding a not used 20kB image array
2012-01-19 14:32:25 +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
Pierre-Eric Pelloux-Prayer
40783c14e4 Update libvpx
And remove patch which isn't necessary anymore.
2011-12-19 11:12:49 +01:00
Pierre-Eric Pelloux-Prayer
d3b45ea79c vp8: update build script 2011-12-15 14:47:16 +01:00
Pierre-Eric Pelloux-Prayer
e1fe0f0291 iOS: iPad port (UI and VP8 improvements)
New xib files, new home screen.
libvpx updated, multithreading enabled
2011-12-15 14:47:14 +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
5d49e8d5d8 fix Could not read socket issue + speex issue 2011-11-28 12:36:45 +01:00
Pierre-Eric Pelloux-Prayer
d6ea52ed1a New speex version 2011-11-22 16:09:14 +01:00
Jehan Monnier
8e2ebf38dd update speex repo to use our version
fix some compilation issue
2011-11-21 12:53:43 +01:00