Skip to content

fix(qt5-qtwebkit): make GStreamer MPEG-TS optional #18313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tobiasb-ms merged 1 commit into from
Aug 5, 2026
Merged

fix(qt5-qtwebkit): make GStreamer MPEG-TS optional #18313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions base/comps/qt5-qtwebkit/overlays/0001-make-gstreamer-mpegts-optional.overlay.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Fedora ships gstreamer1-plugins-bad-free-devel, which provides the MPEG-TS
# API. Azure Linux omits that package. QtWebKit's MPEG-TS source and linkage
# are already gated by USE_GSTREAMER_MPEGTS, which is disabled by default.
[metadata]
category = "azl-platform-adaptation"
upstream-status = "upstreamable"

[[overlays]]
description = "Remove unavailable GStreamer MPEG-TS build dependency"
type = "spec-remove-tag"
tag = "BuildRequires"
value = "pkgconfig(gstreamer-mpegts-1.0)"

[[overlays]]
description = "Do not require the disabled GStreamer MPEG-TS integration"
type = "patch-add"
source = "qtwebkit-optional-gstreamer-mpegts.patch"
25 changes: 25 additions & 0 deletions base/comps/qt5-qtwebkit/overlays/qtwebkit-optional-gstreamer-mpegts.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From e76e13acac38658e132f1a03383869b2530151c1 Mon Sep 17 00:00:00 2001
From: Mitch Zhu <mitchzhu@microsoft.com>
Date: Tue, 4 Aug 2026 20:57:42 +0000
Subject: [PATCH] cmake: make GStreamer MPEG-TS optional for Qt

The Qt port requires the MPEG-TS component whenever video is enabled,
even though MPEG-TS sources and linkage are guarded by
USE_GSTREAMER_MPEGTS.

Do not require MPEG-TS for generic GStreamer video support.

Signed-off-by: Mitch Zhu <mitchzhu@microsoft.com>
---
Source/cmake/OptionsQt.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake
index 1ee60b77710..b9c7ab39861 100644
--- a/Source/cmake/OptionsQt.cmake
+++ b/Source/cmake/OptionsQt.cmake
@@ -804,3 +804,3 @@ if (USE_GSTREAMER)
if (ENABLE_VIDEO)
- list(APPEND GSTREAMER_COMPONENTS video mpegts tag gl)
+ list(APPEND GSTREAMER_COMPONENTS video tag gl)
endif ()
8 changes: 7 additions & 1 deletion base/comps/qt5-qtwebkit/qt5-qtwebkit.comp.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
[components.qt5-qtwebkit]
# Release: 0.95%{?prerel}%{?dist}
# Release: 0.96%{?prerel}%{?dist}
release = { calculation = "manual" }

[[components.qt5-qtwebkit.overlays]]
description = "Bump release for the GStreamer MPEG-TS dependency fix"
type = "spec-update-tag"
tag = "Release"
value = "0.96%{?prerel}%{?dist}"
2 changes: 1 addition & 1 deletion locks/qt5-qtwebkit.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
version = 1
import-commit = '2058f51438cbeb0d2b37e63efcf6e6fad89560a7'
upstream-commit = '2058f51438cbeb0d2b37e63efcf6e6fad89560a7'
input-fingerprint = 'sha256:8f9e1e532719f18c7e40af5b30a1fbb138c3d098a26c04b5f18648bd89809945'
input-fingerprint = 'sha256:698497d4d968a0c789fa958b6ae554c270a4e831fdf0e0c22c33f8c127d31cbe'
resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e'
4 changes: 2 additions & 2 deletions specs/q/qt5-qtwebkit/qt5-qtwebkit.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

Name: qt5-%{qt_module}
Version: 5.212.0
Release: 0.95%{?prerel}%{?dist}
Release: 0.96%{?prerel}%{?dist}
Summary: Qt5 - QtWebKit components

License: LGPL-2.0-only AND BSD-3-Clause
Expand Down Expand Up @@ -67,7 +67,6 @@ BuildRequires: pkgconfig(xrender)
BuildRequires: pkgconfig(libxslt)
BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(gstreamer-gl-1.0)
BuildRequires: pkgconfig(gstreamer-mpegts-1.0)
BuildRequires: perl-generators
BuildRequires: perl(File::Copy)
BuildRequires: python3
Expand Down Expand Up @@ -102,6 +101,7 @@ Provides: bundled(brotli)
Provides: bundled(woff2)


Patch12: qtwebkit-optional-gstreamer-mpegts.patch
%description
%{summary}

Expand Down
25 changes: 25 additions & 0 deletions specs/q/qt5-qtwebkit/qtwebkit-optional-gstreamer-mpegts.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From e76e13acac38658e132f1a03383869b2530151c1 Mon Sep 17 00:00:00 2001
From: Mitch Zhu <mitchzhu@microsoft.com>
Date: Tue, 4 Aug 2026 20:57:42 +0000
Subject: [PATCH] cmake: make GStreamer MPEG-TS optional for Qt

The Qt port requires the MPEG-TS component whenever video is enabled,
even though MPEG-TS sources and linkage are guarded by
USE_GSTREAMER_MPEGTS.

Do not require MPEG-TS for generic GStreamer video support.

Signed-off-by: Mitch Zhu <mitchzhu@microsoft.com>
---
Source/cmake/OptionsQt.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake
index 1ee60b77710..b9c7ab39861 100644
--- a/Source/cmake/OptionsQt.cmake
+++ b/Source/cmake/OptionsQt.cmake
@@ -804,3 +804,3 @@ if (USE_GSTREAMER)
if (ENABLE_VIDEO)
- list(APPEND GSTREAMER_COMPONENTS video mpegts tag gl)
+ list(APPEND GSTREAMER_COMPONENTS video tag gl)
endif ()
Loading