[Libreoffice-commits] core.git: 3 commits - configure.ac sc/uiconfig
Tor Lillqvist
tml at collabora.com
Thu Nov 20 07:18:41 PST 2014
configure.ac | 62 ++--------------------
sc/uiconfig/scalc/ui/formulacalculationoptions.ui | 8 +-
2 files changed, 11 insertions(+), 59 deletions(-)
New commits:
commit a5563934410406f806c22c9d388e297d6faea82b
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Nov 20 17:09:17 2014 +0200
No need to have OpenGL slide transitions optional at configure-time
(The --disable-opengl option was misnamed; it actually referred
only to the OpenGL slide transitions, not our other use of OpenGL.)
Use of OpenGL is still hardcoded off for platforms where we don't know whether
and/or how to handle it yet (iOS and Android), and otherwise it is optional at
run-time.
Change-Id: I65d0612dbc79ee07273854e5a468d891ef07c6b7
diff --git a/configure.ac b/configure.ac
index 310bb9c..1dc5329 100644
--- a/configure.ac
+++ b/configure.ac
@@ -738,7 +738,6 @@ linux-android*)
build_gstreamer_0_10=no
enable_lotuswordpro=no
enable_mpl_subset=yes
- enable_opengl=no
enable_coinmp=yes
enable_lpsolve=no
enable_report_builder=no
@@ -1102,10 +1101,6 @@ AC_ARG_ENABLE(cairo-canvas,
platforms where Cairo is available.
])
-AC_ARG_ENABLE(opengl,
- AS_HELP_STRING([--disable-opengl],
- [Determines whether to build the OpenGL 3D slide transitions and canvas component.]))
-
AC_ARG_ENABLE(dbus,
AS_HELP_STRING([--disable-dbus],
[Determines whether to enable features that depend on dbus.
@@ -7168,7 +7163,6 @@ AC_SUBST(WINEGCC)
if test $_os = iOS; then
enable_mpl_subset=yes
- enable_opengl=no
enable_lotuswordpro=no
enable_coinmp=yes
enable_lpsolve=no
@@ -10231,33 +10225,14 @@ else
fi
AC_SUBST(ENABLE_VLC)
-dnl ===================================================================
-dnl Check whether the OpenGL libraries are available
-dnl ===================================================================
-
-AC_MSG_CHECKING([whether to build the OpenGL Transitions component])
ENABLE_OPENGL=
-
-if test -z "$enable_opengl"; then
- if test $_os = iOS; then
- # As such with some suitable minor tweaks the Mac OpenGL transitions code would presumably
- # build fine for iOS, too, but let's leave that for later
- enable_opengl=no
- elif test "$with_x" = "no"; then
- enable_opengl=no
- else
- enable_opengl=yes
- fi
-fi
-
-if test "x$enable_opengl" = "xno"; then
- AC_MSG_RESULT([no])
+if test $_os = iOS -o $_os = Android; then
+ : # disable
elif test "$_os" = "Darwin"; then
# We use frameworks on Mac OS X, no need for detail checks
ENABLE_OPENGL=TRUE
ENABLE_OPENGL_CANVAS=TRUE
SYSTEM_MESA_HEADERS=TRUE
- AC_MSG_RESULT([yes])
elif test $_os = WINNT; then
# Experimental: try to use OpenGL on Windows
ENABLE_OPENGL=TRUE
@@ -10265,22 +10240,9 @@ elif test $_os = WINNT; then
# We need the internal "Mesa" headers.
SYSTEM_MESA_HEADERS=
BUILD_TYPE="$BUILD_TYPE MESA"
- AC_MSG_RESULT([yes])
else
- save_LDFLAGS=$LDFLAGS
- LDFLAGS="$LDFLAGS -lm"
- AC_MSG_RESULT([yes])
- AC_CHECK_LIB([GL], [main],
- [AC_CHECK_LIB([GL], [glCreateShader], [ENABLE_OPENGL_CANVAS=TRUE],
- [add_warning "no shader support in libGL - will enable openGL transitions, but not openGL canvas"
- AC_MSG_WARN([no shader support in libGL - will enable openGL transitions, but not openGL canvas])
- ENABLE_OPENGL_CANVAS=], [])],
- [AC_MSG_ERROR(libGL not installed or functional)], [])
- LDFLAGS="$LDFLAGS -lGL"
- AC_CHECK_LIB([GLU], [main], [:],
- [AC_MSG_ERROR(libGLU not installed or functional)], [])
ENABLE_OPENGL=TRUE
- LDFLAGS=$save_LDFLAGS
+ ENABLE_OPENGL_CANVAS=TRUE
dnl ===================================================================
dnl Check for system Mesa
@@ -12686,9 +12648,9 @@ if test "$enable_mpl_subset" = "yes"; then
*) : ;;
esac
done
- if test "$enable_opengl" != "no" -o "x$ENABLE_OPENGL" = "xTRUE"; then
- AC_MSG_ERROR([need to --disable-opengl - GL transitions support.])
- fi
+
+ ENABLE_OPENGL=
+
if test "$enable_lpsolve" != "no" -o "x$ENABLE_LPSOLVE" = "xTRUE"; then
AC_MSG_ERROR([need to --disable-lpsolve - calc linear programming solver.])
fi
commit 3b0b76462aa54f60bc9823d9c6ef64e5e35c1208
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Nov 20 16:55:17 2014 +0200
No need to have OpenCL optional at configure-time
It continues to not be used on platforms where not available (iOS and
Android), and on others it is optional at run-time anyway.
Change-Id: I7ba2f87ac143aad78df7edc2e6e6dc014c29c071
diff --git a/configure.ac b/configure.ac
index e716ad0..310bb9c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1106,10 +1106,6 @@ AC_ARG_ENABLE(opengl,
AS_HELP_STRING([--disable-opengl],
[Determines whether to build the OpenGL 3D slide transitions and canvas component.]))
-AC_ARG_ENABLE(opencl,
- AS_HELP_STRING([--disable-opencl],
- [Determines whether to build with OpenCL support.]))
-
AC_ARG_ENABLE(dbus,
AS_HELP_STRING([--disable-dbus],
[Determines whether to enable features that depend on dbus.
@@ -10314,17 +10310,11 @@ dnl =================================================
dnl Check whether to build with OpenCL support.
dnl =================================================
-AC_MSG_CHECKING([whether to build with the OpenCL support.])
ENABLE_OPENCL=
-
-if test $_os != iOS -a $_os != Android -a "x$enable_opencl" != "xno"; then
- AC_MSG_RESULT([yes])
+if test $_os != iOS -a $_os != Android; then
ENABLE_OPENCL=TRUE
AC_DEFINE(HAVE_FEATURE_OPENCL)
-else
- AC_MSG_RESULT([no])
fi
-
AC_SUBST(ENABLE_OPENCL)
dnl ===================================================================
commit 3889cc44f4bbfcd7e07259575e092288aa987e9e
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Nov 20 16:54:15 2014 +0200
Improve wording for the OpenCL blacklist/whitelist
Change-Id: I4fd0a255903daab3d5a1888eeff266f831ad590b
diff --git a/sc/uiconfig/scalc/ui/formulacalculationoptions.ui b/sc/uiconfig/scalc/ui/formulacalculationoptions.ui
index a157f8d..decce43 100644
--- a/sc/uiconfig/scalc/ui/formulacalculationoptions.ui
+++ b/sc/uiconfig/scalc/ui/formulacalculationoptions.ui
@@ -685,7 +685,7 @@
<object class="GtkLabel" id="opencl_blacklist">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="label" translatable="yes">List of known-bad OpenCL implementations</property>
+ <property name="label" translatable="yes">OpenCL implementation blacklist</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -698,7 +698,7 @@
<object class="GtkLabel" id="opencl_blacklist_desc">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="label" translatable="yes">List of known-bad OpenCL implementations.</property>
+ <property name="label" translatable="yes">List of OpenCL implementations known to be not good enough for LibreOffice. All the fields except OS are regular expressions.</property>
<property name="wrap">True</property>
<property name="max_width_chars">56</property>
</object>
@@ -713,7 +713,7 @@
<object class="GtkLabel" id="opencl_whitelist">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="label" translatable="yes">List of known-good OpenCL implementations</property>
+ <property name="label" translatable="yes">OpenCL implementation whitelist</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -726,7 +726,7 @@
<object class="GtkLabel" id="opencl_whitelist_desc">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="label" translatable="yes">List of known-good OpenCL implementations.</property>
+ <property name="label" translatable="yes">List of OpenCL implementations known to be usable by LibreOffice. All the fields except OS are regular expressions.</property>
<property name="wrap">True</property>
<property name="max_width_chars">56</property>
</object>
More information about the Libreoffice-commits
mailing list