mirror of
https://github.com/rustdesk/rustdesk.git
synced 2026-09-10 06:21:02 +03:00
drm: bump the pinned libdrmtap to v0.4.15
This commit is contained in:
3
.github/workflows/flutter-build.yml
vendored
3
.github/workflows/flutter-build.yml
vendored
@@ -1726,7 +1726,8 @@ jobs:
|
||||
export DRMTAP_REPO="https://github.com/rustdesk-org/libdrmtap"
|
||||
export DRMTAP_REF="main"
|
||||
# Literal (not overridable by an inherited env var) so the ref/commit pair is immutable in CI.
|
||||
export DRMTAP_SHA="816766dedaba3140c613712ce97aa2614e8899e7"
|
||||
# libdrmtap v0.4.15.
|
||||
export DRMTAP_SHA="cbc5e6af5b353b6bc351072a27a5351d82ba66e3"
|
||||
# Guard: accept only an exact vX.Y.Z tag OR the literal `main`, so a random/loose branch
|
||||
# is still rejected; the DRMTAP_SHA check below is the real anchor (it fails the build if
|
||||
# `main` -- or a tag -- resolves to anything other than the pinned immutable commit).
|
||||
|
||||
4
build.py
4
build.py
@@ -349,8 +349,8 @@ LIBDRMTAP_REF = os.environ.get('DRMTAP_REF', 'main')
|
||||
# The immutable commit the ref must resolve to. `git clone --branch` follows a mutable ref (a branch
|
||||
# even more than a tag), so verifying this after clone catches a moved/compromised ref swapping the
|
||||
# .so. Keep in sync with LIBDRMTAP_REF on every bump (override via DRMTAP_SHA together with DRMTAP_REF
|
||||
# for a local fork). This commit is libdrmtap v0.4.14.
|
||||
LIBDRMTAP_SHA = os.environ.get('DRMTAP_SHA', '816766dedaba3140c613712ce97aa2614e8899e7')
|
||||
# for a local fork). This commit is libdrmtap v0.4.15.
|
||||
LIBDRMTAP_SHA = os.environ.get('DRMTAP_SHA', 'cbc5e6af5b353b6bc351072a27a5351d82ba66e3')
|
||||
|
||||
|
||||
def _single_real_so(paths, where):
|
||||
|
||||
@@ -14,7 +14,7 @@ wayland = ["gstreamer", "gstreamer-app", "gstreamer-video", "dbus", "tracing", "
|
||||
# `drm` is a pure runtime-dlopen backend: rustdesk loads `libdrmtap.so.0` at runtime (`drmtap_dl.rs`)
|
||||
# and NEVER link-time links it, so the graceful PipeWire fallback when the .so or EGL is absent is
|
||||
# preserved and the drm build pulls in no libdrm/seccomp/cap/EGL link-time deps. The .so is version
|
||||
# pinned by build.py's `DRMTAP_SHA` to the libdrmtap v0.4.14 release commit (`DRMTAP_REF` is `main`,
|
||||
# pinned by build.py's `DRMTAP_SHA` to the libdrmtap v0.4.15 release commit (`DRMTAP_REF` is `main`,
|
||||
# and the exact commit is verified after clone). We deliberately do
|
||||
# NOT depend on the `libdrmtap-sys` crate: its build.rs statically compiles the whole libdrmtap C tree
|
||||
# and a CAP_SYS_ADMIN helper and emits `-ldrm -lseccomp -lcap`, which would defeat the dlopen model.
|
||||
|
||||
Reference in New Issue
Block a user