Skip to content

obs-websocket: Include the screenshot MIME declaration (unbreak master) - #660

Merged
zackees merged 1 commit into
masterfrom
fix/websocket-mime-include
Oct 14, 2026
Merged

zackees merged 1 commit into
masterfrom
fix/websocket-mime-include

Conversation

@zackees

@zackees zackees commented Oct 14, 2026

Copy link
Copy Markdown
Member

Master doesn't build the websocket plugin since #652: RequestHandler_Sources.cpp:231: 'Utils::ImageFormat' has not been declared, which fails every full build (seen on #658). Fork PR obs-rust/obs-websocket#10 adds the missing #include "../utils/ImageFormat.h"; this bumps the submodule to fork master 547f5ea.

The new pointer descends from the old one (3e46553, checked with merge-base). Fork master also carries the already-merged fork PRs #4 (GetStats with rescaled outputs, #514), #5 (scene counter, #519) and #7 (SourceFilterSettingsChanged, #536).

#652's submodule bump does not compile: RequestHandler_Sources.cpp uses
Utils::ImageFormat::MimeType without including utils/ImageFormat.h, so
every full build fails. Fork PR obs-rust/obs-websocket#10 adds it.

The fork's master also carries the already-merged fork PRs #4 (#514),

Local-Gate: v1 tree=2c043672b59777c9875e71d75f8962a2fdcb2e27 secs=390 lanes=lint:run,rust-test:run,cross:run,tier2-linux:run
Ci-Attestation: {"at":1791938027,"gate":"rust/all/fmt","host":"linux-x86_64","key":"0081647f2e1e319399eadebe73c4c68f82d82cf39f79ff14c6ce573cf603b987","lane":"lint","parents":["08483ba1e85e1fd3b79c46a9f9924a968b31a47c"],"secs":44,"stamp":"d8f293eff24644b378fcc7f31784e730","tree":"2c043672b59777c9875e71d75f8962a2fdcb2e27","v":1,"via":"run"}
Ci-Attestation: {"at":1791938027,"gate":"rust/x86_64-unknown-linux-gnu/clippy","host":"linux-x86_64","key":"0081647f2e1e319399eadebe73c4c68f82d82cf39f79ff14c6ce573cf603b987","lane":"lint","parents":["08483ba1e85e1fd3b79c46a9f9924a968b31a47c"],"secs":44,"stamp":"f941a2368ea561c6cc1dd404c2254082","tree":"2c043672b59777c9875e71d75f8962a2fdcb2e27","v":1,"via":"run"}
Ci-Attestation: {"at":1791938027,"gate":"rust/x86_64-unknown-linux-gnu/test","host":"linux-x86_64","key":"b13eada16907902b0fe80a2fe16e3a0b69505f862a9c2cf24825f5001a0fb44e","lane":"rust-test","parents":["08483ba1e85e1fd3b79c46a9f9924a968b31a47c"],"secs":110,"stamp":"90332b84a5900768164f7d01a143f8d9","tree":"2c043672b59777c9875e71d75f8962a2fdcb2e27","v":1,"via":"run"}
Ci-Attestation: {"at":1791938027,"gate":"rust/x86_64-pc-windows-msvc/clippy","host":"linux-x86_64","key":"e53f213473aa96a3b2882f11a7db911cb5cf490f619ab3ed4a39d7155ed11370","lane":"cross","parents":["08483ba1e85e1fd3b79c46a9f9924a968b31a47c"],"secs":73,"stamp":"e3d99bf3954d09c8d88d4448fb238619","tree":"2c043672b59777c9875e71d75f8962a2fdcb2e27","v":1,"via":"run"}
Ci-Attestation: {"at":1791938027,"gate":"rust/x86_64-pc-windows-msvc/dylint","host":"linux-x86_64","key":"e53f213473aa96a3b2882f11a7db911cb5cf490f619ab3ed4a39d7155ed11370","lane":"cross","parents":["08483ba1e85e1fd3b79c46a9f9924a968b31a47c"],"secs":73,"stamp":"ba366c0508bf9aaa859018ca425f4155","tree":"2c043672b59777c9875e71d75f8962a2fdcb2e27","v":1,"via":"run"}
Ci-Attestation: {"at":1791938027,"gate":"rust/aarch64-apple-darwin/clippy","host":"linux-x86_64","key":"e53f213473aa96a3b2882f11a7db911cb5cf490f619ab3ed4a39d7155ed11370","lane":"cross","parents":["08483ba1e85e1fd3b79c46a9f9924a968b31a47c"],"secs":73,"stamp":"b24b299806567a535ad007d4d651ba6e","tree":"2c043672b59777c9875e71d75f8962a2fdcb2e27","v":1,"via":"run"}
Ci-Attestation: {"at":1791938027,"gate":"rust/aarch64-apple-darwin/dylint","host":"linux-x86_64","key":"e53f213473aa96a3b2882f11a7db911cb5cf490f619ab3ed4a39d7155ed11370","lane":"cross","parents":["08483ba1e85e1fd3b79c46a9f9924a968b31a47c"],"secs":73,"stamp":"bcdc3176b3f88ddf85a00b2b33e3f740","tree":"2c043672b59777c9875e71d75f8962a2fdcb2e27","v":1,"via":"run"}
Ci-Attestation: {"at":1791938027,"gate":"rust/x86_64-apple-darwin/clippy","host":"linux-x86_64","key":"e53f213473aa96a3b2882f11a7db911cb5cf490f619ab3ed4a39d7155ed11370","lane":"cross","parents":["08483ba1e85e1fd3b79c46a9f9924a968b31a47c"],"secs":73,"stamp":"0a29c50a3e9953e8b80c58d25a705081","tree":"2c043672b59777c9875e71d75f8962a2fdcb2e27","v":1,"via":"run"}
Ci-Attestation: {"at":1791938027,"gate":"rust/x86_64-apple-darwin/dylint","host":"linux-x86_64","key":"e53f213473aa96a3b2882f11a7db911cb5cf490f619ab3ed4a39d7155ed11370","lane":"cross","parents":["08483ba1e85e1fd3b79c46a9f9924a968b31a47c"],"secs":73,"stamp":"7df3b007f64dbc45d235c8b685613569","tree":"2c043672b59777c9875e71d75f8962a2fdcb2e27","v":1,"via":"run"}
Ci-Attestation: {"at":1791938027,"gate":"cpp/linux-x64/tier2","host":"linux-x86_64","key":"e892aee0e6c73f12c54e4b950ce1a04d39e07265b66aec3f515500b36ff4f4e2","lane":"tier2-linux","parents":["08483ba1e85e1fd3b79c46a9f9924a968b31a47c"],"secs":163,"stamp":"ea01d6463104759ff9cf3a70a9074f33","tree":"2c043672b59777c9875e71d75f8962a2fdcb2e27","v":1,"via":"run"}
#5 (#519) and #7 (#536).
@zackees zackees added the ci-full Run every CI job on this PR, including the release-gating OBS app builds and Flatpak label Oct 14, 2026
@zackees

zackees commented Oct 14, 2026

Copy link
Copy Markdown
Member Author

Consolidating the duplicate integration here: my claimed #659 work produced fork PR obs-rust/obs-websocket#10 and draft parent #661, but this earlier parent already has full native builds running. I am superseding #661 with this PR and carrying its evidence here. The pin 547f5ea has an identical tree to tested candidate 175a666. My mandatory lint/unit/attestation passed all four lanes in 438 seconds at ebf72b1; CTest OFF/ON each had zero failures out of 191 with 15 environment-dependent skips, and 1766 identical exports. Five unchanged MIME helper tests pass against the fork checkout; coordinated review is clean, including all three other merged fork fixes. Actual full caller compilation GREEN remains required: local helper/unit tests and the fork merge do not establish it. The #629 candidate will additionally exercise saved-profile startup and real PNG/JPEG screenshot requests on native ARM64. Please keep this integration unmerged until its required native checks finish successfully.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ci-full Run every CI job on this PR, including the release-gating OBS app builds and Flatpak

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant