[Libreoffice-commits] core.git: avmedia/Library_avmedia.mk chart2/Library_chartcore.mk chart2/Module_chart2.mk config_host.mk.in configure.ac cui/Library_cui.mk postprocess/CustomTarget_registry.mk postprocess/Rdb_services.mk scp2/InstallModule_impress.mk slideshow/Library_slideshow.mk slideshow/Module_slideshow.mk svx/Library_svxcore.mk toolkit/Library_tk.mk vcl/CppunitTest_vcl_bitmap_test.mk vcl/Executable_icontest.mk vcl/Executable_vcldemo.mk vcl/Library_vcl.mk
Tor Lillqvist
tml at collabora.com
Wed Aug 3 19:37:34 UTC 2016
avmedia/Library_avmedia.mk | 2 +-
chart2/Library_chartcore.mk | 8 ++++----
chart2/Module_chart2.mk | 2 +-
config_host.mk.in | 2 +-
configure.ac | 14 +++++++-------
cui/Library_cui.mk | 2 +-
postprocess/CustomTarget_registry.mk | 2 +-
postprocess/Rdb_services.mk | 8 +++-----
scp2/InstallModule_impress.mk | 2 +-
slideshow/Library_slideshow.mk | 2 +-
slideshow/Module_slideshow.mk | 2 +-
svx/Library_svxcore.mk | 2 +-
toolkit/Library_tk.mk | 2 +-
vcl/CppunitTest_vcl_bitmap_test.mk | 2 +-
vcl/Executable_icontest.mk | 2 +-
vcl/Executable_vcldemo.mk | 2 +-
vcl/Library_vcl.mk | 2 +-
17 files changed, 28 insertions(+), 30 deletions(-)
New commits:
commit e13aead8a19c65144fc254f9e3a694584ab1777c
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Aug 3 22:12:29 2016 +0300
Reduce ENABLE_OPENGL / ENABLE_HEADLESS confusion
ENABLE_OPENGL means whether to enable the OpenGL slideshow transition
code. It does not mean whether to enable use of OpenGL in general. So
rename it to ENABLE_OPENGL_TRANSITIONS while at it.
ENABLE_HEADLESS means whether to disable use of X11 and OpenGL on X11
(and Wayland) platforms, I think, meaning Linux and maybe Solaris and
the BSDs. Maybe it should be renamed to DISABLE_X11_AND_OPENGL.
Change-Id: Ibb30f51646b1bcc477fe691a3fa38c7a1e3944ae
diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk
index 6a0c35b..4c028ca 100644
--- a/avmedia/Library_avmedia.mk
+++ b/avmedia/Library_avmedia.mk
@@ -27,7 +27,7 @@ $(eval $(call gb_Library_use_externals,avmedia,\
boost_headers \
))
-ifeq ($(ENABLE_OPENGL),TRUE)
+ifeq ($(ENABLE_HEADLESS),)
$(eval $(call gb_Library_use_externals,avmedia,\
glew \
))
diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk
index 75a7655..b15f634 100644
--- a/chart2/Library_chartcore.mk
+++ b/chart2/Library_chartcore.mk
@@ -30,7 +30,7 @@ $(eval $(call gb_Library_use_externals,chartcore,\
glm_headers \
))
-ifeq ($(ENABLE_OPENGL),TRUE)
+ifeq ($(ENABLE_HEADLESS),)
$(eval $(call gb_Library_use_externals,chartcore,\
glew \
))
@@ -119,7 +119,7 @@ $(eval $(call gb_Library_add_exception_objects,chartcore,\
chart2/source/view/main/VPolarTransformation \
chart2/source/view/main/VTitle \
))
-ifeq ($(ENABLE_OPENGL),TRUE)
+ifeq ($(ENABLE_HEADLESS),)
$(eval $(call gb_Library_add_exception_objects,chartcore,\
chart2/source/view/main/3DChartObjects \
chart2/source/view/main/GL3DPlotterBase \
@@ -264,12 +264,12 @@ else ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
$(eval $(call gb_Library_add_libs,chartcore,\
$(DLOPEN_LIBS) \
))
-ifeq ($(ENABLE_OPENGL),TRUE)
+ifeq ($(ENABLE_HEADLESS),)
$(eval $(call gb_Library_add_libs,chartcore,\
-lGL \
-lX11 \
))
-endif #ENABLE_OPENGL
+endif #!ENABLE_HEADLESS
endif
diff --git a/chart2/Module_chart2.mk b/chart2/Module_chart2.mk
index 3b32e1c..5a88f18 100644
--- a/chart2/Module_chart2.mk
+++ b/chart2/Module_chart2.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_Module_add_targets,chart2,\
Library_chartcontroller \
Library_chartcore \
))
-ifeq ($(ENABLE_OPENGL),TRUE)
+ifeq ($(ENABLE_HEADLESS),)
$(eval $(call gb_Module_add_targets,chart2,\
Library_chartopengl \
Package_opengl \
diff --git a/config_host.mk.in b/config_host.mk.in
index 04613e1..91eeaba 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -159,7 +159,7 @@ export ENABLE_ONLINE_UPDATE=@ENABLE_ONLINE_UPDATE@
export ENABLE_ONLINE_UPDATE_MAR=@ENABLE_ONLINE_UPDATE_MAR@
export ENABLE_EXTENSION_UPDATE=@ENABLE_EXTENSION_UPDATE@
export ENABLE_OOENV=@ENABLE_OOENV@
-export ENABLE_OPENGL=@ENABLE_OPENGL@
+export ENABLE_OPENGL_TRANSITIONS=@ENABLE_OPENGL_TRANSITIONS@
export ENABLE_OPENGL_CANVAS=@ENABLE_OPENGL_CANVAS@
export ENABLE_PCH=@ENABLE_PCH@
export ENABLE_PDFIMPORT=@ENABLE_PDFIMPORT@
diff --git a/configure.ac b/configure.ac
index b9e7217..1ec2250 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10451,29 +10451,29 @@ else
fi
AC_SUBST(ENABLE_VLC)
-# this is for opengl transitions in impress slideshow
-ENABLE_OPENGL=
+ENABLE_OPENGL_TRANSITIONS=
+ENABLE_OPENGL_CANVAS=
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_TRANSITIONS=TRUE
AC_DEFINE(HAVE_FEATURE_OPENGL,1)
ENABLE_OPENGL_CANVAS=TRUE
elif test $_os = WINNT; then
- ENABLE_OPENGL=TRUE
+ ENABLE_OPENGL_TRANSITIONS=TRUE
AC_DEFINE(HAVE_FEATURE_OPENGL,1)
ENABLE_OPENGL_CANVAS=TRUE
else
if test "$USING_X11" = TRUE; then
AC_CHECK_LIB(GL, glBegin, [:], AC_MSG_ERROR([libGL required.]))
- ENABLE_OPENGL=TRUE
+ ENABLE_OPENGL_TRANSITIONS=TRUE
AC_DEFINE(HAVE_FEATURE_OPENGL,1)
ENABLE_OPENGL_CANVAS=TRUE
fi
fi
-AC_SUBST(ENABLE_OPENGL)
+AC_SUBST(ENABLE_OPENGL_TRANSITIONS)
AC_SUBST(ENABLE_OPENGL_CANVAS)
dnl =================================================
@@ -12838,7 +12838,7 @@ if test "$enable_mpl_subset" = "yes"; then
esac
done
- ENABLE_OPENGL=
+ ENABLE_OPENGL_TRANSITIONS=
if test "$enable_lpsolve" != "no" -o "x$ENABLE_LPSOLVE" = "xTRUE"; then
AC_MSG_ERROR([need to --disable-lpsolve - calc linear programming solver.])
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index 2196201..cc3b314 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -70,7 +70,7 @@ $(eval $(call gb_Library_use_externals,cui,\
icuuc \
icu_headers \
))
-ifeq ($(ENABLE_OPENGL),TRUE)
+ifeq ($(ENABLE_HEADLESS),)
$(eval $(call gb_Library_use_externals,cui,\
glew \
))
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index 0d4e93e..186522d 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -441,7 +441,7 @@ postprocess_FILES_onlineupdate := \
$(call gb_XcuModuleTarget_get_target,extensions/source/update/check)/org/openoffice/Office/Jobs-onlineupdate.xcu
endif
-ifeq ($(ENABLE_OPENGL),TRUE)
+ifeq ($(ENABLE_OPENGL_TRANSITIONS),TRUE)
postprocess_XCDS += ogltrans.xcd
postprocess_DEPS_ogltrans := main
postprocess_FILES_ogltrans := \
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index c411fc1..775022a 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -213,7 +213,7 @@ $(eval $(call gb_Rdb_add_components,services,\
extensions/source/update/check/updchk.uno \
extensions/source/update/ui/updchk \
) \
- $(if $(ENABLE_OPENGL), \
+ $(if $(ENABLE_OPENGL_TRANSITIONS), \
slideshow/source/engine/OGLTrans/ogltrans \
) \
$(if $(ENABLE_TDE), \
@@ -229,10 +229,8 @@ $(eval $(call gb_Rdb_add_components,services,\
wizards/com/sun/star/wizards/report/report \
wizards/com/sun/star/wizards/table/table \
) \
- $(if $(ENABLE_OPENGL), \
- $(if $(ENABLE_GLTF), \
- $(call gb_Helper_optional,AVMEDIA,avmedia/source/opengl/avmediaogl) \
- ) \
+ $(if $(ENABLE_GLTF), \
+ $(call gb_Helper_optional,AVMEDIA,avmedia/source/opengl/avmediaogl) \
) \
))
diff --git a/scp2/InstallModule_impress.mk b/scp2/InstallModule_impress.mk
index c8d04a4..fc097b5 100644
--- a/scp2/InstallModule_impress.mk
+++ b/scp2/InstallModule_impress.mk
@@ -28,7 +28,7 @@ $(eval $(call gb_InstallModule_add_scpfiles,scp2/impress,\
))
$(eval $(call gb_InstallModule_add_scpfiles,scp2/impress,\
- $(if $(filter TRUE,$(ENABLE_OPENGL)),\
+ $(if $(filter TRUE,$(ENABLE_OPENGL_TRANSITIONS)),\
scp2/source/impress/module_ogltrans \
) \
))
diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk
index 3834dfd..3a9aac6 100644
--- a/slideshow/Library_slideshow.mk
+++ b/slideshow/Library_slideshow.mk
@@ -29,7 +29,7 @@ $(eval $(call gb_Library_set_precompiled_header,slideshow,$(SRCDIR)/slideshow/in
$(eval $(call gb_Library_use_externals,slideshow,\
boost_headers \
))
-ifeq ($(ENABLE_OPENGL),TRUE)
+ifeq ($(ENABLE_HEADLESS),)
$(eval $(call gb_Library_use_externals,slideshow,\
glew \
))
diff --git a/slideshow/Module_slideshow.mk b/slideshow/Module_slideshow.mk
index 01d1058..8d98a97 100644
--- a/slideshow/Module_slideshow.mk
+++ b/slideshow/Module_slideshow.mk
@@ -12,7 +12,7 @@ $(eval $(call gb_Module_Module,slideshow))
$(eval $(call gb_Module_add_targets,slideshow,\
Library_slideshow \
))
-ifeq ($(ENABLE_OPENGL),TRUE)
+ifeq ($(ENABLE_OPENGL_TRANSITIONS),TRUE)
$(eval $(call gb_Module_add_targets,slideshow,\
Library_OGLTrans \
Package_opengl \
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 37b1ef0..87b44e8 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -86,7 +86,7 @@ $(eval $(call gb_Library_use_externals,svxcore,\
icu_headers \
libxml2 \
))
-ifeq ($(ENABLE_OPENGL),TRUE)
+ifeq ($(ENABLE_HEADLESS),)
$(eval $(call gb_Library_use_externals,svxcore,\
glew \
))
diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk
index ecb376e..27bd721 100644
--- a/toolkit/Library_tk.mk
+++ b/toolkit/Library_tk.mk
@@ -25,7 +25,7 @@ $(eval $(call gb_Library_use_externals,tk,\
boost_headers \
))
-ifeq ($(ENABLE_OPENGL),TRUE)
+ifeq ($(ENABLE_HEADLESS),)
$(eval $(call gb_Library_use_externals,tk,\
glew \
))
diff --git a/vcl/CppunitTest_vcl_bitmap_test.mk b/vcl/CppunitTest_vcl_bitmap_test.mk
index 514a846..879c7ac 100644
--- a/vcl/CppunitTest_vcl_bitmap_test.mk
+++ b/vcl/CppunitTest_vcl_bitmap_test.mk
@@ -17,7 +17,7 @@ $(eval $(call gb_CppunitTest_use_externals,vcl_bitmap_test,\
boost_headers \
glm_headers \
))
-ifeq ($(ENABLE_OPENGL),TRUE)
+ifeq ($(ENABLE_HEADLESS),)
$(eval $(call gb_CppunitTest_use_externals,vcl_bitmap_test,\
glew \
))
diff --git a/vcl/Executable_icontest.mk b/vcl/Executable_icontest.mk
index 58efd05..102697b 100644
--- a/vcl/Executable_icontest.mk
+++ b/vcl/Executable_icontest.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_Executable_use_externals,icontest,\
boost_headers \
glm_headers \
))
-ifeq ($(ENABLE_OPENGL),TRUE)
+ifeq ($(ENABLE_HEADLESS),)
$(eval $(call gb_Executable_use_externals,icontest,\
glew \
))
diff --git a/vcl/Executable_vcldemo.mk b/vcl/Executable_vcldemo.mk
index 6003ecd..bff091e 100644
--- a/vcl/Executable_vcldemo.mk
+++ b/vcl/Executable_vcldemo.mk
@@ -19,7 +19,7 @@ $(eval $(call gb_Executable_use_externals,vcldemo,\
boost_headers \
glm_headers \
))
-ifeq ($(ENABLE_OPENGL),TRUE)
+ifeq ($(ENABLE_HEADLESS),)
$(eval $(call gb_Executable_use_externals,vcldemo,\
glew \
))
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index c2837a1..904f035 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -122,7 +122,7 @@ $(eval $(call gb_Library_use_externals,vcl,\
lcms2 \
mdds_headers \
))
-ifneq ($(ENABLE_OPENGL)$(if $(filter ANDROID,$(OS)),TRUE),)
+ifeq ($(ENABLE_HEADLESS),)
$(eval $(call gb_Library_use_externals,vcl,\
glew \
))
More information about the Libreoffice-commits
mailing list