Merge branch 'main' into perf/qt6-webchannel-latency

Author: cedrik-fuoco-adsk

.github/actions/build-linux/action.yml

@@ -55,24 +55,6 @@ runs:
       run: df -h /
       shell: bash
 
-    # Rocky 9.8 dropped mesa-libOSMesa{,-devel} from the CRB repo (Mesa upstream
-    # deprecated OSMesa in favor of llvmpipe via EGL). Pin all subsequent dnf
-    # calls in this container to the 9.7 minor release until OpenRV migrates off
-    # OSMesa. 9.7 is now a superseded minor, so the production CDN no longer
-    # serves it (the default 'extras' repo 404s); point the pinned repos at the
-    # durable vault archive (dl.rockylinux.org/vault) instead. Remove this whole
-    # step once OpenRV no longer needs OSMesa.
-    - name: Pin Rocky 9 to 9.7 minor release (vault)
-      if: ${{ inputs.rocky-version == '9' }}
-      run: |
-        echo "9.7" > /etc/dnf/vars/releasever
-        sed -i \
-          -e 's|^mirrorlist=|#mirrorlist=|g' \
-          -e 's|^#\?baseurl=https\?://dl.rockylinux.org/\$contentdir/|baseurl=https://dl.rockylinux.org/vault/rocky/|g' \
-          /etc/yum.repos.d/[Rr]ocky*.repo
-        dnf clean all
-      shell: bash
-
     - name: Install system dependencies
       run: |
         retry_count=0
@@ -84,9 +66,14 @@ runs:
           if dnf install -y epel-release && \
              dnf config-manager --set-enabled ${{ inputs.extra_repo }} devel && \
              dnf groupinstall "Development Tools" -y && \
-             dnf install -y alsa-lib-devel autoconf automake avahi-compat-libdns_sd-devel bison bzip2-devel cmake-gui curl-devel flex gcc gcc-c++ git libXcomposite libXi-devel libaio-devel libffi-devel nasm ncurses-devel nss libtool libxkbcommon libXcomposite libXdamage libXrandr libXtst libXcursor mesa-libOSMesa mesa-libOSMesa-devel meson openssl-devel patch pulseaudio-libs pulseaudio-libs-glib2 ocl-icd ocl-icd-devel opencl-headers qt5-qtbase-devel readline-devel sqlite-devel systemd-devel tcl-devel tcsh tk-devel yasm zip zlib-devel wget patchelf pcsc-lite libxkbfile perl-IPC-Cmd perl-Time-Piece && \
+             dnf install -y alsa-lib-devel autoconf automake avahi-compat-libdns_sd-devel bison bzip2-devel cmake-gui curl-devel flex gcc gcc-c++ git libXcomposite libXi-devel libaio-devel libffi-devel nasm ncurses-devel nss libtool libxkbcommon libXcomposite libXdamage libXrandr libXtst libXcursor meson openssl-devel patch pulseaudio-libs pulseaudio-libs-glib2 ocl-icd ocl-icd-devel opencl-headers qt5-qtbase-devel readline-devel sqlite-devel systemd-devel tcl-devel tcsh tk-devel yasm zip zlib-devel wget patchelf pcsc-lite libxkbfile perl-IPC-Cmd perl-Time-Piece && \
              dnf install -y libX11-devel libXext-devel libXrender-devel libXrandr-devel libXcursor-devel libXi-devel libXxf86vm-devel libxkbcommon-devel && \
              dnf install -y xz-devel mesa-libGLU mesa-libGLU-devel && \
+             if [ "${{ inputs.rocky-version }}" = "9" ]; then \
+               dnf install -y mesa-compat-libOSMesa mesa-compat-libOSMesa-devel; \
+             else \
+               dnf install -y mesa-libOSMesa mesa-libOSMesa-devel; \
+             fi && \
              dnf clean all; then
             echo "Dependencies installed successfully"
             break

.github/workflows/conan.yml

@@ -97,34 +97,27 @@ jobs:
         run: |
           df -h /
 
-      # Rocky 9.8 dropped mesa-libOSMesa{,-devel} from the CRB repo. Pin all
-      # subsequent dnf calls in this container to the 9.7 minor release until
-      # OpenRV migrates off OSMesa. Remove this step once that's done.
-      - name: Pin Rocky 9 to 9.7 minor release (vault)
-        if: ${{ matrix.rocky-version == '9' }}
-        run: |
-          echo "9.7" > /etc/dnf/vars/releasever
-          sed -i \
-            -e 's|^mirrorlist=|#mirrorlist=|g' \
-            -e 's|^#\?baseurl=https\?://dl.rockylinux.org/\$contentdir/|baseurl=https://dl.rockylinux.org/vault/rocky/|g' \
-            /etc/yum.repos.d/[Rr]ocky*.repo
-          dnf clean all
-
       - name: Install system dependencies
         run: |
           dnf install -y epel-release
           dnf config-manager --set-enabled ${{ matrix.extra_repo }} devel
           dnf install -y which findutils
           dnf groupinstall "Development Tools" -y
-          dnf install -y alsa-lib-devel autoconf automake avahi-compat-libdns_sd-devel bison bzip2-devel cmake-gui curl-devel flex gcc gcc-c++ git libXcomposite libXi-devel libaio-devel libffi-devel nasm ncurses-devel nss libtool libxkbcommon libXcomposite libXdamage libXrandr libXtst libXcursor mesa-libOSMesa mesa-libOSMesa-devel meson openssl-devel patch pulseaudio-libs pulseaudio-libs-glib2 ocl-icd ocl-icd-devel opencl-headers qt5-qtbase-devel readline-devel sqlite-devel systemd-devel tcl-devel tcsh tk-devel yasm zip zlib-devel wget patchelf pcsc-lite libxkbfile perl-IPC-Cmd perl-Digest-SHA
+          dnf install -y alsa-lib-devel autoconf automake avahi-compat-libdns_sd-devel bison bzip2-devel cmake-gui curl-devel flex gcc gcc-c++ git libXcomposite libXi-devel libaio-devel libffi-devel nasm ncurses-devel nss libtool libxkbcommon libXcomposite libXdamage libXrandr libXtst libXcursor meson openssl-devel patch pulseaudio-libs pulseaudio-libs-glib2 ocl-icd ocl-icd-devel opencl-headers qt5-qtbase-devel readline-devel sqlite-devel systemd-devel tcl-devel tcsh tk-devel yasm zip zlib-devel wget patchelf pcsc-lite libxkbfile perl-IPC-Cmd perl-Digest-SHA
           dnf install -y libX11-devel libXext-devel libXrender-devel libXrandr-devel libXcursor-devel libXi-devel libXxf86vm-devel libxkbcommon-devel
           dnf install -y xz-devel mesa-libGLU mesa-libGLU-devel
+          if [ "${{ matrix.rocky-version }}" = "9" ]; then \
+            dnf install -y mesa-compat-libOSMesa mesa-compat-libOSMesa-devel; \
+          else \
+            dnf install -y mesa-libOSMesa mesa-libOSMesa-devel; \
+          fi && \
           dnf clean all
 
       - name: Install other system dependencies
         if: ${{ matrix.rocky-version == '9' }}
         run: |
           dnf install -y perl-CPAN
+
           cpan FindBin
 
       - name: Install GCC 11 toolchain for Rocky Linux 8

.readthedocs.yaml

@@ -1,7 +1,7 @@
 version: 2
 
 build:
-  os: "ubuntu-20.04"
+  os: "ubuntu-lts-latest"
   tools:
     python: "3.8"
 

README.md

@@ -6,7 +6,7 @@
 ---
 
 ![Supported Versions](https://img.shields.io/badge/python-3.11-blue)
-[![Supported VFX Platform Versions](https://img.shields.io/badge/vfx%20platform-2024-lightgrey.svg)](http://www.vfxplatform.com/)
+[![Supported VFX Platform Versions](https://img.shields.io/badge/vfx%20platform-2025-lightgrey.svg)](http://www.vfxplatform.com/)
 [![docs](https://readthedocs.org/projects/aswf-openrv/badge/?version=latest)](https://aswf-openrv.readthedocs.io/en/latest)
 
 ## Overview

cmake/macros/rv_stage.cmake

@@ -78,6 +78,28 @@ FUNCTION(rv_stage)
   )
   IF(arg_TYPE IN_LIST _rv_stage_binary_types)
     RV_GENERATE_SYMBOLS(TARGET ${arg_TARGET})
+
+    # Release builds compile with -g so dump_syms can extract Breakpad .sym files (see docs/crash-reporting.md section 7). On Linux the shipped artifact is the
+    # stage tree itself, so leaving the DWARF in the staged ELF would ship full debug info to customers. Strip it here -- AFTER RV_GENERATE_SYMBOLS has run
+    # dump_syms on the real ELF, and BEFORE the .bin rename below -- so the shipped binaries carry no DWARF while the symbols live only in the symbols_archive
+    # zip. --strip-debug keeps .symtab and, crucially, the GNU build-id that the .sym directory tree is keyed on, so offline symbolication still matches. This
+    # is gated on Release + Linux only (not on the Breakpad version, per contract C6): macOS Mach-O binaries do not embed DWARF (it stays in the dSYM, which
+    # rv_generate_symbols.cmake produces then deletes), so they are not bloated and need no strip.
+    #
+    # strip_debug_safe.sh (not a bare `strip`) guards against a GNU strip bug that corrupts binaries whose layout triggers the "'.dynstr' not in segment"
+    # warning: it strips to a temp copy and only replaces the original when strip is warning- and error-free, otherwise it leaves the binary unstripped. RV's
+    # own compiled targets strip cleanly; the guard protects any that do not.
+    IF(RV_TARGET_LINUX
+       AND CMAKE_BUILD_TYPE STREQUAL "Release"
+    )
+      ADD_CUSTOM_COMMAND(
+        TARGET ${arg_TARGET}
+        POST_BUILD
+        COMMENT "Stripping DWARF debug info from ${arg_TARGET} (symbols archived separately)"
+        COMMAND bash ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/../scripts/strip_debug_safe.sh "$<TARGET_FILE:${arg_TARGET}>"
+        VERBATIM
+      )
+    ENDIF()
   ENDIF()
 
   IF(RV_TARGET_LINUX)

cmake/scripts/strip_debug_safe.sh

@@ -0,0 +1,53 @@
+#!/bin/bash
+#
+# Copyright (C) 2026  Autodesk, Inc. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Safely strip DWARF debug info from an ELF binary.
+#
+# GNU strip has a known bug: for binaries whose layout makes it emit
+#   "allocated section `.dynstr' not in segment"
+# (observed on Google Crashpad's crashpad_handler and some Qt tools such as
+# lupdate), it rewrites the program headers incorrectly and produces an
+# UNLOADABLE binary (the loader fails with exit 127 / "Connection reset by
+# peer" for crashpad_handler). strip can still exit 0 while emitting that
+# warning, so a plain in-place `strip` silently corrupts the shipped binary.
+#
+# This wrapper strips to a temporary copy and only replaces the original when
+# strip completed with NO warnings/errors on stderr and a zero exit code.
+# Otherwise the original binary is left untouched (it keeps its debug info, but
+# it stays loadable). Such binaries typically carry little or no DWARF anyway,
+# so the size cost of skipping them is negligible.
+#
+# Usage: ./strip_debug_safe.sh <elf-binary>
+#
+
+TARGET="$1"
+
+if [ -z "${TARGET}" ]; then
+    echo "strip_debug_safe: usage: $0 <elf-binary>" >&2
+    exit 2
+fi
+
+if [ ! -f "${TARGET}" ]; then
+    # Nothing to strip (e.g. target produced no file); do not fail the build.
+    echo "strip_debug_safe: no such file, skipping: ${TARGET}" >&2
+    exit 0
+fi
+
+# Strip to a temp copy in the same directory (same filesystem => atomic mv).
+TMP="$(mktemp "${TARGET}.stripXXXXXX")" || exit 1
+
+# Capture stderr while discarding stdout. The command-substitution exit status
+# is strip's exit code, which the following test consumes.
+if STRIP_ERR="$(strip --strip-debug -o "${TMP}" "${TARGET}" 2>&1 >/dev/null)" && [ -z "${STRIP_ERR}" ]; then
+    # Clean strip: preserve permissions and replace the original atomically.
+    chmod --reference="${TARGET}" "${TMP}" 2>/dev/null || true
+    mv -f "${TMP}" "${TARGET}"
+else
+    rm -f "${TMP}"
+    echo "strip_debug_safe: keeping ${TARGET} unstripped (strip reported: ${STRIP_ERR:-nonzero exit})" >&2
+fi
+
+exit 0

dockerfiles/Dockerfile.Linux-Rocky9-CY2023

@@ -63,8 +63,8 @@ RUN dnf groupinstall "Development Tools" -y \
     libxkbfile \
     mesa-libGLU \
     mesa-libGLU-devel \
-    mesa-libOSMesa \
-    mesa-libOSMesa-devel \
+    mesa-compat-libOSMesa \
+    mesa-compat-libOSMesa-devel \
     meson \
     nasm \
     ncurses-devel \
@@ -135,4 +135,4 @@ RUN python -m aqt install-qt linux desktop ${QT_VERSION} gcc_64 -O ~/Qt \
 -m ${QT_MODULES} \
 --archives ${QT_ARCHIVES}
 
-CMD ["/bin/bash"]
+CMD ["/bin/bash"]

dockerfiles/Dockerfile.Linux-Rocky9-CY2024

@@ -63,8 +63,8 @@ RUN dnf groupinstall "Development Tools" -y \
     libxkbfile \
     mesa-libGLU \
     mesa-libGLU-devel \
-    mesa-libOSMesa \
-    mesa-libOSMesa-devel \
+    mesa-compat-libOSMesa \
+    mesa-compat-libOSMesa-devel \
     meson \
     nasm \
     ncurses-devel \
@@ -92,6 +92,8 @@ RUN dnf groupinstall "Development Tools" -y \
     yasm \
     zip \
     zlib-devel \
+    rust \
+    cargo \
     && dnf clean all
 
 # Disable the devel repo afterwards since dnf will warn about it
@@ -135,4 +137,4 @@ RUN python -m aqt install-qt linux desktop ${QT_VERSION} gcc_64 -O ~/Qt \
 -m ${QT_MODULES} \
 --archives ${QT_ARCHIVES}
 
-CMD ["/bin/bash"]
+CMD ["/bin/bash"]

docs/build_system/config_linux_rocky89.md

@@ -116,6 +116,15 @@ sudo dnf install -y libX11-devel libXext-devel libXrender-devel libXrandr-devel
 sudo dnf install -y xz-devel mesa-libGLU mesa-libGLU-devel
 ```
 
+````{tabs}
+```{code-tab} bash Rocky 8
+sudo dnf install -y mesa-libOSMesa mesa-libOSMesa-devel
+```
+```{code-tab} bash Rocky 9
+sudo dnf install -y mesa-compat-libOSMesa mesa-compat-libOSMesa-devel
+```
+````
+
 ```bash
 sudo dnf clean all
 ```

docs/crash-reporting.md

@@ -184,6 +184,15 @@ key: Mu context is function-level (see C2 for why line-level cannot be captured
    them from Release installs — the macOS/Linux `symbols/` tree and the Windows `.pdb` files. (Debug
    installs keep them for local debugging; the strip is gated on `CMAKE_INSTALL_CONFIG_NAME`.)
    Customers never symbolicate, so shipping symbols only bloats the package.
+
+   In addition, the *staged binaries themselves* must not embed DWARF. Release compiles with `-g`
+   (so `dump_syms` can extract the `.sym` above), but on Linux the shipped artifact is the `stage`
+   tree itself — not a `cmake --install` output — so the install-time strip never runs on it.
+   Therefore `rv_stage.cmake` runs `strip --strip-debug` on each staged Linux binary in Release,
+   *after* `dump_syms` has read the DWARF and *before* the `.bin` rename. This keeps `.symtab` and
+   the GNU build-id (the key for the `symbols/` tree), so the DWARF lives only in the
+   `symbols_archive` zip while the shipped binaries carry none. macOS Mach-O binaries do not embed
+   DWARF (it stays in the dSYM), so no equivalent strip is needed there.
 3. The `symbols_archive` build target (`rv_archive_symbols.cmake`) instead packages a versioned,
    per-platform `RV-<version>-<os>-<arch>-symbols.zip` under `stage/packages/`:
    - macOS/Linux: the Breakpad `symbols/` tree plus the symbolication tools (`minidump_stackwalk`,
@@ -239,12 +248,12 @@ violates. This list is a remediation tracker, not part of the permanent design.
       entry points (values are set correctly at init via `StartHandler`).
 - [x] **C1 — three diverging init paths** for `rv` / `RV` / `rvio` (violated C4). Fixed: all three
       now call one shared helper, `TwkApp::initializeCrashHandler(appName, version, executableDir)`
-      (`src/lib/app/MuTwkApp/CrashHandlerInit.{h,cpp}`), which resolves the handler, initializes, and
-      enables Mu debugging. The per-`main.cpp` `#ifdef` path blocks are gone.
-- [x] **C2 — `rvio` used the bare `crashpad_handler`** (violated C5) and never called
-      `setDebugging(true)`. Fixed by C1's shared helper: every binary now uses the platform wrapper
-      (`crashpad_handler_{macos,linux}.sh` / `.exe`) and enables Mu debugging. The leftover
-      `rvio` `addAnnotation("platform", …)` dead write (B3) was removed in the same change.
+      (`src/lib/app/MuTwkApp/CrashHandlerInit.{h,cpp}`), which resolves the handler and initializes
+      it. The per-`main.cpp` `#ifdef` path blocks are gone. (Automatic Mu debugging was later
+      removed — the `mu_function` annotation carries the script context without it.)
+- [x] **C2 — `rvio` used the bare `crashpad_handler`** (violated C5). Fixed by C1's shared helper:
+      every binary now uses the platform wrapper (`crashpad_handler_{macos,linux}.sh` / `.exe`). The
+      leftover `rvio` `addAnnotation("platform", …)` dead write (B3) was removed in the same change.
 - [x] **D1 — Crashpad wrapper install guarded on `RV_DEPS_BREAKPAD_VERSION`** in
       `src/bin/nsapps/RV/CMakeLists.txt` (violated C6). Fixed: split by tool ownership — the Crashpad
       wrapper is now guarded on `RV_DEPS_CRASHPAD_VERSION`, `symbolicate_crash.sh` on the Breakpad var.