зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1137305 - Move --enable-skia{,-gpu} to python configure and enable skia by default on little-endian platforms. r=chmanchester
--HG-- extra : rebase_source : 4038081460a8c071510a326df8127e9e6d1ae653
This commit is contained in:
Родитель
cb6368734e
Коммит
9aa5c1b0b4
|
@ -221,8 +221,6 @@ def old_configure_options(*options):
|
|||
'--enable-sandbox',
|
||||
'--enable-signmar',
|
||||
'--enable-simulator',
|
||||
'--enable-skia',
|
||||
'--enable-skia-gpu',
|
||||
'--enable-small-chunk-size',
|
||||
'--enable-startup-notification',
|
||||
'--enable-startupcache',
|
||||
|
|
|
@ -5200,46 +5200,6 @@ fi
|
|||
|
||||
AC_SUBST_LIST(GLIB_GMODULE_LIBS)
|
||||
|
||||
dnl ========================================================
|
||||
dnl Graphics checks.
|
||||
dnl ========================================================
|
||||
|
||||
if test "${OS_TARGET}" = "WINNT" -o \
|
||||
"${OS_ARCH}" = "Darwin" -o \
|
||||
"${MOZ_WIDGET_TOOLKIT}" = "android" -o \
|
||||
"${MOZ_WIDGET_TOOLKIT}" = "gonk" -o \
|
||||
"${MOZ_WIDGET_TOOLKIT}" = "gtk2" -o \
|
||||
"${MOZ_WIDGET_TOOLKIT}" = "gtk3"; then
|
||||
case "${CPU_ARCH}" in
|
||||
x86|x86_64|arm)
|
||||
MOZ_ENABLE_SKIA=1
|
||||
;;
|
||||
*)
|
||||
MOZ_ENABLE_SKIA=
|
||||
;;
|
||||
esac
|
||||
else
|
||||
MOZ_ENABLE_SKIA=
|
||||
fi
|
||||
|
||||
MOZ_ARG_ENABLE_BOOL(skia,
|
||||
[ --enable-skia Enable use of Skia],
|
||||
MOZ_ENABLE_SKIA=1,
|
||||
MOZ_ENABLE_SKIA=)
|
||||
|
||||
dnl Skia GPU support may not reliably build on certain *BSDs (see bug 1234494).
|
||||
if test "${OS_TARGET}" = "OpenBSD" -o \
|
||||
"${OS_TARGET}" = "NetBSD"; then \
|
||||
MOZ_DISABLE_SKIA_GPU=1
|
||||
else
|
||||
MOZ_DISABLE_SKIA_GPU=
|
||||
fi
|
||||
|
||||
MOZ_ARG_DISABLE_BOOL(skia-gpu,
|
||||
[ --disable-skia-gpu Disable use of Skia-GPU],
|
||||
MOZ_DISABLE_SKIA_GPU=1,
|
||||
MOZ_DISABLE_SKIA_GPU=)
|
||||
|
||||
if test "$USE_FC_FREETYPE"; then
|
||||
if test "$COMPILE_ENVIRONMENT"; then
|
||||
dnl ========================================================
|
||||
|
@ -5441,27 +5401,6 @@ AC_SUBST_LIST(MOZ_CAIRO_LIBS)
|
|||
AC_SUBST_LIST(MOZ_CAIRO_OSLIBS)
|
||||
AC_SUBST(MOZ_TREE_PIXMAN)
|
||||
|
||||
dnl ========================================================
|
||||
dnl Skia
|
||||
dnl ========================================================
|
||||
if test "$MOZ_ENABLE_SKIA"; then
|
||||
SKIA_INCLUDES="/gfx/skia /gfx/skia/skia/include/config /gfx/skia/skia/include/core"
|
||||
AC_DEFINE(MOZ_ENABLE_SKIA)
|
||||
AC_DEFINE(USE_SKIA)
|
||||
if test "${MOZ_WIDGET_TOOLKIT}" = "android" -o x"$MOZ_WIDGET_TOOLKIT" = x"gonk"; then
|
||||
AC_DEFINE(SK_BUILD_FOR_ANDROID_NDK)
|
||||
fi
|
||||
|
||||
if test "${CPU_ARCH}" != "ppc" -a "${CPU_ARCH}" != "ppc64" -a "${CPU_ARCH}" != "sparc" -a "${CPU_ARCH}" != "sparc64" -a -z "$MOZ_DISABLE_SKIA_GPU" ; then
|
||||
SKIA_INCLUDES="$SKIA_INCLUDES /gfx/skia/skia/include/gpu /gfx/skia/skia/include/utils"
|
||||
MOZ_ENABLE_SKIA_GPU=1
|
||||
AC_DEFINE(USE_SKIA_GPU)
|
||||
AC_SUBST(MOZ_ENABLE_SKIA_GPU)
|
||||
fi
|
||||
fi
|
||||
AC_SUBST(MOZ_ENABLE_SKIA)
|
||||
AC_SUBST_LIST(SKIA_INCLUDES)
|
||||
|
||||
dnl ========================================================
|
||||
dnl disable xul
|
||||
dnl ========================================================
|
||||
|
|
|
@ -682,3 +682,63 @@ def necko_protocols(protocols):
|
|||
|
||||
set_config('NECKO_PROTOCOLS', necko_protocols)
|
||||
add_old_configure_assignment('NECKO_PROTOCOLS', necko_protocols)
|
||||
|
||||
# Graphics
|
||||
# ==============================================================
|
||||
option('--disable-skia', help='Disable use of Skia')
|
||||
|
||||
@depends('--disable-skia', target)
|
||||
def skia(value, target):
|
||||
if value.origin == 'default' and target.endianness == 'big':
|
||||
return False
|
||||
if value:
|
||||
return True
|
||||
|
||||
set_config('MOZ_ENABLE_SKIA', skia)
|
||||
set_define('MOZ_ENABLE_SKIA', skia)
|
||||
set_define('USE_SKIA', skia)
|
||||
|
||||
@depends(skia, target)
|
||||
def skia_android(skia, target):
|
||||
if skia and target.os == 'Android':
|
||||
return True
|
||||
|
||||
set_define('SK_BUILD_FOR_ANDROID_NDK', skia_android)
|
||||
|
||||
option('--disable-skia-gpu', help='Disable use of Skia-GPU')
|
||||
|
||||
@depends('--disable-skia-gpu', skia, target)
|
||||
def skia_gpu(value, skia, target):
|
||||
if value.origin == 'default':
|
||||
if not skia:
|
||||
return False
|
||||
# Skia GPU support may not reliably build on certain *BSDs (see bug 1234494)
|
||||
if target.os in ('NetBSD', 'OpenBSD'):
|
||||
return False
|
||||
elif value and not skia:
|
||||
die('Cannot enable Skia-GPU without enabling Skia')
|
||||
if skia and value:
|
||||
return True
|
||||
|
||||
set_config('MOZ_ENABLE_SKIA_GPU', skia_gpu)
|
||||
set_define('USE_SKIA_GPU', skia_gpu)
|
||||
|
||||
@depends(skia, skia_gpu)
|
||||
def skia_includes(skia, skia_gpu):
|
||||
includes = []
|
||||
if skia:
|
||||
includes += [
|
||||
'/gfx/skia',
|
||||
'/gfx/skia/skia/include/config',
|
||||
'/gfx/skia/skia/include/core',
|
||||
]
|
||||
|
||||
if skia_gpu:
|
||||
includes += [
|
||||
'/gfx/skia/skia/include/gpu',
|
||||
'/gfx/skia/skia/include/utils',
|
||||
]
|
||||
|
||||
return includes
|
||||
|
||||
set_config('SKIA_INCLUDES', skia_includes)
|
||||
|
|
Загрузка…
Ссылка в новой задаче