mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-02-07 14:18:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update libvpx, fixes corruption and crashes with new clang.

Browse source
This commit is contained in:
Guillaume BIENKOWSKI 2014-05-02 18:10:42 +02:00
parent a5794a420d
commit b88f1f1aec
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
submodules/build/builders.d/libvpx.mk
View file

@ -8,6 +8,9 @@ libvpx_configure_options=\
take_binary=
# force take binary, it seems libvpx was fixed since http://git.chromium.org/gitweb/?p=webm/libvpx.git;a=commit;h=33df6d1fc1d268b4901b74b4141f83594266f041
force_non_binary_libvpx=1
ifneq (,$(findstring armv6,$(host)))
libvpx_configure_options+= --target=armv6-darwin-gcc --cpu=arm1176jzf-s
else ifneq (,$(findstring armv7s,$(host)))
@ -29,19 +32,18 @@ ifeq ($(force_non_binary_libvpx),1)
take_binary=
endif
# $(BUILDER_SRC_DIR)/$(libvpx_dir)/patched.stamp:
# cd $(BUILDER_SRC_DIR)/$(libvpx_dir) \
# && git apply $(BUILDER_SRC_DIR)/build/builders.d/libvpx.patch \
# && touch $@
$(BUILDER_SRC_DIR)/$(libvpx_dir)/patched.stamp:
cd $(BUILDER_SRC_DIR)/$(libvpx_dir) \
&& git apply $(BUILDER_SRC_DIR)/build/builders.d/libvpx.patch \
&& touch $@
$(BUILDER_BUILD_DIR)/$(libvpx_dir)/config.mk: $(BUILDER_SRC_DIR)/$(libvpx_dir)/patched.stamp
#$(BUILDER_BUILD_DIR)/$(libvpx_dir)/config.mk: $(BUILDER_SRC_DIR)/$(libvpx_dir)/patched.stamp
$(BUILDER_BUILD_DIR)/$(libvpx_dir)/config.mk:
mkdir -p $(BUILDER_BUILD_DIR)/$(libvpx_dir)
cd $(BUILDER_BUILD_DIR)/$(libvpx_dir)/ \
&& host_alias=${host} . $(BUILDER_SRC_DIR)/build/$(config_site) \
&& export all_platforms="${all_p}" && $(BUILDER_SRC_DIR)/$(libvpx_dir)/configure --prefix=$(prefix) --sdk-path=$$SDK_BIN_PATH/../../ --libc=$$SYSROOT_PATH $(libvpx_configure_options) --extra-cflags="-O1 -fno-strict-aliasing"
&& export all_platforms="${all_p}" && $(BUILDER_SRC_DIR)/$(libvpx_dir)/configure --prefix=$(prefix) --sdk-path=$$SDK_BIN_PATH/../../ --libc=$$SYSROOT_PATH $(libvpx_configure_options) --extra-cflags="-fno-strict-aliasing"
build-libvpx: $(BUILDER_BUILD_DIR)/$(libvpx_dir)/config.mk
cd $(BUILDER_BUILD_DIR)/$(libvpx_dir) \
@ -62,8 +64,7 @@ clean-libvpx:
veryclean-libvpx:
-cd $(BUILDER_BUILD_DIR)/$(libvpx_dir) && make distclean
cd $(BUILDER_SRC_DIR)/$(libvpx_dir) \
&& git clean -f && git reset --hard \
&& rm -f patched.stamp
&& git clean -f && git reset --hard
rm -rf $(BUILDER_BUILD_DIR)/$(libvpx_dir)
clean-makefile-libvpx:

2
submodules/externals/libvpx vendored

@ -1 +1 @@
Subproject commit 2e88f2f2ec777259bda1714e72f1ecd2519bceb5
Subproject commit f17a2eb9d53e4a2d7f691c0bb7bf7bfa36c3b479