From b01c2d065a3d5adbd37589461e42b9fbab82ffed Mon Sep 17 00:00:00 2001 From: Filipe Lemos Date: Fri, 9 Oct 2015 09:00:24 +0100 Subject: [PATCH 1/2] Enable bitcode on tvOS --- contrib/src/main.mak | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contrib/src/main.mak b/contrib/src/main.mak index b85cb774..cfcfdfdc 100644 --- a/contrib/src/main.mak +++ b/contrib/src/main.mak @@ -162,6 +162,10 @@ RANLIB=xcrun ranlib # CXXCPP=xcrun c++ -E endif +ifdef HAVE_TVOS +EXTRA_CFLAGS += -fembed-bitcode +endif + ifdef HAVE_WIN32 ifneq ($(shell $(CC) $(CFLAGS) -E -dM -include _mingw.h - < /dev/null | grep -E __MINGW64_VERSION_MAJOR),) HAVE_MINGW_W64 := 1 From 66fec5f0deddf6e3f295cc7d4da4a726df6d898d Mon Sep 17 00:00:00 2001 From: Filipe Lemos Date: Fri, 9 Oct 2015 09:02:02 +0100 Subject: [PATCH 2/2] Updated webp to fix compile issues for arm64 arch on newer xcode --- contrib/src/webp/SHA512SUMS | 2 +- contrib/src/webp/rules.mak | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/src/webp/SHA512SUMS b/contrib/src/webp/SHA512SUMS index c3f1895e..04c674bf 100644 --- a/contrib/src/webp/SHA512SUMS +++ b/contrib/src/webp/SHA512SUMS @@ -1 +1 @@ -0213f92cc9a4303b9ae51ffbc72c083880bcd5c1d8b2f92fe514e0a11167925934d01155f89dc9e571dee51293ea26f8b8b486c5b980db20e921d653320a4d13 libwebp-0.4.2.tar.gz +4975c055e94668cc3b8198443d141de91db6c9d99a79164631854b9b91eea2d9d92aefa361cb8e0fa8963a3deeb5ba6cc6ab55db1d7b038ae495b7e7cf5b2572 libwebp-0.4.3.tar.gz \ No newline at end of file diff --git a/contrib/src/webp/rules.mak b/contrib/src/webp/rules.mak index 55a2feda..3999e507 100644 --- a/contrib/src/webp/rules.mak +++ b/contrib/src/webp/rules.mak @@ -1,6 +1,6 @@ # webp -WEBP_VERSION := 0.4.2 +WEBP_VERSION := 0.4.3 WEBP_URL := http://downloads.webmproject.org/releases/webp/libwebp-$(WEBP_VERSION).tar.gz $(TARBALLS)/libwebp-$(WEBP_VERSION).tar.gz: