Accepting request 312501 from home:Andreas_Schwab:Factory

- mozilla-arm64-libjpeg-turbo.patch: fix libjpeg-turbo configuration

OBS-URL: https://build.opensuse.org/request/show/312501
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=448
This commit is contained in:
Wolfgang Rosenauer 2015-06-19 06:08:19 +00:00 committed by Git OBS Bridge
parent d0dd48e06c
commit 51e2af5d00
3 changed files with 29 additions and 0 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
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

View File

@ -148,6 +148,7 @@ Patch12: mozilla-openaes-decl.patch
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
@ -263,6 +264,7 @@ cd $RPM_BUILD_DIR/mozilla
%patch14 -p1
%patch15 -p1
%patch16 -p1
%patch17 -p1
# Firefox
%patch101 -p1
%patch102 -p1

View File

@ -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.