configure.ac | 11 ++++++++++- distro-configs/CODAWindows.conf | 7 +++++++ 2 files changed, 17 insertions(+), 1 deletion(-)
New commits: commit b0965d1cc07bc79447b888a0f858327028695007 Author: Andras Timar <[email protected]> AuthorDate: Sun Nov 23 00:24:58 2025 +0100 Commit: Thorsten Behrens <[email protected]> CommitDate: Tue Dec 2 16:57:09 2025 +0100 CODA-W: more tweaks to build config Change-Id: I1900d19d95e27a9a47ad2c17715ffba5b4eadd99 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194614 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Thorsten Behrens <[email protected]> diff --git a/configure.ac b/configure.ac index dbdd67a0c211..f24776311313 100644 --- a/configure.ac +++ b/configure.ac @@ -2191,6 +2191,11 @@ AC_ARG_ENABLE(opencl, [Disable OpenCL support.]), ,enable_opencl=yes) +AC_ARG_ENABLE(opengl, + AS_HELP_STRING([--disable-opengl], + [Disable OpenGL support.]), +,enable_opengl=yes) + libo_FUZZ_ARG_ENABLE(librelogo, AS_HELP_STRING([--disable-librelogo], [Do not build LibreLogo.]), @@ -12755,9 +12760,13 @@ AC_SUBST(GSTREAMER_1_0_CFLAGS) AC_SUBST(GSTREAMER_1_0_LIBS) AC_SUBST(ENABLE_GSTREAMER_1_0) +dnl ================================================= +dnl Check whether to build with OpenGL support. +dnl ================================================= + ENABLE_OPENGL_TRANSITIONS= ENABLE_OPENGL_CANVAS= -if test $_os = iOS -o $_os = Android -o "$ENABLE_FUZZERS" = "TRUE"; then +if test $_os = iOS -o $_os = Android -o "$ENABLE_FUZZERS" = "TRUE" -o "$enable_opengl" != "yes"; then : # disable elif test "$_os" = "Darwin"; then # We use frameworks on macOS, no need for detail checks diff --git a/distro-configs/CODAWindows.conf b/distro-configs/CODAWindows.conf index bcae85b35ef5..22ad22929dc0 100644 --- a/distro-configs/CODAWindows.conf +++ b/distro-configs/CODAWindows.conf @@ -11,6 +11,10 @@ --without-java --enable-symbols +# Branding (unused, but...) +--disable-community-flavor +--with-branding=icon-themes/galaxy/brand_cp + # Features --disable-breakpad --disable-firebird-sdbc @@ -24,6 +28,7 @@ --enable-headless --enable-mergelibs --disable-opencl +--disable-opengl --without-galleries # Sensible font bundling settings for desktop @@ -33,7 +38,9 @@ # MPLv2 subset --with-theme=colibre +--disable-mariadb-sdbc --disable-postgresql-sdbc --disable-lotuswordpro --disable-lpsolve --disable-poppler +--disable-gpgmepp
