[Bf-blender-cvs] [491fc5cacea] master: Build: disable X11 support for spnav on Linux
Campbell Barton
noreply at git.blender.org
Wed Dec 14 05:18:26 CET 2022
Commit: 491fc5cacead98b1979560b752c0bd9ab0327519
Author: Campbell Barton
Date: Wed Dec 14 14:57:13 2022 +1100
Branches: master
https://developer.blender.org/rB491fc5cacead98b1979560b752c0bd9ab0327519
Build: disable X11 support for spnav on Linux
This prevented building Blender without X11 (Wayland only).
===================================================================
M build_files/build_environment/cmake/spnav.cmake
===================================================================
diff --git a/build_files/build_environment/cmake/spnav.cmake b/build_files/build_environment/cmake/spnav.cmake
index 33a262cbc86..12b904866df 100644
--- a/build_files/build_environment/cmake/spnav.cmake
+++ b/build_files/build_environment/cmake/spnav.cmake
@@ -5,7 +5,20 @@ ExternalProject_Add(external_spnav
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${SPNAV_HASH_TYPE}=${SPNAV_HASH}
PREFIX ${BUILD_DIR}/spnav
- CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/spnav/src/external_spnav/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/spnav --disable-shared --enable-static --with-pic
+
+ CONFIGURE_COMMAND
+ ${CONFIGURE_ENV} &&
+ cd ${BUILD_DIR}/spnav/src/external_spnav/ &&
+ ${CONFIGURE_COMMAND}
+ --prefix=${LIBDIR}/spnav
+ # X11 is not needed as Blender polls the device as part of the GHOST event loop.
+ # This is used to support `3dxserv`, however this is no longer supported by 3DCONNEXION.
+ # Disable so building without X11 is supported (WAYLAND only).
+ --disable-x11
+ --disable-shared
+ --enable-static
+ --with-pic
+
BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/spnav/src/external_spnav/ && make -j${MAKE_THREADS}
INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/spnav/src/external_spnav/ && make install
INSTALL_DIR ${LIBDIR}/spnav
More information about the Bf-blender-cvs
mailing list