[Libreoffice-commits] core.git: external/jpeg-turbo

[jan Iversen]

 external/jpeg-turbo/UnpackedTarball_jpeg-turbo.mk |    1 +
 external/jpeg-turbo/jpeg-turbo.iOS.patch.1        |   20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)

New commits:
commit c45f2f0940770ef09664f1a10cc874ce979bce08
Author: jan Iversen <jani at libreoffice.org>
Date:   Sat Jun 10 21:08:16 2017 +0200

    iOS, patch to jpeg-turbo
    
    Patch allowing cputype arm64
    
    Change-Id: Idca7d40a4186cd724599af8b4b9891f9f876aa31

diff --git a/external/jpeg-turbo/UnpackedTarball_jpeg-turbo.mk b/external/jpeg-turbo/UnpackedTarball_jpeg-turbo.mk
index 222ce407f1a3..3a87a578e916 100644
--- a/external/jpeg-turbo/UnpackedTarball_jpeg-turbo.mk
+++ b/external/jpeg-turbo/UnpackedTarball_jpeg-turbo.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,jpeg-turbo,\
 	external/jpeg-turbo/jpeg-turbo.arm_build.patch.1 \
 	external/jpeg-turbo/ubsan.patch \
 	external/jpeg-turbo/jpeg-turbo.limits.patch.1 \
+	external/jpeg-turbo/jpeg-turbo.iOS.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/jpeg-turbo/jpeg-turbo.iOS.patch.1 b/external/jpeg-turbo/jpeg-turbo.iOS.patch.1
new file mode 100644
index 000000000000..d81ab59c19ad
--- /dev/null
+++ b/external/jpeg-turbo/jpeg-turbo.iOS.patch.1
@@ -0,0 +1,20 @@
+--- jpeg.org/config.sub	2017-06-10 20:48:27.000000000 +0200
++++ jpeg/config.sub	2017-06-10 20:53:22.000000000 +0200
+@@ -253,7 +253,7 @@
+ 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ 	| am33_2.0 \
+ 	| arc | arceb \
+-	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
++	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] | arm64 \
+ 	| avr | avr32 \
+ 	| be32 | be64 \
+ 	| bfin \
+@@ -374,7 +374,7 @@
+ 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+ 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+ 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
+-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
++	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \
+ 	| avr-* | avr32-* \
+ 	| be32-* | be64-* \
+ 	| bfin-* | bs2000-* \