From b9db786072d1d4c9d328c9d1dfd68c99df81d61a Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 26 Oct 2011 23:48:11 +0200 Subject: [PATCH 1/7] fix for sRTP not installed in multi-arch liblinphone-sdk, due to unidentified archives. --- submodules/build/builder-iphone-os.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk index e5a5ef29f..04ba96837 100644 --- a/submodules/build/builder-iphone-os.mk +++ b/submodules/build/builder-iphone-os.mk @@ -292,7 +292,7 @@ multi-arch: if test -f "$$i386_path"; then \ echo "Mixing $$archive and $$i386_path into $$destpath"; \ mkdir -p `dirname $$destpath` ; \ - lipo -create $$archive $$armv7_path $$i386_path -output $$destpath; \ + lipo -create -arch armv6 $$archive -arch armv7 $$armv7_path -arch i386 $$i386_path -output $$destpath; \ else \ echo "WARNING: archive `basename $$archive` exists in arm tree but does not exists in i386 tree."; \ fi \ From 4b4319a628037e607855704c6f733a9cf058f292 Mon Sep 17 00:00:00 2001 From: Guillaume Date: Fri, 28 Oct 2011 16:29:31 +0200 Subject: [PATCH 2/7] Partial commit with changes on Sylvain's Mac. --- Classes/LinphoneAppDelegate.m | 4 ++ Settings.bundle/Root.plist | 20 --------- linphone.xcodeproj/project.pbxproj | 15 ++++--- submodules/build/builder-iphone-os.mk | 11 +++-- submodules/build/builders.d/mssilk.mk | 53 ++++++++++++++++++++++++ submodules/build/builders.d/silk.mk | 58 --------------------------- submodules/linphone | 2 +- 7 files changed, 73 insertions(+), 90 deletions(-) create mode 100644 submodules/build/builders.d/mssilk.mk delete mode 100644 submodules/build/builders.d/silk.mk diff --git a/Classes/LinphoneAppDelegate.m b/Classes/LinphoneAppDelegate.m index 377144a3b..c50bc9652 100644 --- a/Classes/LinphoneAppDelegate.m +++ b/Classes/LinphoneAppDelegate.m @@ -66,6 +66,10 @@ @"NO", @"enable_first_login_view_preference", // #ifdef HAVE_AMR @"YES",@"amr_8k_preference", // enable amr by default if compiled with +#endif +#ifdef HAVE_SILK + @"YES",@"silk_16k_preference", // enable amr by default if compiled with + @"YES",@"silk_24k_preference", // enable amr by default if compiled with #endif //@"+33",@"countrycode_preference", nil]; diff --git a/Settings.bundle/Root.plist b/Settings.bundle/Root.plist index bcefa25a7..7715921d9 100644 --- a/Settings.bundle/Root.plist +++ b/Settings.bundle/Root.plist @@ -98,26 +98,6 @@ Type PSGroupSpecifier - - DefaultValue - - Key - silk_24k_preference - Title - Silk 24Khz - Type - PSToggleSwitchSpecifier - - - DefaultValue - - Key - silk_16k_preference - Title - Silk 16Khz - Type - PSToggleSwitchSpecifier - DefaultValue diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 0e72bd0ae..fe4a6f189 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -33,7 +33,7 @@ 22226C1D11819B34000CA27B /* history-orange.png in Resources */ = {isa = PBXBuildFile; fileRef = 22226C1C11819B34000CA27B /* history-orange.png */; }; 222A483412F7176F0075F07F /* IncallViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 222A483112F7176F0075F07F /* IncallViewController.xib */; }; 223148E41178A08200637D6A /* libilbc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 223148E31178A08200637D6A /* libilbc.a */; }; - 223148E61178A09900637D6A /* libmsilbc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 223148E51178A09900637D6A /* libmsilbc.a */; }; + 223148E61178A09900637D6A /* libmsilbc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 223148E51178A09900637D6A /* libmsilbc.a */; settings = {ATTRIBUTES = (Weak, ); }; }; 2237D4091084D7A9001383EE /* oldphone-mono.wav in Resources */ = {isa = PBXBuildFile; fileRef = 2237D4081084D7A9001383EE /* oldphone-mono.wav */; }; 223963171393CFAF001DE689 /* FastAddressBook.m in Sources */ = {isa = PBXBuildFile; fileRef = 223963161393CFAF001DE689 /* FastAddressBook.m */; }; 2242D91610D66BF300E9963F /* in_call.png in Resources */ = {isa = PBXBuildFile; fileRef = 2242D91410D66BF300E9963F /* in_call.png */; }; @@ -47,7 +47,6 @@ 2245F78A1201D38000C4179D /* MoreViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 22E0A81B111C44E100B04932 /* MoreViewController.xib */; }; 2248E90E12F7E4CF00220D9C /* UIDigitButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 2248E90D12F7E4CF00220D9C /* UIDigitButton.m */; }; 2248E99F12F801C200220D9C /* LinphoneManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 2248E99E12F801C200220D9C /* LinphoneManager.m */; }; - 225AA31E14520E5400BA809B /* libSKP_SILK_SDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 225AA31D14520E5400BA809B /* libSKP_SILK_SDK.a */; }; 225CB2EA11ABB51000628906 /* clavier-01-106px.png in Resources */ = {isa = PBXBuildFile; fileRef = 225CB2E811ABB51000628906 /* clavier-01-106px.png */; }; 225CB2EB11ABB51000628906 /* clavier-01-108px.png in Resources */ = {isa = PBXBuildFile; fileRef = 225CB2E911ABB51000628906 /* clavier-01-108px.png */; }; 225CB2EE11ABB65D00628906 /* clavier-01-160px.png in Resources */ = {isa = PBXBuildFile; fileRef = 225CB2ED11ABB65D00628906 /* clavier-01-160px.png */; }; @@ -87,6 +86,7 @@ 288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765FC0DF74451002DB57D /* CoreGraphics.framework */; }; 70571E1A13FABCB000CDD3C2 /* rootca.pem in Resources */ = {isa = PBXBuildFile; fileRef = 70571E1913FABCB000CDD3C2 /* rootca.pem */; }; F0A486D91404FE53009EC0BE /* libsrtp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F0A486D71404FE53009EC0BE /* libsrtp.a */; }; + F0DDBA23145AE3F6000ABF7F /* libmssilk.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F0DDBA22145AE3F6000ABF7F /* libmssilk.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -282,7 +282,6 @@ 2248E99D12F801C200220D9C /* LinphoneManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LinphoneManager.h; sourceTree = ""; }; 2248E99E12F801C200220D9C /* LinphoneManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LinphoneManager.m; sourceTree = ""; }; 2258633C11410BAC00C5A737 /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = ""; }; - 225AA31D14520E5400BA809B /* libSKP_SILK_SDK.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSKP_SILK_SDK.a; path = "liblinphone-sdk/apple-darwin/lib/libSKP_SILK_SDK.a"; sourceTree = ""; }; 225CB2E811ABB51000628906 /* clavier-01-106px.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "clavier-01-106px.png"; path = "Resources/clavier-01-106px.png"; sourceTree = ""; }; 225CB2E911ABB51000628906 /* clavier-01-108px.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "clavier-01-108px.png"; path = "Resources/clavier-01-108px.png"; sourceTree = ""; }; 225CB2ED11ABB65D00628906 /* clavier-01-160px.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "clavier-01-160px.png"; path = "Resources/clavier-01-160px.png"; sourceTree = ""; }; @@ -408,6 +407,8 @@ 70571E1913FABCB000CDD3C2 /* rootca.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = rootca.pem; path = Resources/rootca.pem; sourceTree = ""; }; 8D1107310486CEB800E47090 /* linphone-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "linphone-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = ""; }; F0A486D71404FE53009EC0BE /* libsrtp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsrtp.a; path = "liblinphone-sdk/apple-darwin/lib/libsrtp.a"; sourceTree = ""; }; + F0DDBA22145AE3F6000ABF7F /* libmssilk.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmssilk.a; path = "liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins/libmssilk.a"; sourceTree = ""; }; + F0DDBA24145AE46C000ABF7F /* libmssilk.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmssilk.a; path = "liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins/libmssilk.a"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -415,7 +416,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 225AA31E14520E5400BA809B /* libSKP_SILK_SDK.a in Frameworks */, + F0DDBA23145AE3F6000ABF7F /* libmssilk.a in Frameworks */, 22E5B0AF133B5EA20044EA25 /* libssl.a in Frameworks */, 22E5B0B0133B5EA20044EA25 /* libcrypto.a in Frameworks */, 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */, @@ -798,7 +799,8 @@ 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { isa = PBXGroup; children = ( - 225AA31D14520E5400BA809B /* libSKP_SILK_SDK.a */, + F0DDBA24145AE46C000ABF7F /* libmssilk.a */, + F0DDBA22145AE3F6000ABF7F /* libmssilk.a */, F0A486D71404FE53009EC0BE /* libsrtp.a */, 2214783B1386A2030020F8B8 /* Localizable.strings */, 22A10D9E11F88C1F00373793 /* liblinphone.xcodeproj */, @@ -1054,6 +1056,7 @@ ARCHS = ( armv7, armv6, + i386, ); "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; @@ -1128,6 +1131,7 @@ ARCHS = ( armv7, armv6, + i386, ); CODE_SIGN_ENTITLEMENTS = untitled.plist; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; @@ -1203,6 +1207,7 @@ ARCHS = ( armv7, armv6, + i386, ); CODE_SIGN_ENTITLEMENTS = untitled.plist; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk index 04ba96837..9fe55de5b 100644 --- a/submodules/build/builder-iphone-os.mk +++ b/submodules/build/builder-iphone-os.mk @@ -43,7 +43,6 @@ linphone_configure_controls= --disable-video \ SPEEX_LIBS="-L$(prefix)/lib -lspeexdsp -lspeex " \ OPENSSL_CFLAGS="-I$(prefix)/include" \ OPENSSL_LIBS="-L$(prefix)/lib -lssl -lcrypto" - MSSILK_CFLAGS="-I$(prefix)/include/silk" ifeq ($(enable_zrtp),yes) linphone_configure_controls+= --with-srtp=$(prefix) --enable-zrtp=yes --disable-tests endif @@ -82,7 +81,7 @@ endif prefix?=$(BUILDER_SRC_DIR)/../liblinphone-sdk/$(host) -all: build-linphone build-msilbc build-msamr +.NOTPARALLEL all: build-linphone build-msilbc build-msamr build-mssilk clean-makefile: clean-makefile-linphone clean: clean-linphone @@ -93,17 +92,17 @@ init: veryclean: veryclean-linphone rm -rf $(BUILDER_BUILD_DIR) -.NOTPARALLEL build-linphone: init build-openssl build-srtp build-zrtpcpp build-osip2 build-eXosip2 build-speex build-libgsm build-silk $(LINPHONE_BUILD_DIR)/Makefile +.NOTPARALLEL build-linphone: init build-openssl build-srtp build-zrtpcpp build-osip2 build-eXosip2 build-speex build-libgsm $(LINPHONE_BUILD_DIR)/Makefile cd $(LINPHONE_BUILD_DIR) && export PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig export CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make newdate && make && make install -clean-linphone: clean-osip2 clean-eXosip2 clean-speex clean-libgsm clean-srtp clean-zrtpcpp clean-msilbc clean-libilbc clean-openssl clean-msamr clean-silk +clean-linphone: clean-osip2 clean-eXosip2 clean-speex clean-libgsm clean-srtp clean-zrtpcpp clean-msilbc clean-libilbc clean-openssl clean-msamr clean-mssilk cd $(LINPHONE_BUILD_DIR) && make clean -veryclean-linphone: veryclean-osip2 veryclean-eXosip2 veryclean-speex veryclean-srtp veryclean-zrtpcpp veryclean-libgsm veryclean-msilbc veryclean-libilbc veryclean-openssl veryclean-msamr veryclean-silk +veryclean-linphone: veryclean-osip2 veryclean-eXosip2 veryclean-speex veryclean-srtp veryclean-zrtpcpp veryclean-libgsm veryclean-msilbc veryclean-libilbc veryclean-openssl veryclean-msamr veryclean-mssilk #-cd $(LINPHONE_BUILD_DIR) && make distclean -cd $(LINPHONE_SRC_DIR) && rm -f configure -clean-makefile-linphone: clean-makefile-osip2 clean-makefile-eXosip2 clean-makefile-speex clean-makefile-srtp clean-makefile-zrtpcpp clean-makefile-libilbc clean-makefile-msilbc clean-makefile-openssl clean-makefile-msamr +clean-makefile-linphone: clean-makefile-osip2 clean-makefile-eXosip2 clean-makefile-speex clean-makefile-srtp clean-makefile-zrtpcpp clean-makefile-libilbc clean-makefile-msilbc clean-makefile-openssl clean-makefile-msamr clean-makefile-mssilk cd $(LINPHONE_BUILD_DIR) && rm -f Makefile && rm -f oRTP/Makefile && rm -f mediastreamer2/Makefile diff --git a/submodules/build/builders.d/mssilk.mk b/submodules/build/builders.d/mssilk.mk new file mode 100644 index 000000000..ff1616db3 --- /dev/null +++ b/submodules/build/builders.d/mssilk.mk @@ -0,0 +1,53 @@ +############################################################################ +# mssilk.mk +# Copyright (C) 2011 Belledonne Communications,Grenoble France +# +############################################################################ +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +############################################################################ +mssilk_dir?=mssilk + +ifneq (,$(findstring arm,$(host))) + MSSILK_CONFIGURE_OPTION := --with-silk-flavour=ARM +endif + +$(BUILDER_SRC_DIR)/$(mssilk_dir)/configure: + echo -e "\033[01;32m Running autogen for mssilk in $(BUILDER_SRC_DIR)/$(mssilk_dir) \033[0m" + cd $(BUILDER_SRC_DIR)/$(mssilk_dir) && ./autogen.sh + +$(BUILDER_BUILD_DIR)/$(mssilk_dir)/Makefile: $(BUILDER_SRC_DIR)/$(mssilk_dir)/configure + echo -e "\033[01;32m Running configure in $(BUILDER_BUILD_DIR)/$(mssilk_dir) \033[0m" + mkdir -p $(BUILDER_BUILD_DIR)/$(mssilk_dir) + cd $(BUILDER_BUILD_DIR)/$(mssilk_dir)/ \ + && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ + $(BUILDER_SRC_DIR)/$(mssilk_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} \ + $(MSSILK_CONFIGURE_OPTION) --enable-static + + +build-mssilk: $(BUILDER_BUILD_DIR)/$(mssilk_dir)/Makefile + echo -e "\033[01;32m building silk \033[0m" + cd $(BUILDER_BUILD_DIR)/$(mssilk_dir) && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make -j1 && make install + +clean-mssilk: + cd $(BUILDER_BUILD_DIR)/$(mssilk_dir) && make clean + +veryclean-mssilk: + -cd $(BUILDER_BUILD_DIR)/$(mssilk_dir) && make distclean + rm -f $(BUILDER_SRC_DIR)/$(mssilk_dir)/configure + +clean-makefile-mssilk: + cd $(BUILDER_BUILD_DIR)/$(mssilk_dir) && rm -f Makefile diff --git a/submodules/build/builders.d/silk.mk b/submodules/build/builders.d/silk.mk deleted file mode 100644 index 8bc9599fd..000000000 --- a/submodules/build/builders.d/silk.mk +++ /dev/null @@ -1,58 +0,0 @@ -############################################################################ -# silk.mk -# Copyright (C) 2011 Belledonne Communications,Grenoble France -# -############################################################################ -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -############################################################################ - -SILK_BUILD_DIR?=$(BUILDER_BUILD_DIR)/externals/silk - -ifneq (,$(findstring i386,$(host))) - src := SILK_SDK_SRC_v1.0.8/SILK_SDK_SRC_FIX_v1.0.8 -else - src := SILK_SDK_SRC_v1.0.8/SILK_SDK_SRC_ARM_v1.0.8 -endif -ifneq (,$(findstring armv7,$(host))) - make_options := USE_NEON=yes -endif - -$(SILK_BUILD_DIR)/Makefile: - mkdir -p $(BUILDER_BUILD_DIR)/externals \ - && cd $(BUILDER_BUILD_DIR)/externals \ - && rm -rf silk \ - && wget http://developer.skype.com/silk/SILK_SDK_SRC_v1.0.8.zip \ - && unzip SILK_SDK_SRC_v1.0.8.zip \ - && rm -f SILK_SDK_SRC_v1.0.8.zip \ - && mv ${src} silk \ - && rm -rf SILK_SDK_SRC_v1.0.8 - -build-silk: $(SILK_BUILD_DIR)/Makefile - cd $(SILK_BUILD_DIR) && host_alias=${host} . $(BUILDER_SRC_DIR)/build/$(config_site) \ - && make -j1 all TOOLCHAIN_PREFIX=$$SDK_BIN_PATH/ CXX="$$CXX" CC="$$CC -mno-thumb -g" LD="$$LD" $(make_options) ADDED_DEFINES+=IPHONE \ - && mkdir -p $(prefix)/include/silk \ - && cp -f $(SILK_BUILD_DIR)/interface/* $(prefix)/include/silk \ - && cp -f lib*.a $(prefix)/lib - -clean-silk: - cd $(SILK_BUILD_DIR) && make clean - -clean-makefile-silk: - -veryclean-silk: - rm -rf $(SILK_BUILD_DIR) - diff --git a/submodules/linphone b/submodules/linphone index 388ef155a..9720942c6 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 388ef155ae078d2423cb7d8fddb7529be000bc52 +Subproject commit 9720942c63319dae94425e4543c4b7d5edb885be From 4df63c37b522e028b6eedb9ce8e2f9d3647939f9 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Fri, 28 Oct 2011 21:30:41 +0200 Subject: [PATCH 3/7] fix exception because in call view is shown twice for outgoing calls. (ios5) --- Classes/LinphoneUI/LinphoneManager.m | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Classes/LinphoneUI/LinphoneManager.m b/Classes/LinphoneUI/LinphoneManager.m index af401c7a0..da5c342d9 100644 --- a/Classes/LinphoneUI/LinphoneManager.m +++ b/Classes/LinphoneUI/LinphoneManager.m @@ -137,9 +137,11 @@ extern void libmssilk_init(); break; case LinphoneCallConnected: - [callDelegate displayIncallFromUI:mCurrentViewController + if (linphone_call_get_dir(currentCall)==LinphoneCallIncoming){ + [callDelegate displayIncallFromUI:mCurrentViewController forUser:lUserName withDisplayName:lDisplayName]; + } break; case LinphoneCallError: { From 51fabb1ff12d3092a45e40ddfb412bf0e6c882fc Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Wed, 2 Nov 2011 10:03:03 +0100 Subject: [PATCH 4/7] add workaround to request local notification of type UIRemoteNotificationTypeAlert|UIRemoteNotificationTypeSound to be enabled --- Classes/LinphoneAppDelegate.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Classes/LinphoneAppDelegate.m b/Classes/LinphoneAppDelegate.m index 377144a3b..f5027c132 100644 --- a/Classes/LinphoneAppDelegate.m +++ b/Classes/LinphoneAppDelegate.m @@ -123,8 +123,8 @@ [[LinphoneManager instance] setCallDelegate:myPhoneViewController]; [[LinphoneManager instance] startLibLinphone]; - - + [[UIApplication sharedApplication] registerForRemoteNotificationTypes:UIRemoteNotificationTypeAlert|UIRemoteNotificationTypeSound]; + return YES; } From fb2ddd1b33c85e8121b1f46b37553dd2d8d09636 Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Thu, 3 Nov 2011 13:44:49 +0100 Subject: [PATCH 5/7] Silk plugin for iPhone. --- .gitmodules | 3 +++ README | 8 +++++- linphone.xcodeproj/project.pbxproj | 35 ++++++++++++--------------- submodules/build/builder-iphone-os.mk | 3 ++- submodules/build/builders.d/mssilk.mk | 29 +++++++++++++--------- submodules/linphone | 2 +- submodules/mssilk | 1 + 7 files changed, 47 insertions(+), 34 deletions(-) create mode 160000 submodules/mssilk diff --git a/.gitmodules b/.gitmodules index c9e476364..f064d4d5a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,3 +28,6 @@ [submodule "submodules/externals/zrtpcpp"] path = submodules/externals/zrtpcpp url = git://github.com/wernerd/ZRTPCPP.git +[submodule "submodules/mssilk"] + path = submodules/mssilk + url = git://git.linphone.org/mssilk.git diff --git a/README b/README index 4c34e693f..585fe2262 100644 --- a/README +++ b/README @@ -23,5 +23,11 @@ In case you upgrade your IOS SDK, you may force configure by using make targets Libraries are available from liblinphone-sdk/ AMR plugin -liblinphone-sdk contains Linphone ARM pluging. As AMR may require to pay for patents, it is not enabled unless Linphone for iphone is compiled with gcc flag HAVE_AMR. +liblinphone-sdk contains Linphone ARM plugin. As AMR may require to pay for patents, it is not enabled unless Linphone for iphone is compiled with gcc flag HAVE_AMR. + +SILK plugin +liblinphone-sdk contains Linphone SILK plugin. +As Skype requires that you accept its license, the plugin is not compiled and enabled unless: +- you compile the SDK with enable_silk=yes flag; +- you compile the UI with HAVE_SILK flag. diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index fe4a6f189..9779add49 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -86,7 +86,6 @@ 288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765FC0DF74451002DB57D /* CoreGraphics.framework */; }; 70571E1A13FABCB000CDD3C2 /* rootca.pem in Resources */ = {isa = PBXBuildFile; fileRef = 70571E1913FABCB000CDD3C2 /* rootca.pem */; }; F0A486D91404FE53009EC0BE /* libsrtp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F0A486D71404FE53009EC0BE /* libsrtp.a */; }; - F0DDBA23145AE3F6000ABF7F /* libmssilk.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F0DDBA22145AE3F6000ABF7F /* libmssilk.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -407,8 +406,6 @@ 70571E1913FABCB000CDD3C2 /* rootca.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = rootca.pem; path = Resources/rootca.pem; sourceTree = ""; }; 8D1107310486CEB800E47090 /* linphone-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "linphone-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = ""; }; F0A486D71404FE53009EC0BE /* libsrtp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsrtp.a; path = "liblinphone-sdk/apple-darwin/lib/libsrtp.a"; sourceTree = ""; }; - F0DDBA22145AE3F6000ABF7F /* libmssilk.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmssilk.a; path = "liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins/libmssilk.a"; sourceTree = ""; }; - F0DDBA24145AE46C000ABF7F /* libmssilk.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmssilk.a; path = "liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins/libmssilk.a"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -416,7 +413,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - F0DDBA23145AE3F6000ABF7F /* libmssilk.a in Frameworks */, 22E5B0AF133B5EA20044EA25 /* libssl.a in Frameworks */, 22E5B0B0133B5EA20044EA25 /* libcrypto.a in Frameworks */, 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */, @@ -799,8 +795,6 @@ 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { isa = PBXGroup; children = ( - F0DDBA24145AE46C000ABF7F /* libmssilk.a */, - F0DDBA22145AE3F6000ABF7F /* libmssilk.a */, F0A486D71404FE53009EC0BE /* libsrtp.a */, 2214783B1386A2030020F8B8 /* Localizable.strings */, 22A10D9E11F88C1F00373793 /* liblinphone.xcodeproj */, @@ -1058,17 +1052,13 @@ armv6, i386, ); - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; FRAMEWORK_SEARCH_PATHS = ""; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = linphone_Prefix.pch; - GCC_PREPROCESSOR_DEFINITIONS = ( - IN_LINPHONE, - HAVE_SILK, - ); + GCC_PREPROCESSOR_DEFINITIONS = IN_LINPHONE; GCC_VERSION = com.apple.compilers.llvmgcc42; HEADER_SEARCH_PATHS = ( submodules/linphone/coreapi, @@ -1097,9 +1087,12 @@ mediastreamer, "-l", srtp, + "-l", + mssilk, + "-l", + SKP_SILK_SDK, ); PRODUCT_NAME = linphone; - "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; SDKROOT = iphoneos; STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; TARGETED_DEVICE_FAMILY = 1; @@ -1141,10 +1134,7 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = linphone_Prefix.pch; - GCC_PREPROCESSOR_DEFINITIONS = ( - IN_LINPHONE, - HAVE_SILK, - ); + GCC_PREPROCESSOR_DEFINITIONS = IN_LINPHONE; GCC_VERSION = com.apple.compilers.llvmgcc42; HEADER_SEARCH_PATHS = ( submodules/linphone/coreapi, @@ -1173,6 +1163,10 @@ mediastreamer, "-l", srtp, + "-l", + mssilk, + "-l", + SKP_SILK_SDK, ); PRODUCT_NAME = linphone; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; @@ -1217,10 +1211,7 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = linphone_Prefix.pch; - GCC_PREPROCESSOR_DEFINITIONS = ( - IN_LINPHONE, - HAVE_SILK, - ); + GCC_PREPROCESSOR_DEFINITIONS = IN_LINPHONE; GCC_VERSION = com.apple.compilers.llvmgcc42; HEADER_SEARCH_PATHS = ( submodules/linphone/coreapi, @@ -1249,6 +1240,10 @@ mediastreamer, "-l", srtp, + "-l", + mssilk, + "-l", + SKP_SILK_SDK, ); PRODUCT_NAME = linphone; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk index 9fe55de5b..a20825c06 100644 --- a/submodules/build/builder-iphone-os.mk +++ b/submodules/build/builder-iphone-os.mk @@ -21,7 +21,8 @@ ############################################################################ host?=armv6-apple-darwin -enable_zrtp=no +enable_zrtp?=no +enable_silk?=no config_site:=iphone-config.site library_mode:= --disable-shared --enable-static linphone_configure_controls= --disable-video \ diff --git a/submodules/build/builders.d/mssilk.mk b/submodules/build/builders.d/mssilk.mk index ff1616db3..706496c8c 100644 --- a/submodules/build/builders.d/mssilk.mk +++ b/submodules/build/builders.d/mssilk.mk @@ -21,33 +21,40 @@ ############################################################################ mssilk_dir?=mssilk -ifneq (,$(findstring arm,$(host))) - MSSILK_CONFIGURE_OPTION := --with-silk-flavour=ARM -endif - $(BUILDER_SRC_DIR)/$(mssilk_dir)/configure: echo -e "\033[01;32m Running autogen for mssilk in $(BUILDER_SRC_DIR)/$(mssilk_dir) \033[0m" cd $(BUILDER_SRC_DIR)/$(mssilk_dir) && ./autogen.sh $(BUILDER_BUILD_DIR)/$(mssilk_dir)/Makefile: $(BUILDER_SRC_DIR)/$(mssilk_dir)/configure - echo -e "\033[01;32m Running configure in $(BUILDER_BUILD_DIR)/$(mssilk_dir) \033[0m" + echo -e "\033[01;32m Running configure in $(BUILDER_BUILD_DIR)/$(mssilk_dir) \033[0m" mkdir -p $(BUILDER_BUILD_DIR)/$(mssilk_dir) cd $(BUILDER_BUILD_DIR)/$(mssilk_dir)/ \ - && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ - $(BUILDER_SRC_DIR)/$(mssilk_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} \ - $(MSSILK_CONFIGURE_OPTION) --enable-static + && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ + $(BUILDER_SRC_DIR)/$(mssilk_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} \ + --enable-static +ifeq ($(enable_silk),yes) build-mssilk: $(BUILDER_BUILD_DIR)/$(mssilk_dir)/Makefile echo -e "\033[01;32m building silk \033[0m" - cd $(BUILDER_BUILD_DIR)/$(mssilk_dir) && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make -j1 && make install + cd $(BUILDER_BUILD_DIR)/$(mssilk_dir) \ + && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig \ + CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ + make -j1 && make install + + +else +build-mssilk: + echo "SILK is disabled" + +endif clean-mssilk: - cd $(BUILDER_BUILD_DIR)/$(mssilk_dir) && make clean + -cd $(BUILDER_BUILD_DIR)/$(mssilk_dir) && make clean veryclean-mssilk: -cd $(BUILDER_BUILD_DIR)/$(mssilk_dir) && make distclean rm -f $(BUILDER_SRC_DIR)/$(mssilk_dir)/configure clean-makefile-mssilk: - cd $(BUILDER_BUILD_DIR)/$(mssilk_dir) && rm -f Makefile + -cd $(BUILDER_BUILD_DIR)/$(mssilk_dir) && rm -f Makefile diff --git a/submodules/linphone b/submodules/linphone index 9720942c6..81a9a7073 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 9720942c63319dae94425e4543c4b7d5edb885be +Subproject commit 81a9a7073b03f7e8db2bfe83545613b9daa09305 diff --git a/submodules/mssilk b/submodules/mssilk new file mode 160000 index 000000000..a0ad1cca9 --- /dev/null +++ b/submodules/mssilk @@ -0,0 +1 @@ +Subproject commit a0ad1cca900afc17204856fd7c2de7e8d511eaad From 6f7d6fc5a119ebf8f2361f2406e0715097d19524 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Fri, 4 Nov 2011 08:27:08 +0100 Subject: [PATCH 6/7] remove libmssilk.so from xcode libraries --- README | 5 +++-- linphone.xcodeproj/project.pbxproj | 12 ------------ 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/README b/README index 585fe2262..a1c5851a9 100644 --- a/README +++ b/README @@ -28,6 +28,7 @@ liblinphone-sdk contains Linphone ARM plugin. As AMR may require to pay for pate SILK plugin liblinphone-sdk contains Linphone SILK plugin. As Skype requires that you accept its license, the plugin is not compiled and enabled unless: -- you compile the SDK with enable_silk=yes flag; -- you compile the UI with HAVE_SILK flag. +- you compile the SDK with enable_silk=yes flag (make); +- you compile the UI with HAVE_SILK preprocessor macro (xcode). +- you compile add libmssilk.so to the list a library (xcode). diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 9779add49..4bee7514e 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -1087,10 +1087,6 @@ mediastreamer, "-l", srtp, - "-l", - mssilk, - "-l", - SKP_SILK_SDK, ); PRODUCT_NAME = linphone; SDKROOT = iphoneos; @@ -1163,10 +1159,6 @@ mediastreamer, "-l", srtp, - "-l", - mssilk, - "-l", - SKP_SILK_SDK, ); PRODUCT_NAME = linphone; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; @@ -1240,10 +1232,6 @@ mediastreamer, "-l", srtp, - "-l", - mssilk, - "-l", - SKP_SILK_SDK, ); PRODUCT_NAME = linphone; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; From a77e2af47d68b7b56699505eb1f7826e4151d4ca Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Fri, 4 Nov 2011 12:20:53 +0100 Subject: [PATCH 7/7] fix missing call duration on outgoing calls --- Classes/AdvancedPhoneViewController.m | 5 ++++- Classes/LinphoneUI/LinphoneManager.m | 2 -- linphone.xcodeproj/project.pbxproj | 14 ++++---------- submodules/build/builder-iphone-os.mk | 1 + submodules/linphone | 2 +- 5 files changed, 10 insertions(+), 14 deletions(-) diff --git a/Classes/AdvancedPhoneViewController.m b/Classes/AdvancedPhoneViewController.m index 9f5c3f633..d4b3a0392 100644 --- a/Classes/AdvancedPhoneViewController.m +++ b/Classes/AdvancedPhoneViewController.m @@ -51,7 +51,10 @@ } -(void) displayIncallFromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName { - [self presentModalViewController:mIncallViewController animated:true]; + + if (linphone_call_get_dir(currentCall)==LinphoneCallIncoming){ + [self presentModalViewController:mIncallViewController animated:true]; + } [super displayIncallFromUI:viewCtrl forUser:username diff --git a/Classes/LinphoneUI/LinphoneManager.m b/Classes/LinphoneUI/LinphoneManager.m index da5c342d9..fed0660d9 100644 --- a/Classes/LinphoneUI/LinphoneManager.m +++ b/Classes/LinphoneUI/LinphoneManager.m @@ -137,11 +137,9 @@ extern void libmssilk_init(); break; case LinphoneCallConnected: - if (linphone_call_get_dir(currentCall)==LinphoneCallIncoming){ [callDelegate displayIncallFromUI:mCurrentViewController forUser:lUserName withDisplayName:lDisplayName]; - } break; case LinphoneCallError: { diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 4bee7514e..a61d67707 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -52,7 +52,6 @@ 225CB2EE11ABB65D00628906 /* clavier-01-160px.png in Resources */ = {isa = PBXBuildFile; fileRef = 225CB2ED11ABB65D00628906 /* clavier-01-160px.png */; }; 225CB2FA11ABB76400628906 /* linphone-banner.png in Resources */ = {isa = PBXBuildFile; fileRef = 225CB2F911ABB76400628906 /* linphone-banner.png */; }; 2264B6D211200342002C2C53 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2264B6D111200342002C2C53 /* SystemConfiguration.framework */; }; - 226F2ED61344B0EF00F6EF27 /* libopencore-amrwb.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226F2ED31344B0EF00F6EF27 /* libopencore-amrwb.a */; }; 226F2ED71344B0EF00F6EF27 /* libopencore-amrnb.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226F2ED41344B0EF00F6EF27 /* libopencore-amrnb.a */; }; 226F2ED81344B0EF00F6EF27 /* libmsamr.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226F2ED51344B0EF00F6EF27 /* libmsamr.a */; }; 2274401A106F31BD006EC466 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22744019106F31BD006EC466 /* CoreAudio.framework */; }; @@ -286,7 +285,6 @@ 225CB2ED11ABB65D00628906 /* clavier-01-160px.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "clavier-01-160px.png"; path = "Resources/clavier-01-160px.png"; sourceTree = ""; }; 225CB2F911ABB76400628906 /* linphone-banner.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "linphone-banner.png"; path = "liblinphone-sdk/apple-darwin/share/pixmaps/linphone/linphone-banner.png"; sourceTree = ""; }; 2264B6D111200342002C2C53 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; }; - 226F2ED31344B0EF00F6EF27 /* libopencore-amrwb.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libopencore-amrwb.a"; path = "liblinphone-sdk/apple-darwin/lib/libopencore-amrwb.a"; sourceTree = ""; }; 226F2ED41344B0EF00F6EF27 /* libopencore-amrnb.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libopencore-amrnb.a"; path = "liblinphone-sdk/apple-darwin/lib/libopencore-amrnb.a"; sourceTree = ""; }; 226F2ED51344B0EF00F6EF27 /* libmsamr.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmsamr.a; path = "liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins/libmsamr.a"; sourceTree = ""; }; 22744019106F31BD006EC466 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; }; @@ -400,6 +398,8 @@ 22F2508D107141E100AC9B3F /* PhoneViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PhoneViewController.xib; sourceTree = ""; }; 22F254801073D99800AC9B3F /* ringback.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = ringback.wav; path = "liblinphone-sdk/apple-darwin/share/sounds/linphone/ringback.wav"; sourceTree = ""; }; 22F51EF5107FA66500F98953 /* untitled.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = untitled.plist; sourceTree = ""; }; + 22F9D6B51463EBDC00C6FEAF /* AdvancedPhoneViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AdvancedPhoneViewController.m; sourceTree = ""; }; + 22F9D6B61463EBDC00C6FEAF /* AdvancedPhoneViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AdvancedPhoneViewController.h; sourceTree = ""; }; 288765FC0DF74451002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; 29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = main.m; sourceTree = ""; }; 32CA4F630368D1EE00C91783 /* linphone_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = linphone_Prefix.pch; sourceTree = ""; }; @@ -435,7 +435,6 @@ 228697C411AC29B800E9E0CA /* CFNetwork.framework in Frameworks */, 22A10F3B11F8960300373793 /* libortp.a in Frameworks */, 22D1B68112A3E0BE001AE361 /* libresolv.dylib in Frameworks */, - 226F2ED61344B0EF00F6EF27 /* libopencore-amrwb.a in Frameworks */, 226F2ED71344B0EF00F6EF27 /* libopencore-amrnb.a in Frameworks */, 226F2ED81344B0EF00F6EF27 /* libmsamr.a in Frameworks */, F0A486D91404FE53009EC0BE /* libsrtp.a in Frameworks */, @@ -448,6 +447,8 @@ 080E96DDFE201D6D7F000001 /* Classes */ = { isa = PBXGroup; children = ( + 22F9D6B51463EBDC00C6FEAF /* AdvancedPhoneViewController.m */, + 22F9D6B61463EBDC00C6FEAF /* AdvancedPhoneViewController.h */, 2214EB7012F84668002A5394 /* LinphoneUI */, 2218A92212FBE1340088A667 /* FirstLoginViewController.h */, 2218A92312FBE1340088A667 /* FirstLoginViewController.m */, @@ -807,7 +808,6 @@ 220FAD2E10765B400068D98F /* libosipparser2.a */, 220FAD2F10765B400068D98F /* libspeex.a */, 220FAD3010765B400068D98F /* libspeexdsp.a */, - 226F2ED31344B0EF00F6EF27 /* libopencore-amrwb.a */, 226F2ED41344B0EF00F6EF27 /* libopencore-amrnb.a */, 226F2ED51344B0EF00F6EF27 /* libmsamr.a */, 220FAC77107654FC0068D98F /* include */, @@ -1085,8 +1085,6 @@ linphone, "-l", mediastreamer, - "-l", - srtp, ); PRODUCT_NAME = linphone; SDKROOT = iphoneos; @@ -1157,8 +1155,6 @@ linphone, "-l", mediastreamer, - "-l", - srtp, ); PRODUCT_NAME = linphone; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; @@ -1230,8 +1226,6 @@ linphone, "-l", mediastreamer, - "-l", - srtp, ); PRODUCT_NAME = linphone; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk index a20825c06..0f120e320 100644 --- a/submodules/build/builder-iphone-os.mk +++ b/submodules/build/builder-iphone-os.mk @@ -38,6 +38,7 @@ linphone_configure_controls= --disable-video \ LIBZRTPCPP_CFLAGS="-I$(prefix)/include" \ LIBZRTPCPP_LIBS="-L$(prefix)/lib -lzrtpcpp -lcrypto" \ SRTP_LIBS="-L$(prefix)/lib -lsrtp -lcrypto" \ + SRTP_CFLAGS="-I$(prefix)/include" \ SPEEX_CFLAGS="-I$(prefix)/include" \ SPEEXDSP_CFLAGS="-I$(prefix)/include" \ SPEEXDSP_LIBS="-L$(prefix)/lib -lspeexdsp" \ diff --git a/submodules/linphone b/submodules/linphone index 81a9a7073..dcd99591f 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 81a9a7073b03f7e8db2bfe83545613b9daa09305 +Subproject commit dcd99591f21154775b3d07fc327caac6cc27b5de