# HG changeset patch
# User Andreas Schwab <schwab@suse.de>
# Date 1434694737 -7200
# Node ID 390088186660745dde7caa0b12d9e867425a20be
# Parent  aa12e155bdd866fbb0858809d01481a65bcd5612
mozilla-arm64-libjpeg-turbo.patch: fix libjpeg-turbo configuration

diff -r aa12e155bdd8 -r 390088186660 MozillaFirefox/MozillaFirefox.changes
--- a/MozillaFirefox/MozillaFirefox.changes	Fri Jun 19 17:20:28 2015 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes	Fri Jun 19 08:18:57 2015 +0200
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------
-Wed Jun 17 10:48:49 UTC 2015 - wr@rosenauer.org
+Wed Jun 19 10:48:49 UTC 2015 - wr@rosenauer.org
 
 - update to Firefox 39.0b6
 - dropped mozilla-prefer_plugin_pref.patch as this feature is
@@ -8,6 +8,11 @@
 - require NSS 3.19.1
 
 -------------------------------------------------------------------
+Thu Jun 18 10:30:18 UTC 2015 - schwab@suse.de
+
+- mozilla-arm64-libjpeg-turbo.patch: fix libjpeg-turbo configuration
+
+-------------------------------------------------------------------
 Sun Jun  7 07:09:12 UTC 2015 - wr@rosenauer.org
 
 - update to Firefox 38.0.6
diff -r aa12e155bdd8 -r 390088186660 MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Fri Jun 19 17:20:28 2015 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Fri Jun 19 08:18:57 2015 +0200
@@ -147,6 +147,7 @@
 Patch14:        mozilla-skia-be-le.patch
 Patch15:        mozilla-bmo1005535.patch
 Patch16:        mozilla-add-glibcxx_use_cxx11_abi.patch
+Patch17:        mozilla-arm64-libjpeg-turbo.patch
 # Firefox/browser
 Patch101:       firefox-kde.patch
 Patch102:       firefox-no-default-ualocale.patch
@@ -261,6 +262,7 @@
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
 # Firefox
 %patch101 -p1
 %patch102 -p1
diff -r aa12e155bdd8 -r 390088186660 MozillaFirefox/mozilla-arm64-libjpeg-turbo.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MozillaFirefox/mozilla-arm64-libjpeg-turbo.patch	Fri Jun 19 08:18:57 2015 +0200
@@ -0,0 +1,1 @@
+../mozilla-arm64-libjpeg-turbo.patch
\ No newline at end of file
diff -r aa12e155bdd8 -r 390088186660 mozilla-arm64-libjpeg-turbo.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mozilla-arm64-libjpeg-turbo.patch	Fri Jun 19 08:18:57 2015 +0200
@@ -0,0 +1,22 @@
+Index: mozilla/configure.in
+===================================================================
+--- mozilla.orig/configure.in
++++ mozilla/configure.in
+@@ -6241,7 +6241,7 @@ fi
+ 
+ dnl If we're on an ARM system which supports libjpeg-turbo's asm routines and
+ dnl --disable-libjpeg-turbo wasn't passed, use the C compiler as the assembler.
+-if test -n "$LIBJPEG_TURBO_ARM_ASM" ; then
++if test -n "$LIBJPEG_TURBO_ARM_ASM" -o -n "$LIBJPEG_TURBO_ARM64_ASM" ; then
+     echo "Using $AS as the assembler for ARM code."
+     LIBJPEG_TURBO_AS=$AS
+ fi
+@@ -6252,6 +6252,8 @@ elif test -n "$LIBJPEG_TURBO_X64_ASM"; t
+     AC_DEFINE(LIBJPEG_TURBO_X64_ASM)
+ elif test -n "$LIBJPEG_TURBO_ARM_ASM"; then
+     AC_DEFINE(LIBJPEG_TURBO_ARM_ASM)
++elif test -n "$LIBJPEG_TURBO_ARM64_ASM"; then
++    AC_DEFINE(LIBJPEG_TURBO_ARM64_ASM)
+ elif test -n "$MOZ_LIBJPEG_TURBO"; then
+     dnl Warn if we're not building the optimized routines, even though the user
+     dnl didn't specify --disable-libjpeg-turbo.
diff -r aa12e155bdd8 -r 390088186660 series
--- a/series	Fri Jun 19 17:20:28 2015 +0200
+++ b/series	Fri Jun 19 08:18:57 2015 +0200
@@ -15,6 +15,7 @@
 mozilla-skia-be-le.patch
 mozilla-bmo1005535.patch
 mozilla-add-glibcxx_use_cxx11_abi.patch
+mozilla-arm64-libjpeg-turbo.patch
 
 # Firefox patches
 firefox-kde.patch