diff options
| author | Erik Kundiman <erik@megapahit.org> | 2026-07-30 06:42:44 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2026-07-30 06:42:44 +0800 |
| commit | 561bb7148f7da8dcedae8da8fb3d1edc9a1cbf08 (patch) | |
| tree | e6834f36ba62199fea647513c224a70051546559 /indra/newview | |
| parent | 1a3f04276e981473023d379cae1a792ae8a11a47 (diff) | |
| parent | bb748f993bbdd3be537558d5ba1941e7d20e3b35 (diff) | |
Merge branch 'main' into 26.3
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | indra/newview/PKGBUILD.in | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 4092b4f0aa..81ac89695b 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -2355,6 +2355,11 @@ if (LINUX) if (PACKAGE) if (${LINUX_DISTRO} MATCHES arch) + if (CMAKE_SYSTEM_PROCESSOR MATCHES x86_64) + set(ARCH_DEPS cef) + else () + set(ARCH_DEPS "at-spi2-core minizip") + endif () configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/PKGBUILD.in ${CMAKE_BINARY_DIR}/PKGBUILD diff --git a/indra/newview/PKGBUILD.in b/indra/newview/PKGBUILD.in index b2830ed145..8b57e62f58 100644 --- a/indra/newview/PKGBUILD.in +++ b/indra/newview/PKGBUILD.in @@ -6,7 +6,7 @@ pkgdesc="${VIEWER_PACKAGE_COMMENT}" arch=('${CMAKE_SYSTEM_PROCESSOR}') url="https://${VIEWER_PACKAGE_DOMAIN_NAME}" license=('LGPL-2.1') -depends=(freealut apr-util at-spi2-core boost-libs cef fltk glu hunspell libnghttp2 openjpeg2 sdl2 vlc libvorbis) +depends=(freealut apr-util boost-libs fltk glu hunspell libnghttp2 openjpeg2 sdl2 vlc libvorbis ${ARCH_DEPS}) package() { cd "$startdir" |