From 46f934eaf28c241c300b5c163e3a8412ff744f25 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 26 Mar 2012 17:13:06 +0200 Subject: [PATCH 1/6] repair gpl build --- submodules/build/Makefile | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/submodules/build/Makefile b/submodules/build/Makefile index aa1fa2c70..074c16096 100644 --- a/submodules/build/Makefile +++ b/submodules/build/Makefile @@ -22,7 +22,16 @@ enable_gpl_third_parties=yes enable_zrtp=no -.NOTPARALLEL all: build warning +ifeq ($(enable_gpl_third_parties)$(enable_zrtp),noyes) +check_options: + @echo "ZRTP is not available in non-gpl build." + @exit -1 +else +check_options: + +endif + +.NOTPARALLEL all: check_options build warning ifeq ($(enable_gpl_third_parties),yes) warning: @echo @@ -40,18 +49,14 @@ warning: @echo "*****linphone SDK without GPL code ******" @echo "*****************************************************************" @echo "*****************************************************************" - ifeq($(enable_zrtp),yes) - @echo "ZRTP is not available in non-gpl build." - enable_zrtp=no - endif endif -LINPHONE_OPTIONS="enable_gpl_third_parties=$(enable_gpl_third_parties) enable_zrtp=$(enable_zrtp)" +LINPHONE_OPTIONS=enable_gpl_third_parties=$(enable_gpl_third_parties) enable_zrtp=$(enable_zrtp) build: - make -f builder-iphone-os.mk all $(LINPHONE_OPTIONS) \ - && make -f builder-iphone-simulator.mk all $(LINPHONE_OPTIONS) \ - && make -f builder-iphone-os.mk host=armv7-apple-darwin all $(LINPHONE_OPTIONS) \ + make -f builder-iphone-os.mk $(LINPHONE_OPTIONS) all \ + && make -f builder-iphone-simulator.mk $(LINPHONE_OPTIONS) all \ + && make -f builder-iphone-os.mk host=armv7-apple-darwin $(LINPHONE_OPTIONS) all \ && make -f builder-iphone-os.mk delivery-sdk ipa: build @@ -73,3 +78,4 @@ veryclean: make -f builder-iphone-simulator.mk veryclean \ && make -f builder-iphone-os.mk veryclean \ && make -f builder-iphone-os.mk host=armv7-apple-darwin veryclean + From b1304a1169eb448aabb51aa26e29983fe1ad7258 Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Fri, 30 Mar 2012 14:39:16 +0200 Subject: [PATCH 2/6] Load Advanced.plist default value --- Classes/LinphoneAppDelegate.m | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Classes/LinphoneAppDelegate.m b/Classes/LinphoneAppDelegate.m index 6e6653dbc..f8ae57a8e 100644 --- a/Classes/LinphoneAppDelegate.m +++ b/Classes/LinphoneAppDelegate.m @@ -136,10 +136,12 @@ int __aeabi_idiv(int a, int b) { NSMutableDictionary *rootSettings = [NSDictionary dictionaryWithContentsOfFile:[settingsBundle stringByAppendingPathComponent:@"Root.plist"]]; NSMutableDictionary *audioSettings = [NSDictionary dictionaryWithContentsOfFile:[settingsBundle stringByAppendingPathComponent:@"audio.plist"]]; NSMutableDictionary *videoSettings = [NSDictionary dictionaryWithContentsOfFile:[settingsBundle stringByAppendingPathComponent:@"video.plist"]]; + NSMutableDictionary *advancedSettings = [NSDictionary dictionaryWithContentsOfFile:[settingsBundle stringByAppendingPathComponent:@"Advanced.plist"]]; NSMutableArray *preferences = [rootSettings objectForKey:@"PreferenceSpecifiers"]; [preferences addObjectsFromArray:[audioSettings objectForKey:@"PreferenceSpecifiers"]]; [preferences addObjectsFromArray:[videoSettings objectForKey:@"PreferenceSpecifiers"]]; + [preferences addObjectsFromArray:[advancedSettings objectForKey:@"PreferenceSpecifiers"]]; NSMutableDictionary *defaultsToRegister = [[NSMutableDictionary alloc] initWithCapacity:[preferences count]]; From 2f366f5987e294218af5086b078ab7d500a38385 Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Tue, 3 Apr 2012 10:49:58 +0200 Subject: [PATCH 3/6] Explicitely disable 'display_filter_auto_rotate' in linphonerc --- linphonerc | 1 + 1 file changed, 1 insertion(+) diff --git a/linphonerc b/linphonerc index ef80ec31e..c9a14c5d3 100644 --- a/linphonerc +++ b/linphonerc @@ -45,4 +45,5 @@ capture=1 show_local=0 enabled=1 size=qvga +display_filter_auto_rotate=0 From 4075519b8919a7e57a78a018189d9f3436596237 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Tue, 3 Apr 2012 10:54:11 +0200 Subject: [PATCH 4/6] introduce use of card preferred sample rate, usefull for IOS to speed-up call estbalishement --- nogpl-thirdparties/.DS_Store | Bin 6148 -> 0 bytes .../liblinphone.xcodeproj/project.pbxproj | 1252 ++++++++++++++--- submodules/linphone | 2 +- submodules/mssilk | 2 +- 4 files changed, 1049 insertions(+), 207 deletions(-) delete mode 100644 nogpl-thirdparties/.DS_Store diff --git a/nogpl-thirdparties/.DS_Store b/nogpl-thirdparties/.DS_Store deleted file mode 100644 index 6e81d9c8446303de41841c7b42019d2be3deea1e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKu};H441IJ2_H4E3 zg<-@{AQT7%z7){^L!v8Y$KJ5~IvDi$uJaQ`HNKa-1TpzIJNAa0p@~t6Misweh|!r( zUY8wvL!(2=&RoZL7QdlL*`4`R$|2b>Vki&_3>7%H;Y|DgJ^h>e|Bw`;P#_feQwqqW zs;fCa$$RVQ Date: Tue, 3 Apr 2012 11:04:22 +0200 Subject: [PATCH 5/6] put all target first --- submodules/build/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/build/Makefile b/submodules/build/Makefile index 074c16096..72b7b1d5e 100644 --- a/submodules/build/Makefile +++ b/submodules/build/Makefile @@ -22,6 +22,7 @@ enable_gpl_third_parties=yes enable_zrtp=no +.NOTPARALLEL all: check_options build warning ifeq ($(enable_gpl_third_parties)$(enable_zrtp),noyes) check_options: @echo "ZRTP is not available in non-gpl build." @@ -31,7 +32,6 @@ check_options: endif -.NOTPARALLEL all: check_options build warning ifeq ($(enable_gpl_third_parties),yes) warning: @echo From a0e12891c3dff3b2563f073c64b574facf27d8d6 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 4 Apr 2012 17:42:38 +0200 Subject: [PATCH 6/6] update linphone submodule for incoming ringing timeout bugfix --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 6e0a681c9..2111e92a3 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 6e0a681c9ebabf88ef55c49b3db79cdf68dd7f76 +Subproject commit 2111e92a393cd0cbf3934ea1de406904f0d34bca