diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index af55dde2f..57e51dc3a 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -5680,7 +5680,7 @@ HEADER_SEARCH_PATHS = ""; IPHONEOS_DEPLOYMENT_TARGET = 4.3; LIBRARY_SEARCH_PATHS = ""; - PROVISIONING_PROFILE = "79E53132-649F-48B3-A931-24792E466A11"; + PROVISIONING_PROFILE = "D0073029-09E3-435D-B758-DA3E8EFDA2A3"; SDKROOT = iphoneos; STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/submodules/build/builders.d/x264.mk b/submodules/build/builders.d/x264.mk index fbe943686..203ffe351 100644 --- a/submodules/build/builders.d/x264.mk +++ b/submodules/build/builders.d/x264.mk @@ -43,12 +43,12 @@ ifneq (,$(findstring armv7,$(host))) endif x264_dir?=externals/x264 -$(BUILDER_SRC_DIR)/$(x264_dir)/patched : - cd $(BUILDER_SRC_DIR)/$(x264_dir) \ - && git apply $(BUILDER_SRC_DIR)/build/builders.d/x264.patch \ - && touch $(BUILDER_SRC_DIR)/$(x264_dir)/patched +#$(BUILDER_SRC_DIR)/$(x264_dir)/patched : +# cd $(BUILDER_SRC_DIR)/$(x264_dir) \ +# && git apply $(BUILDER_SRC_DIR)/build/builders.d/x264.patch \ +# && touch $(BUILDER_SRC_DIR)/$(x264_dir)/patched -$(BUILDER_BUILD_DIR)/$(x264_dir)/configure: $(BUILDER_SRC_DIR)/$(x264_dir)/patched +$(BUILDER_BUILD_DIR)/$(x264_dir)/configure: mkdir -p $(BUILDER_BUILD_DIR)/$(x264_dir) cd $(BUILDER_BUILD_DIR)/$(x264_dir)/ \ && rsync -av --exclude ".git" $(BUILDER_SRC_DIR)/$(x264_dir)/* . @@ -66,6 +66,9 @@ clean-x264: veryclean-x264: -cd $(BUILDER_BUILD_DIR)/$(x264_dir) && make distclean + cd $(BUILDER_SRC_DIR)/$(x264_dir)/ \ + && git checkout common/arm/asm.S \ + && rm -f patched rm -rf $(BUILDER_BUILD_DIR)/$(x264_dir) clean-makefile-x264: diff --git a/submodules/externals/x264 b/submodules/externals/x264 index 926a03a9c..f6a8615ab 160000 --- a/submodules/externals/x264 +++ b/submodules/externals/x264 @@ -1 +1 @@ -Subproject commit 926a03a9c1f48d0fbd54b0e802d740774c100a78 +Subproject commit f6a8615ab0c922ac2cb5c82c9824f6f4742b1725