Skip to content

Update fork to BambuLab Studio 2.7.1#476

Merged
BenJule merged 2 commits into
masterfrom
update-bambu-2.7.1
Jun 5, 2026
Merged

Update fork to BambuLab Studio 2.7.1#476
BenJule merged 2 commits into
masterfrom
update-bambu-2.7.1

Conversation

@BenJule

@BenJule BenJule commented Jun 5, 2026

Copy link
Copy Markdown
Owner

Closes #475

Rebases the Linux packaging/CI fork onto upstream BambuStudio 2.7.1 (v02.07.01.57).

This single commit sets the tree to upstream 2.7.1 + the fork overlay, so the diff is the clean 2.7.0 → 2.7.1 delta.

Verification before push

  • src/ diff matches upstream 2.7.0.55 → 2.7.1.57 (202 vs 205 files; delta = fork patches only)
  • Fork CI/packaging overlay shows no diff (.github/scripts/docker/flatpak/openspec/renovate/SECURITY)
  • All 51 fork src/ patches present (camera fullscreen, media, alternate_extra_wall)
  • 22 merge conflicts resolved
  • version.inc base → 02.07.01

Debian test build runs via PR CI.

@github-actions github-actions Bot added area: ci GitHub Actions, CI/CD area: packaging AppImage, .deb, .rpm, Flatpak platform: linux Linux-specific issue tests Test files and test infrastructure labels Jun 5, 2026
@github-actions github-actions Bot added this to the v02.07.00-dev milestone Jun 5, 2026
@github-actions github-actions Bot added area: filament Filament profiles and settings area: build Build system, CMake, scripts dependencies Dependency updates platform: windows Windows-specific issue area: ui User interface / wxWidgets area: networking Cloud, MQTT, printer connection area: slicing Slicing engine, toolpath generation javascript JavaScript / TypeScript translations Translations and i18n changes labels Jun 5, 2026
Rebases the Linux packaging/CI fork onto upstream v02.07.01.57.

2.7.1 natively absorbed most former fork features (alternate_extra_wall,
camera fullscreen, media controls) — those now use the official, more
complete 2.7.1 implementation instead of the fork's pre-release versions.

Kept as fork-only: CI/packaging overlay, Linux build scripts, ccache
build-time isolation, branding, and infrastructure (28 src files).

version base 02.07.00 -> 02.07.01
@BenJule BenJule force-pushed the update-bambu-2.7.1 branch from 7050b0b to 5a866d4 Compare June 5, 2026 18:36
The first 2.7.1 build has no warm deps-cache (2.7.1 changed deps -> new
cache key), so 'Build deps' rebuilds (~30 min) on top of the ~60 min
source compile, exceeding the old 90 min limit. The 2.7.1 compile itself
is clean — it reached [622/682] with zero errors before the timeout cancel.
@BenJule BenJule merged commit d5cb053 into master Jun 5, 2026
5 of 6 checks passed
@BenJule BenJule deleted the update-bambu-2.7.1 branch June 5, 2026 22:06
BenJule added a commit that referenced this pull request Jun 6, 2026
The 2.7.1 update (#476) set 'shared-feature' src files to pure 2.7.1,
which dropped real fork-only patches that 2.7.1 does not provide. Restore
them and fix the platform build regressions Nightly #27 surfaced:

- wxMediaCtrl3.cpp: restore #ifndef BAMBUSTUDIO_NO_AVVIDEODECODER guard.
  Windows-ARM64 excludes AVVideoDecoder (no FFmpeg) but 2.7.1 uses it
  unconditionally -> LNK2001 unresolved external.
- deps/ZLIB 1.2.13 -> 1.3.1: 1.2.13's K&R decls break the macOS 26 SDK
  ('error: expected )' in zError).
- MainFrame.cpp: restore __WXGTK__ deferred-geometry patch — avoids the
  Wayland gtk_window_resize 'width > 0' assertion at startup.
- Preset.cpp: restore parent-preset fallback — load default config instead
  of silently deleting a user preset whose parent is missing.
- cd-nightly.yml: drop BambuStudio_dep_* tarballs from the release
  (cd-release already did; nightly leaked ~800 MB of internal deps).
BenJule added a commit that referenced this pull request Jun 6, 2026
The 2.7.1 update (#476) used pure-2.7.1 versions for shared-feature files,
dropping fork-only patches 2.7.1 does not provide. Nightly #27 surfaced the
build regressions. Restore them and harden the CD publish path:

- wxMediaCtrl3.cpp: restore #ifndef BAMBUSTUDIO_NO_AVVIDEODECODER guard
  (Win-ARM64 LNK2001: AVVideoDecoder excluded there, 2.7.1 uses it).
- deps/ZLIB 1.2.13 -> 1.3.1 (1.2.13 K&R decls break the macOS 26 SDK).
- MainFrame.cpp: restore __WXGTK__ deferred-geometry (Wayland startup assertion).
- Preset.cpp: restore parent-preset fallback (no silent user-preset deletion).
- cd-nightly.yml + cd-release-candidate.yml: drop BambuStudio_dep_* from the
  release (~800 MB; cd-release already did).
- cd-release-candidate.yml: apply the same signed-tag publish fix as #478
  (the local 'git tag -s' + git/refs API returned HTTP 422 'Object does not
  exist' — push the signed tag directly with a two-step API fallback).
BenJule added a commit that referenced this pull request Jun 6, 2026
Closes #481

The `Review dependency changes` job blocks all egress except
`api.github.com:443`, but `actions/checkout` needs `github.com:443` for
its git-fetch → checkout fails on every PR (#476, #480). Adds
`github.com:443` to the allowed-endpoints. Workflow-only change — no
build impact.
BenJule added a commit that referenced this pull request Jun 6, 2026
Closes #479

The 2.7.1 update (#476) used pure-2.7.1 versions for shared-feature
files, which dropped fork-only patches 2.7.1 doesn't have. Nightly #27
surfaced the regressions. This restores them:

| Patch | Fixes |
|---|---|
| wxMediaCtrl3 `BAMBUSTUDIO_NO_AVVIDEODECODER` guard | Windows-ARM64
`LNK2001` (AVVideoDecoder) |
| zlib 1.2.13 → 1.3.1 | macOS 26 SDK build (`zError` K&R) |
| MainFrame `__WXGTK__` deferred geometry | Wayland `gtk_window_resize`
startup assertion |
| Preset parent-preset fallback | no silent deletion of user presets |
| cd-nightly drop `BambuStudio_dep_*` | ~800 MB internal deps leaked
into release |

Debian PR build verifies Linux compiles; macOS + Win-ARM64 verified by
the nightly after merge.
BenJule added a commit that referenced this pull request Jun 6, 2026
…g 21) (#486)

Closes #485

macOS 26 (AppleClang 21) rejects `static constexpr wxMediaState
MEDIASTATE_* = (wxMediaState)N` (cast not constexpr). Switch to `static
inline const` — valid everywhere, restores a fork patch dropped in #476.
Only macOS 26 was affected.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area: build Build system, CMake, scripts area: ci GitHub Actions, CI/CD area: filament Filament profiles and settings area: networking Cloud, MQTT, printer connection area: packaging AppImage, .deb, .rpm, Flatpak area: slicing Slicing engine, toolpath generation area: ui User interface / wxWidgets dependencies Dependency updates javascript JavaScript / TypeScript platform: linux Linux-specific issue platform: windows Windows-specific issue tests Test files and test infrastructure translations Translations and i18n changes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Update fork to BambuLab Studio 2.7.1 (v02.07.01.57)

1 participant