Commit graph

209 commits

Author SHA1 Message Date
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
81ce1181b4 restore tunnel build, fix crash occuring with lastest polarssl 2014-04-22 23:37:46 +02:00
Simon Morlat
edd0d46291 Merge remote-tracking branch 'public/master' into tunnel
Conflicts:
	Classes/LinphoneCoreSettingsStore.m
2014-04-22 17:03:25 +02:00
Simon Morlat
02afae59eb integrate permissive patch of openh264 2014-04-16 11:25:20 +02:00
Simon Morlat
988bc012ca Merge remote-tracking branch 'public/master' into tunnel 2014-04-14 20:14:22 +02:00
Simon Morlat
15fb9cac57 fix crash in mediastreamer2
fix symbol conflict with sha256
2014-04-14 20:13:31 +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
Guillaume BIENKOWSKI
bff266f396 Fix veryclean for openh264 2014-04-08 09:13:06 +02:00
Ghislain MARY
8d23daf39c Build OpenH264 in the SDK. 2014-04-04 15:39:09 +02:00
Johan Pascal
0d679c6f77 Add missing makefiles 2014-04-02 09:55:54 +02:00
Guillaume Bienkowski
6cca2c777b Handle take_binary for i386 2014-04-01 16:25:36 +02:00
Guillaume BIENKOWSKI
5fc519f8a2 Add the ability to force the use of compiled versions of libvpx 2014-04-01 16:25:28 +02:00
Guillaume BIENKOWSKI
29cca9bfe9 Use binary distribution for libvpx, since the new Apple compiler (Xcode 5.1) outputs crashing code. 2014-03-28 14:12:07 +01:00
Guillaume BIENKOWSKI
5ab859fd08 Apply the proposed fix for the garbling of vp8 here: https://code.google.com/p/webm/issues/detail?id=603#c45 2014-03-27 10:26:58 +01:00
Guillaume BIENKOWSKI
3df38649f6 Enable h263 2014-03-18 10:21:52 +01:00
Guillaume BIENKOWSKI
f54fe6a7d0 Remove unknown option warnings 2014-03-13 14:42:13 +01:00
Guillaume BIENKOWSKI
2ab72a27bb Fix msisac Werror with Clang for Xcode 5.1 2014-03-12 16:08:45 +01:00
Guillaume BIENKOWSKI
426878bef0 Fix Xcode 5.1 / Apple LLVM version 5.1 (clang-503.0.38) (based on LLVM 3.4svn) complains about unused command line args 2014-03-12 14:33:31 +01:00
Guillaume BIENKOWSKI
856f84c2b8 Enable liblinphone_tester in Xcode 2014-03-05 14:16:01 +01:00
Guillaume BIENKOWSKI
a5c06ade4a Add missing cunit compilation directives 2014-02-28 10:58:46 +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
Guillaume BIENKOWSKI
7113078817 Fix polarssl compilation nightmare 2014-02-20 17:30:30 +01:00
Guillaume BIENKOWSKI
130476990c Fix polarssl errors at compilation 2014-02-20 11:03:44 +01:00
Guillaume BIENKOWSKI
0b3d423865 Update polarssl 2014-02-19 11:16:07 +01:00
Guillaume BIENKOWSKI
21facbcd9c Removed dependency on libvpx patch 2014-02-13 12:20:31 +01:00
Guillaume BIENKOWSKI
0848c79e92 Migrate to VP8 version 1.3 2014-02-12 09:26:44 +01:00
Guillaume BIENKOWSKI
b0e95c9934 Added a target to zip the iOS resources for rebranding. 2014-01-24 13:59:14 +01:00
Guillaume BIENKOWSKI
5fa1feef61 Fix typo 2014-01-15 11:13:11 +01:00
Guillaume BIENKOWSKI
2a729b35bf Enable ZRTP compilation by default 2014-01-15 11:11:53 +01:00
Jehan Monnier
834ca0e371 re-enable zrtp 2014-01-14 16:20:10 +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
b2904d4c04 Resolve iOS7 VPX corruption. This dramatically improves image quality for VP8! 2013-11-19 16:08:31 +01:00
Guillaume BIENKOWSKI
43602710a2 Use binary version of the silk lib for armV7.
This enables older devices (iPhone4) to handle the SILK codec normally again.
2013-11-05 15:49:37 +01:00
Guillaume BIENKOWSKI
84a638e198 Typo 2013-11-05 15:48:06 +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
Guillaume BIENKOWSKI
467356148d Fix libilbc cleanup. 2013-11-04 12:24:11 +01:00
Guillaume BIENKOWSKI
b60ca6b5f7 Don't cancel non-GPL build when FFMPEG is activated.
Instead, disable it.
2013-10-21 16:10:20 +02:00
Guillaume BIENKOWSKI
4bc6556a15 Re-enable ffmpeg in master
+ typo in veryclean
2013-10-18 11:03:15 +02:00
Guillaume BIENKOWSKI
521c008f24 Some commands for distclean in FFMPEG fail in OSX,
so don't account on these. We simply remove the 
folder afterwards.
2013-10-15 09:27:13 +02:00
Guillaume BIENKOWSKI
7f944c91d0 Merge branch 'master' into apple_store
Conflicts:
	Classes/SettingsViewController.m
2013-10-14 17:11:07 +02:00
Guillaume BIENKOWSKI
779a0909d8 Optimized the build system for something shorter. 2013-10-14 17:06:54 +02:00
Guillaume BIENKOWSKI
1e27d3d3d7 Disable FFMPEG for Appstore build 2013-10-11 16:33:50 +02:00
Guillaume BIENKOWSKI
4627ff65cd Typo in mssilk builder 2013-10-10 10:45:35 +02:00
Guillaume BIENKOWSKI
a9fbf3b36a Modification of the build process to enable GPL
builds without FFMPEG.
Also simplified the process of adding options that
require a reconfiguration of the linphone build.
2013-10-09 17:26:34 +02:00
Guillaume BIENKOWSKI
518dd9e9c7 Enable PIE for ffmpeg and x264.
Note that the x264 compilation seems to generate non-PIC code even though the option is passed.
2013-10-04 10:25:08 +02:00
Guillaume BIENKOWSKI
be2b671628 Fix i386 compilation, which was triggering link errors for the iPhoneSimulator target. 2013-10-03 14:49:34 +02:00
Guillaume BIENKOWSKI
3eec08773c Disable the gcc in opencore-amr, which fixes compiler issue (was producing x86 versions even for arm targets…) 2013-10-02 11:24:21 +02:00
Guillaume BIENKOWSKI
cc6074ad33 + Fix x264 patch not applied after a clean
+ Fix libvpx and zrtp compilation for XCode 4.x

Overall, we transition from using gcc to using clang all the way. This solves some tricky problems with -mtune options and architecture-dependant configure issues.
2013-10-01 17:41:37 +02:00
Guillaume BIENKOWSKI
ce17708a34 Re-enable x264 patching and fix patch file. 2013-10-01 08:58:14 +02:00