From 5d49e8d5d843270f4b385471607be74582a29a60 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Mon, 28 Nov 2011 12:36:45 +0100 Subject: [PATCH] fix Could not read socket issue + speex issue --- README | 15 +++++++-------- linphone.xcodeproj/project.pbxproj | 10 ---------- submodules/build/Makefile | 12 ++++++------ submodules/build/builder-iphone-os.mk | 20 ++++++++++---------- submodules/externals/exosip | 2 +- submodules/linphone | 2 +- 6 files changed, 25 insertions(+), 36 deletions(-) diff --git a/README b/README index 8e33ced92..da91ec552 100644 --- a/README +++ b/README @@ -22,13 +22,13 @@ $ sudo mv gas-preprocessor.pl /opt/local/bin/. Link macport libtoolize to glibtoolize (sudo ln -s /opt/local/bin/glibtoolize /opt/local/bin/libtoolize) Link host's strings to simulator SDK (ln -s /usr/bin/strings /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/strings) -******************************************* -*******GPL versus non GPL****************** -******************************************* -This sdk can be generated in 2 flavors. Firt is GPL, it means liblinphone include GPL third parties like FFMPEG or x264. -If you choose this flavor, your final application must comply with GPL. This is the default mode. +*********************************************************************** +*******GPL third parties versus non GPL third parties****************** +*********************************************************************** +This sdk can be generated in 2 flavors. Firt is with GPL third parties, it means liblinphone includes GPL third parties like FFMPEG or x264. +If you choose this flavor, your final application must comply with GPL in any case. This is the default mode. -To generate the liblinphone multi arch sdkin GPL mode, once the above commands have been executed: +To generate the liblinphone multi arch sdk in GPL mode, once the above commands have been executed: cd submodules/build make all @@ -37,7 +37,7 @@ If you choose this flavor, your final application is still subject to GPL excep To generate the liblinphone multi arch sdkin non GPL mode, once the above commands have been executed: cd submodules/build - make all enable_gpl=no + make all enable_gpl_third_parties=no ****************************************** ****Third party, subject to lincense*i**** @@ -52,5 +52,4 @@ In case you upgrade your IOS SDK, you may force configure by using make targets Libraries are available from liblinphone-sdk/ -liblinphone xcode subproject: This subproject is just for debuggingi purpose, do not compile it until you know exactly what you are doing. diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 13b0bf947..0f50be466 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -174,9 +174,6 @@ 22D8F15D147548E2008C97DB /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 70E542F213E147E3002BA2C0 /* OpenGLES.framework */; }; 22D8F15E147548E2008C97DB /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22276E8813C73DC000210156 /* CoreMedia.framework */; }; 22D8F15F147548E2008C97DB /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22276E8613C73D8A00210156 /* CoreVideo.framework */; }; - 22D8F160147548E2008C97DB /* libavcodec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22276E8013C73D3100210156 /* libavcodec.a */; }; - 22D8F161147548E2008C97DB /* libavutil.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22276E8113C73D3100210156 /* libavutil.a */; }; - 22D8F162147548E2008C97DB /* libswscale.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22276E8213C73D3100210156 /* libswscale.a */; }; 22D8F163147548E2008C97DB /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5B0AD133B5EA20044EA25 /* libssl.a */; }; 22D8F164147548E2008C97DB /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5B0AE133B5EA20044EA25 /* libcrypto.a */; }; 22D8F165147548E2008C97DB /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; }; @@ -202,8 +199,6 @@ 22D8F179147548E2008C97DB /* libopencore-amrwb.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226F2ED31344B0EF00F6EF27 /* libopencore-amrwb.a */; }; 22D8F17A147548E2008C97DB /* libopencore-amrnb.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226F2ED41344B0EF00F6EF27 /* libopencore-amrnb.a */; }; 22D8F17B147548E2008C97DB /* libmsamr.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226F2ED51344B0EF00F6EF27 /* libmsamr.a */; }; - 22D8F17C147548E2008C97DB /* libx264.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22AA8AFB13D7125500B30535 /* libx264.a */; }; - 22D8F17D147548E2008C97DB /* libmsx264.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22AA8AFC13D7125500B30535 /* libmsx264.a */; }; 22D8F17E147548E2008C97DB /* libSKP_SILK_SDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226183AA1472527D0037138E /* libSKP_SILK_SDK.a */; }; 22D8F17F147548E2008C97DB /* libsrtp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226183AB1472527D0037138E /* libsrtp.a */; }; 22D8F180147548E2008C97DB /* libmssilk.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226183AF147259670037138E /* libmssilk.a */; }; @@ -641,9 +636,6 @@ 22D8F15D147548E2008C97DB /* OpenGLES.framework in Frameworks */, 22D8F15E147548E2008C97DB /* CoreMedia.framework in Frameworks */, 22D8F15F147548E2008C97DB /* CoreVideo.framework in Frameworks */, - 22D8F160147548E2008C97DB /* libavcodec.a in Frameworks */, - 22D8F161147548E2008C97DB /* libavutil.a in Frameworks */, - 22D8F162147548E2008C97DB /* libswscale.a in Frameworks */, 22D8F163147548E2008C97DB /* libssl.a in Frameworks */, 22D8F164147548E2008C97DB /* libcrypto.a in Frameworks */, 22D8F165147548E2008C97DB /* Foundation.framework in Frameworks */, @@ -669,8 +661,6 @@ 22D8F179147548E2008C97DB /* libopencore-amrwb.a in Frameworks */, 22D8F17A147548E2008C97DB /* libopencore-amrnb.a in Frameworks */, 22D8F17B147548E2008C97DB /* libmsamr.a in Frameworks */, - 22D8F17C147548E2008C97DB /* libx264.a in Frameworks */, - 22D8F17D147548E2008C97DB /* libmsx264.a in Frameworks */, 22D8F17E147548E2008C97DB /* libSKP_SILK_SDK.a in Frameworks */, 22D8F17F147548E2008C97DB /* libsrtp.a in Frameworks */, 22D8F180147548E2008C97DB /* libmssilk.a in Frameworks */, diff --git a/submodules/build/Makefile b/submodules/build/Makefile index 4e2d6de4c..91f9d7d86 100644 --- a/submodules/build/Makefile +++ b/submodules/build/Makefile @@ -19,16 +19,16 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # ############################################################################ -enable_gpl=yes +enable_gpl_third_parties=yes .NOTPARALLEL all: build warning -ifeq ($(enable_gpl),yes) +ifeq ($(enable_gpl_third_parties),yes) warning: @echo @echo "*****************************************************************" @echo "*****************************************************************" @echo "*****CAUTION, this liblinphone SDK is built using GPL code ******" - @echo "*****To disable gpl code, use make enable_gpl=no *************" + @echo "*****To disable gpl code, use make enable_gpl_third_parties=no***" @echo "*****************************************************************" @echo "*****************************************************************" else @@ -42,9 +42,9 @@ warning: endif build: - make -f builder-iphone-os.mk all enable_gpl=$(enable_gpl) \ - && make -f builder-iphone-simulator.mk all enable_gpl=$(enable_gpl)\ - && make -f builder-iphone-os.mk host=armv7-apple-darwin all enable_gpl=$(enable_gpl)\ + make -f builder-iphone-os.mk all enable_gpl_third_parties=$(enable_gpl_third_parties) \ + && make -f builder-iphone-simulator.mk all enable_gpl_third_parties=$(enable_gpl_third_parties)\ + && make -f builder-iphone-os.mk host=armv7-apple-darwin all enable_gpl_third_parties=$(enable_gpl_third_parties)\ && make -f builder-iphone-os.mk delivery-sdk clean: make -f builder-iphone-simulator.mk clean \ diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk index c04473289..07f5ab3a9 100644 --- a/submodules/build/builder-iphone-os.mk +++ b/submodules/build/builder-iphone-os.mk @@ -47,25 +47,25 @@ LINPHONE_BUILD_DIR=$(BUILDER_BUILD_DIR)/linphone all: build-linphone build-msilbc build-msamr build-msx264 build-mssilk -$(LINPHONE_BUILD_DIR)/enable_gpl: +$(LINPHONE_BUILD_DIR)/enable_gpl_third_parties: mkdir -p $(LINPHONE_BUILD_DIR) - touch $(LINPHONE_BUILD_DIR)/enable_gpl - rm -f $(LINPHONE_BUILD_DIR)/disable_gpl + touch $(LINPHONE_BUILD_DIR)/enable_gpl_third_parties + rm -f $(LINPHONE_BUILD_DIR)/disable_gpl_third_parties cd $(LINPHONE_BUILD_DIR) && rm -f Makefile && rm -f oRTP/Makefile && rm -f mediastreamer2/Makefile -$(LINPHONE_BUILD_DIR)/disable_gpl: +$(LINPHONE_BUILD_DIR)/disable_gpl_third_parties: mkdir -p $(LINPHONE_BUILD_DIR) - touch $(LINPHONE_BUILD_DIR)/disable_gpl - rm -f $(LINPHONE_BUILD_DIR)/enable_gpl + touch $(LINPHONE_BUILD_DIR)/disable_gpl_third_parties + rm -f $(LINPHONE_BUILD_DIR)/enable_gpl_third_parties cd $(LINPHONE_BUILD_DIR) && rm -f Makefile && rm -f oRTP/Makefile && rm -f mediastreamer2/Makefile -ifeq ($(enable_gpl),yes) +ifeq ($(enable_gpl_third_parties),yes) linphone_configure_controls+= --enable-ffmpeg --enable-zrtp -detect_gpl_mode_switch: $(LINPHONE_BUILD_DIR)/enable_gpl +detect_gpl_mode_switch: $(LINPHONE_BUILD_DIR)/enable_gpl_third_parties else linphone_configure_controls+= --disable-ffmpeg --disable-zrtp -detect_gpl_mode_switch: $(LINPHONE_BUILD_DIR)/disable_gpl +detect_gpl_mode_switch: $(LINPHONE_BUILD_DIR)/disable_gpl_third_parties endif @@ -172,7 +172,7 @@ $(BUILDER_BUILD_DIR)/$(eXosip_dir)/Makefile: $(BUILDER_SRC_DIR)/$(eXosip_dir)/co mkdir -p $(BUILDER_BUILD_DIR)/$(eXosip_dir) cd $(BUILDER_BUILD_DIR)/$(eXosip_dir)/\ && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ - $(BUILDER_SRC_DIR)/$(eXosip_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} CFLAGS="-I$(prefix)/include -L$(prefix)/lib -lcrypto -DMULTITASKING_ENABLED" --enable-openssl --disable-tools + $(BUILDER_SRC_DIR)/$(eXosip_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} CFLAGS="-I$(prefix)/include -L$(prefix)/lib -lcrypto" --enable-openssl --disable-tools build-eXosip2: $(BUILDER_BUILD_DIR)/$(eXosip_dir)/Makefile cd $(BUILDER_BUILD_DIR)/$(eXosip_dir) \ diff --git a/submodules/externals/exosip b/submodules/externals/exosip index f28804413..c3da03035 160000 --- a/submodules/externals/exosip +++ b/submodules/externals/exosip @@ -1 +1 @@ -Subproject commit f288044136b3e60baf6c0805e8cf87e5cdbc7890 +Subproject commit c3da0303519ad3120355cb85baee9cf6d0e4d1c2 diff --git a/submodules/linphone b/submodules/linphone index 53b732a7d..28a1f62e2 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 53b732a7d32fe1f3005f39e446fb860de0afa97c +Subproject commit 28a1f62e26e59273c7b8bf2c61a6c301dfc32904