From a9c99bbec53d01bfcbe5a20c898501e4334e9b86 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Mon, 28 Mar 2011 15:23:07 +0200 Subject: [PATCH 1/4] prepare apple store submision version 1.0.4 --- linphone-Info.plist | 8 ++++---- linphone.xcodeproj/project.pbxproj | 6 ++++++ submodules/build/builder-iphone-os.mk | 5 +++-- submodules/linphone | 2 +- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/linphone-Info.plist b/linphone-Info.plist index 6fe6b4ae7..0a94d86e1 100644 --- a/linphone-Info.plist +++ b/linphone-Info.plist @@ -2,8 +2,6 @@ - UIApplicationExitsOnSuspend - CFBundleDevelopmentRegion English CFBundleDisplayName @@ -21,13 +19,15 @@ CFBundlePackageType APPL CFBundleShortVersionString - 3.3.4.2 + 3.4.2 CFBundleSignature ???? CFBundleVersion - 1.0.3.2 + 1.0.4 NSMainNibFile PhoneMainView + UIApplicationExitsOnSuspend + UIBackgroundModes voip diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index d2f45e542..8f54e6647 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -1006,6 +1006,7 @@ submodules/externals/speex/include, ); INFOPLIST_FILE = "linphone-Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 3.1; LIBRARY_SEARCH_PATHS = ( "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib\"", "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins\"", @@ -1026,6 +1027,7 @@ "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; SDKROOT = iphoneos; STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; + TARGETED_DEVICE_FAMILY = 1; }; name = Debug; }; @@ -1071,6 +1073,7 @@ submodules/externals/speex/include, ); INFOPLIST_FILE = "linphone-Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 3.1; LIBRARY_SEARCH_PATHS = ( "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib\"", "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins\"", @@ -1091,6 +1094,7 @@ "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; SDKROOT = iphoneos; STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; + TARGETED_DEVICE_FAMILY = 1; }; name = DistributionAdhoc; }; @@ -1136,6 +1140,7 @@ submodules/externals/speex/include, ); INFOPLIST_FILE = "linphone-Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 3.1; LIBRARY_SEARCH_PATHS = ( "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib\"", "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins\"", @@ -1156,6 +1161,7 @@ "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; SDKROOT = iphoneos; STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; + TARGETED_DEVICE_FAMILY = 1; }; name = Distribution; }; diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk index fa1d94d6f..298582d87 100644 --- a/submodules/build/builder-iphone-os.mk +++ b/submodules/build/builder-iphone-os.mk @@ -29,6 +29,7 @@ linphone_configure_controls= --disable-video \ --enable-ssl-hmac=no \ --enable-ssl=yes \ --enable-macaqsnd=no \ + --enable-macsnd=no \ --enable-iounit=yes \ --with-gsm=$(prefix) \ SPEEX_CFLAGS="-I$(prefix)/include" \ @@ -79,7 +80,7 @@ veryclean: rm -rf $(BUILDER_BUILD_DIR) .NOTPARALLEL build-linphone: init build-openssl build-osip2 build-eXosip2 build-speex build-libgsm $(LINPHONE_BUILD_DIR)/Makefile - cd $(LINPHONE_BUILD_DIR) && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make newdate && make && make install + 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-msilbc clean-libilbc clean-openssl cd $(LINPHONE_BUILD_DIR) && make clean @@ -105,7 +106,7 @@ $(LINPHONE_BUILD_DIR)/Makefile: $(LINPHONE_SRC_DIR)/configure #libphone only (asume dependencies are met) build-liblinphone: $(LINPHONE_BUILD_DIR)/Makefile - cd $(LINPHONE_BUILD_DIR) && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make newdate && make && make install + 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-makefile-liblinphone: cd $(LINPHONE_BUILD_DIR) && rm -f Makefile && rm -f oRTP/Makefile && rm -f mediastreamer2/Makefile diff --git a/submodules/linphone b/submodules/linphone index 6de163277..e11983452 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 6de1632771312395faa5b9c340dddbf86fa17ed0 +Subproject commit e11983452ab9c376b8b851db1bc660392f68d0c9 From a9ab705dfa0ae1790bf327fe189d267307e089f2 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Mon, 4 Apr 2011 14:54:28 +0200 Subject: [PATCH 2/4] add AMR support. Should be use with compilation flag HAVE_AMR --- .gitmodules | 6 ++++++ Classes/LinphoneAppDelegate.m | 3 +++ Classes/LinphoneUI/LinphoneManager.m | 10 +++++++--- linphone.xcodeproj/project.pbxproj | 27 ++++++++++++++++++++++++--- submodules/build/builder-iphone-os.mk | 8 ++++---- submodules/externals/opencore-amr | 1 + submodules/msamr | 1 + 7 files changed, 46 insertions(+), 10 deletions(-) create mode 160000 submodules/externals/opencore-amr create mode 160000 submodules/msamr diff --git a/.gitmodules b/.gitmodules index 997c89307..adcac5915 100644 --- a/.gitmodules +++ b/.gitmodules @@ -19,3 +19,9 @@ [submodule "submodules/libilbc-rfc3951"] path = submodules/libilbc-rfc3951 url = git://git.linphone.org/libilbc-rfc3951.git +[submodule "submodules/externals/opencore-amr"] + path = submodules/externals/opencore-amr + url = git://opencore-amr.git.sourceforge.net/gitroot/opencore-amr/opencore-amr +[submodule "submodules/msamr"] + path = submodules/msamr + url = git://git.linphone.org/msamr.git diff --git a/Classes/LinphoneAppDelegate.m b/Classes/LinphoneAppDelegate.m index 41bb737b9..dc44c57e0 100644 --- a/Classes/LinphoneAppDelegate.m +++ b/Classes/LinphoneAppDelegate.m @@ -64,6 +64,9 @@ NSDictionary *appDefaults = [NSDictionary dictionaryWithObjectsAndKeys: @"NO", @"enable_first_login_view_preference", // +#ifdef HAVE_AMR + @"YES",@"amr_8k_preference", // enable amr by default if compiled with +#endif nil]; [defaultsToRegister addEntriesFromDictionary:appDefaults]; diff --git a/Classes/LinphoneUI/LinphoneManager.m b/Classes/LinphoneUI/LinphoneManager.m index f78ef8daa..014157ebe 100644 --- a/Classes/LinphoneUI/LinphoneManager.m +++ b/Classes/LinphoneUI/LinphoneManager.m @@ -30,8 +30,9 @@ static LinphoneCore* theLinphoneCore=nil; static LinphoneManager* theLinphoneManager=nil; extern void libmsilbc_init(); - - +#ifdef HAVE_AMR +extern void libmsamr_init(); +#endif @implementation LinphoneManager @synthesize callDelegate; @synthesize registrationDelegate; @@ -431,6 +432,7 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach //read codecs from setting bundle and enable them one by one [self configurePayloadType:"speex" fromPrefKey:@"speex_16k_preference" withRate:16000]; [self configurePayloadType:"speex" fromPrefKey:@"speex_8k_preference" withRate:8000]; + [self configurePayloadType:"AMR" fromPrefKey:@"amr_8k_preference" withRate:8000]; [self configurePayloadType:"GSM" fromPrefKey:@"gsm_8k_preference" withRate:8000]; [self configurePayloadType:"iLBC" fromPrefKey:@"ilbc_preference" withRate:8000]; [self configurePayloadType:"PCMU" fromPrefKey:@"pcmu_preference" withRate:8000]; @@ -585,7 +587,9 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach libmsilbc_init(); - /* +#ifdef HAVE_AMR + libmsamr_init(); //load amr plugin if present from the liblinphone sdk +#endif /* * Initialize linphone core */ diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 8f54e6647..a514d84aa 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -51,6 +51,9 @@ 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 */; }; 2274402F106F335E006EC466 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2274402E106F335E006EC466 /* AudioToolbox.framework */; }; 2274550810700509006EC466 /* linphonerc in Resources */ = {isa = PBXBuildFile; fileRef = 2274550710700509006EC466 /* linphonerc */; }; @@ -270,6 +273,9 @@ 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; }; 2274402E106F335E006EC466 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; 22744043106F33FC006EC466 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; @@ -414,6 +420,9 @@ 22A10F3B11F8960300373793 /* libortp.a in Frameworks */, 22D1B68112A3E0BE001AE361 /* libresolv.dylib in Frameworks */, 2252941412F6DAA400DD9BFB /* libmediastreamer.a in Frameworks */, + 226F2ED61344B0EF00F6EF27 /* libopencore-amrwb.a in Frameworks */, + 226F2ED71344B0EF00F6EF27 /* libopencore-amrnb.a in Frameworks */, + 226F2ED81344B0EF00F6EF27 /* libmsamr.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -778,6 +787,9 @@ 220FAD2E10765B400068D98F /* libosipparser2.a */, 220FAD2F10765B400068D98F /* libspeex.a */, 220FAD3010765B400068D98F /* libspeexdsp.a */, + 226F2ED31344B0EF00F6EF27 /* libopencore-amrwb.a */, + 226F2ED41344B0EF00F6EF27 /* libopencore-amrnb.a */, + 226F2ED51344B0EF00F6EF27 /* libmsamr.a */, 220FAC77107654FC0068D98F /* include */, 080E96DDFE201D6D7F000001 /* Classes */, 29B97315FDCFA39411CA2CEA /* Other Sources */, @@ -994,7 +1006,10 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = linphone_Prefix.pch; - GCC_PREPROCESSOR_DEFINITIONS = IN_LINPHONE; + GCC_PREPROCESSOR_DEFINITIONS = ( + IN_LINPHONE, + HAVE_AMR, + ); HEADER_SEARCH_PATHS = ( submodules/linphone/coreapi, submodules/linphone/mediastreamer2/include, @@ -1061,7 +1076,10 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = linphone_Prefix.pch; - GCC_PREPROCESSOR_DEFINITIONS = IN_LINPHONE; + GCC_PREPROCESSOR_DEFINITIONS = ( + IN_LINPHONE, + HAVE_AMR, + ); HEADER_SEARCH_PATHS = ( submodules/linphone/coreapi, submodules/linphone/mediastreamer2/include, @@ -1128,7 +1146,10 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = linphone_Prefix.pch; - GCC_PREPROCESSOR_DEFINITIONS = IN_LINPHONE; + GCC_PREPROCESSOR_DEFINITIONS = ( + IN_LINPHONE, + HAVE_AMR, + ); HEADER_SEARCH_PATHS = ( submodules/linphone/coreapi, submodules/linphone/mediastreamer2/include, diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk index 298582d87..56e3c6fc4 100644 --- a/submodules/build/builder-iphone-os.mk +++ b/submodules/build/builder-iphone-os.mk @@ -68,7 +68,7 @@ endif prefix?=$(BUILDER_SRC_DIR)/../liblinphone-sdk/$(host) -all: build-linphone build-msilbc +all: build-linphone build-msilbc build-msamr clean-makefile: clean-makefile-linphone clean: clean-linphone @@ -82,14 +82,14 @@ veryclean: .NOTPARALLEL build-linphone: init build-openssl 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-msilbc clean-libilbc clean-openssl +clean-linphone: clean-osip2 clean-eXosip2 clean-speex clean-libgsm clean-msilbc clean-libilbc clean-openssl clean-msamr cd $(LINPHONE_BUILD_DIR) && make clean -veryclean-linphone: clean-linphone veryclean-osip2 veryclean-eXosip2 veryclean-speex veryclean-libgsm veryclean-msilbc veryclean-libilbc veryclean-openssl +veryclean-linphone: clean-linphone veryclean-osip2 veryclean-eXosip2 veryclean-speex veryclean-libgsm veryclean-msilbc veryclean-libilbc veryclean-openssl veryclean-msamr 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-libilbc clean-makefile-msilbc clean-makefile-openssl +clean-makefile-linphone: clean-makefile-osip2 clean-makefile-eXosip2 clean-makefile-speex clean-makefile-libilbc clean-makefile-msilbc clean-makefile-openssl clean-makefile-msamr cd $(LINPHONE_BUILD_DIR) && rm -f Makefile && rm -f oRTP/Makefile && rm -f mediastreamer2/Makefile diff --git a/submodules/externals/opencore-amr b/submodules/externals/opencore-amr new file mode 160000 index 000000000..cf4409e03 --- /dev/null +++ b/submodules/externals/opencore-amr @@ -0,0 +1 @@ +Subproject commit cf4409e03ec56b1cd85a2f9532f58bc1fa9db274 diff --git a/submodules/msamr b/submodules/msamr new file mode 160000 index 000000000..17391e324 --- /dev/null +++ b/submodules/msamr @@ -0,0 +1 @@ +Subproject commit 17391e32465c25feec9b3b44b6967775ea9a56a9 From 3e91e6488a77372f42f2178422f83ed5eaa2b95e Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Mon, 4 Apr 2011 14:56:37 +0200 Subject: [PATCH 3/4] ad openamr build scripts --- submodules/build/builders.d/msamr.mk | 42 ++++++++++++++++++++ submodules/build/builders.d/opencore-amr.mk | 44 +++++++++++++++++++++ 2 files changed, 86 insertions(+) create mode 100644 submodules/build/builders.d/msamr.mk create mode 100644 submodules/build/builders.d/opencore-amr.mk diff --git a/submodules/build/builders.d/msamr.mk b/submodules/build/builders.d/msamr.mk new file mode 100644 index 000000000..d251a01c7 --- /dev/null +++ b/submodules/build/builders.d/msamr.mk @@ -0,0 +1,42 @@ +############################################################################ +# msamr.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. +# +############################################################################ +msamr_dir?=msamr +$(BUILDER_SRC_DIR)/$(msamr_dir)/configure: + cd $(BUILDER_SRC_DIR)/$(msamr_dir) && ./autogen.sh + +$(BUILDER_BUILD_DIR)/$(msamr_dir)/Makefile: $(BUILDER_SRC_DIR)/$(msamr_dir)/configure + mkdir -p $(BUILDER_BUILD_DIR)/$(msamr_dir) + cd $(BUILDER_BUILD_DIR)/$(msamr_dir)/ \ + && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ + $(BUILDER_SRC_DIR)/$(msamr_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} + +build-msamr: build-opencore-amr $(BUILDER_BUILD_DIR)/$(msamr_dir)/Makefile + cd $(BUILDER_BUILD_DIR)/$(msamr_dir) && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make && make install + +clean-msamr: clean-opencore-amr + cd $(BUILDER_BUILD_DIR)/$(msamr_dir) && make clean + +veryclean-msamr: veryclean-opencore-amr + cd $(BUILDER_BUILD_DIR)/$(msamr_dir) && make distclean && rm -f configure + +clean-makefile-msamr: clean-makefile-opencore-amr + cd $(BUILDER_BUILD_DIR)/$(msamr_dir) && rm -f Makefile diff --git a/submodules/build/builders.d/opencore-amr.mk b/submodules/build/builders.d/opencore-amr.mk new file mode 100644 index 000000000..14eddd265 --- /dev/null +++ b/submodules/build/builders.d/opencore-amr.mk @@ -0,0 +1,44 @@ +############################################################################ +# opencore-amr.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. +# +############################################################################ +ifneq (,$(findstring arm,$(host))) + opencore-amr-configure-option=--enable-gcc-armv5 +endif + +opencore-amr_dir?=externals/opencore-amr +$(BUILDER_BUILD_DIR)/$(opencore-amr_dir)/Makefile: $(BUILDER_SRC_DIR)/$(opencore-amr_dir)/configure + mkdir -p $(BUILDER_BUILD_DIR)/$(opencore-amr_dir) + cd $(BUILDER_BUILD_DIR)/$(opencore-amr_dir)/ \ + && CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ + $(BUILDER_SRC_DIR)/$(opencore-amr_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} ${opencore-amr-configure-option} + +build-opencore-amr: $(BUILDER_BUILD_DIR)/$(opencore-amr_dir)/Makefile + cd $(BUILDER_BUILD_DIR)/$(opencore-amr_dir) && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make && make install + +clean-opencore-amr: + cd $(BUILDER_BUILD_DIR)/$(opencore-amr_dir) && make clean + +veryclean-opencore-amr: + cd $(BUILDER_BUILD_DIR)/$(opencore-amr_dir) && make distclean + cd $(BUILDER_SRC_DIR)/$(opencore-amr_dir) && rm -f configure + +clean-makefile-opencore-amr: + cd $(BUILDER_BUILD_DIR)/$(opencore-amr_dir) && rm -f Makefile From 9b306f556036a6c1d45e20e21f2e9a29b713b624 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Mon, 4 Apr 2011 19:02:22 +0200 Subject: [PATCH 4/4] fix wrong SPEEX_LIBS value --- 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 56e3c6fc4..cb710b9dc 100644 --- a/submodules/build/builder-iphone-os.mk +++ b/submodules/build/builder-iphone-os.mk @@ -34,7 +34,7 @@ linphone_configure_controls= --disable-video \ --with-gsm=$(prefix) \ SPEEX_CFLAGS="-I$(prefix)/include" \ SPEEXDSP_LIBS="-L$(prefix)/lib -lspeexdsp" \ - SPEEX_LIBS="$(SPEEXDSP_LIBS) -lspeex " \ + SPEEX_LIBS="-L$(prefix)/lib -lspeexdsp -lspeex " \ OPENSSL_CFLAGS="-I$(prefix)/include" \ OPENSSL_LIBS="-L$(prefix)/lib -lssl -lcrypto"