diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-11-21 16:16:57 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-11-21 16:16:57 +0800 |
| commit | 21ef63545ca07ef625edb742b2b3d1473bf33f13 (patch) | |
| tree | fef2574a8705afdbeb6e745cdcb101972541b1c4 /indra | |
| parent | 8c11861023b4fe30a7971ff34ac52bc76ce33ffa (diff) | |
which fixes the problem of freezing/crashing or disappearing of the
viewer, at least on default GNOME-based Debian.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/UI.cmake | 6 | ||||
| -rw-r--r-- | indra/newview/CMakeLists.txt | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake index 85e74f03e4..ac45838427 100644 --- a/indra/cmake/UI.cmake +++ b/indra/cmake/UI.cmake @@ -12,6 +12,12 @@ if (LINUX OR CMAKE_SYSTEM_NAME MATCHES FreeBSD) return() endif() + if (${LINUX_DISTRO} MATCHES debian) + include(FindPkgConfig) + pkg_check_modules(Cairo REQUIRED cairo) + target_include_directories(ll::uilibraries SYSTEM INTERFACE ${Cairo_INCLUDE_DIRS}) + endif () + target_link_libraries( ll::uilibraries INTERFACE fltk Xrender diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 3ca3ab997d..6a15f2fd38 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -2333,10 +2333,10 @@ if (LINUX) CACHE STRING "Debian package section.") if (${LINUX_DISTRO} MATCHES debian) if (CMAKE_SYSTEM_PROCESSOR MATCHES aarch64) - set(CPACK_DEBIAN_PACKAGE_DEPENDS "libalut0, libaprutil1t64, libboost-fiber1.83.0, libboost-filesystem1.83.0, libboost-program-options1.83.0, libboost-regex1.83.0, libboost-thread1.83.0, libboost-url1.83.0, libexpat1, libfltk1.3t64, libgles-dev, libglu1-mesa, libhunspell-1.7-0, libmeshoptimizer2d, libminizip1t64, libnghttp2-14, libnspr4, libnss3, libopenjp2-7, libsdl2-2.0-0, libvlc5, libvorbisenc2, libvorbisfile3, vlc-plugin-base" + set(CPACK_DEBIAN_PACKAGE_DEPENDS "libalut0, libaprutil1t64, libboost-fiber1.83.0, libboost-filesystem1.83.0, libboost-program-options1.83.0, libboost-regex1.83.0, libboost-thread1.83.0, libboost-url1.83.0, libexpat1, libfltk1.4, libgles-dev, libglu1-mesa, libhunspell-1.7-0, libmeshoptimizer2d, libminizip1t64, libnghttp2-14, libnspr4, libnss3, libopenjp2-7, libsdl2-2.0-0, libvlc5, libvorbisenc2, libvorbisfile3, vlc-plugin-base" CACHE STRING "Debian package dependencies.") else () - set(CPACK_DEBIAN_PACKAGE_DEPENDS "libaprutil1t64, libboost-fiber1.83.0, libboost-filesystem1.83.0, libboost-program-options1.83.0, libboost-regex1.83.0, libboost-thread1.83.0, libboost-url1.83.0, libexpat1, libfltk1.3t64, libgles-dev, libglu1-mesa, libhunspell-1.7-0, libmeshoptimizer2d, libminizip1t64, libnghttp2-14, libnspr4, libnss3, libopenjp2-7, libsdl2-2.0-0, libvlc5, libvorbisenc2, libvorbisfile3, vlc-plugin-base" + set(CPACK_DEBIAN_PACKAGE_DEPENDS "libaprutil1t64, libboost-fiber1.83.0, libboost-filesystem1.83.0, libboost-program-options1.83.0, libboost-regex1.83.0, libboost-thread1.83.0, libboost-url1.83.0, libexpat1, libfltk1.4, libgles-dev, libglu1-mesa, libhunspell-1.7-0, libmeshoptimizer2d, libminizip1t64, libnghttp2-14, libnspr4, libnss3, libopenjp2-7, libsdl2-2.0-0, libvlc5, libvorbisenc2, libvorbisfile3, vlc-plugin-base" CACHE STRING "Debian package dependencies.") endif () else () |