fix(qt5-qtwebkit): make GStreamer MPEG-TS optional - #18313
Conversation
There was a problem hiding this comment.
Pull request overview
Makes QtWebKit’s unused GStreamer MPEG-TS integration optional while retaining general GStreamer audio/video support.
Changes:
- Removes the unavailable MPEG-TS build dependency and patches CMake component discovery.
- Bumps the package release and refreshes generated state.
- Adds matching source and rendered overlay artifacts.
Reviewed changes
Copilot reviewed 5 out of 6 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
base/comps/qt5-qtwebkit/qt5-qtwebkit.comp.toml |
Bumps the manual release. |
base/comps/qt5-qtwebkit/overlays/0001-make-gstreamer-mpegts-optional.overlay.toml |
Defines dependency-removal and patch overlays. |
base/comps/qt5-qtwebkit/overlays/qtwebkit-optional-gstreamer-mpegts.patch |
Removes MPEG-TS from required GStreamer components. |
specs/q/qt5-qtwebkit/qt5-qtwebkit.spec |
Contains the rendered release, dependency, and patch changes. |
specs/q/qt5-qtwebkit/qtwebkit-optional-gstreamer-mpegts.patch |
Contains the rendered patch artifact. |
locks/qt5-qtwebkit.lock |
Refreshes the component input fingerprint. |
|
/azp run |
|
Azure Pipelines: 2 pipeline(s) were filtered out due to trigger conditions. |
tobiasb-ms
left a comment
tobiasb-ms
left a comment
There was a problem hiding this comment.
question(blocking-for-discussion): Is this failing everywhere or only in certain environments (stage 2 prod, for example)? If only certain environments, what is the difference?
| @@ -0,0 +1,13 @@ | |||
| QtWebKit requires the GStreamer MPEG-TS pkg-config component whenever generic | |||
There was a problem hiding this comment.
question(blocking-for-discussion): I see there's no git patch header here. How was this generated? I assume not using git -- should we generate it within a repo instead?
There was a problem hiding this comment.
Good catch. No upstream commit contains this fix, and QtWebKit doesn't provide a way to disable only MPEG-TS. Without this one-line patch, the CMake configuration still requires the unavailable library. I regenerated the patch with git format-patch from the exact alpha4 tag using my name and signoff, etc.
Azure Linux does not ship gstreamer1-plugins-bad-free-devel, so Fedora's pkgconfig(gstreamer-mpegts-1.0) BuildRequires prevents mock from creating QtWebKit buildroots on both architectures. QtWebKit also lists MPEG-TS as a required GStreamer component whenever generic video is enabled, although all MPEG-TS source and linkage is gated by USE_GSTREAMER_MPEGTS. Remove the exact build requirement and make that component optional while preserving the rest of the GStreamer media backend. Bump the manually managed release to 0.96. Signed-off-by: Mitch Zhu <mitchzhu@microsoft.com>
87cb35a to
3f2cc05
Compare
|
/azp run |
|
Azure Pipelines: 2 pipeline(s) were filtered out due to trigger conditions. |
Fixes the QtWebKit Stage 2 buildroot failure caused by the unavailable
pkgconfig(gstreamer-mpegts-1.0)dependency.Azure Linux does not provide
gstreamer1-plugins-bad-free-devel, the package that suppliespkgconfig(gstreamer-mpegts-1.0). QtWebKit nevertheless treats MPEG-TS as a required GStreamer component whenever video support is enabled. That dependency is unnecessary for this build because QtWebKit uses the MPEG-TS source code and libraries only whenUSE_GSTREAMER_MPEGTSis enabled, and that integration is disabled. The fix makes MPEG-TS optional while leaving QtWebKit's general GStreamer audio and video support enabled.Changes:
Validation:
ENABLE_VIDEOandUSE_GSTREAMERstill enabled.QWebPagesmoke test passed.