Skip to content

Commit 2249a9b

Browse files
committed
fix(webkitgtk): drop gstreamer-plugins-bad BR, disable MSE/EME
gstreamer1-plugins-bad-free is not shipped in AZL, so the hard BuildRequires on pkgconfig(gstreamer-plugins-bad-1.0) caused dnf builddep to fail during chroot init. Remove the BR via overlay and pass -DENABLE_MEDIA_SOURCE=OFF / -DENABLE_ENCRYPTED_MEDIA=OFF to both cmake invocations (GTK4 and GTK3) so WebKitGTK does not try to consume gst-plugins-bad headers at configure time. This disables MSE and EME backends in AZL's WebKitGTK build.
1 parent f526821 commit 2249a9b

3 files changed

Lines changed: 23 additions & 5 deletions

File tree

base/comps/webkitgtk/webkitgtk.comp.toml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
# gstreamer1-plugins-bad-free is not shipped in AZL. WebKitGTK only
66
# soft-recommends it for optional codec support; removing the Recommends
77
# prevents package managers from trying to pull in a non-existent package.
8+
# It is also a hard BuildRequires (pkgconfig(gstreamer-plugins-bad-1.0))
9+
# used by WebKitGTK's Media Source Extensions (MSE) and Encrypted Media
10+
# Extensions (EME) backends; remove the BR and disable both features at
11+
# cmake-configure time so the build does not try to consume bad headers.
812

913
[components.webkitgtk]
1014

@@ -15,12 +19,20 @@ tag = "BuildRequires"
1519
value = "pkgconfig(libavif)"
1620

1721
[[components.webkitgtk.overlays]]
18-
description = "Disable avif support in WebKitGTK cmake builds"
22+
description = "Remove gstreamer-plugins-bad-1.0 BuildRequires (gstreamer1-plugins-bad-free not shipped in AZL)"
23+
type = "spec-remove-tag"
24+
tag = "BuildRequires"
25+
value = "pkgconfig(gstreamer-plugins-bad-1.0)"
26+
27+
[[components.webkitgtk.overlays]]
28+
description = "Disable avif, MSE, and EME in WebKitGTK cmake builds (avif/gst-plugins-bad not available in AZL)"
1929
type = "spec-search-replace"
2030
section = "%build"
2131
regex = '%cmake \\'
2232
replacement = '''%cmake \
23-
-DUSE_AVIF=OFF \'''
33+
-DUSE_AVIF=OFF \
34+
-DENABLE_MEDIA_SOURCE=OFF \
35+
-DENABLE_ENCRYPTED_MEDIA=OFF \'''
2436

2537
[[components.webkitgtk.overlays]]
2638
description = "Remove Recommends on gstreamer1-plugins-bad-free from webkitgtk6.0 package — not shipped in AZL"

locks/webkitgtk.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
version = 1
33
import-commit = '1a9da7e82122526bd080d6c83afea2cf5a7d083d'
44
upstream-commit = '1a9da7e82122526bd080d6c83afea2cf5a7d083d'
5-
input-fingerprint = 'sha256:be1846a272a139b429ffe3d470467a4400821eba81b3368a3609f552ebfdb971'
5+
input-fingerprint = 'sha256:f724a08430d888f535b80aecffe0034537512af67375c88f7e771a009e7800af'
66
resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e'

specs/w/webkitgtk/webkitgtk.spec

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
## (rpmautospec version 0.8.3)
33
## RPMAUTOSPEC: autorelease, autochangelog
44
%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
5-
release_number = 4;
5+
release_number = 5;
66
base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
77
print(release_number + base_release_number - 1);
88
}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
@@ -109,7 +109,6 @@ BuildRequires: pkgconfig(gbm)
109109
BuildRequires: pkgconfig(glib-2.0)
110110
BuildRequires: pkgconfig(gobject-introspection-1.0)
111111
BuildRequires: pkgconfig(gstreamer-1.0)
112-
BuildRequires: pkgconfig(gstreamer-plugins-bad-1.0)
113112
BuildRequires: pkgconfig(gstreamer-plugins-base-1.0)
114113
BuildRequires: pkgconfig(gtk+-3.0)
115114
BuildRequires: pkgconfig(gtk4)
@@ -315,6 +314,8 @@ files for developing applications that use JavaScript engine from webkit2gtk-4.1
315314
%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkitgtk-6.0
316315
%cmake \
317316
-DUSE_AVIF=OFF \
317+
-DENABLE_MEDIA_SOURCE=OFF \
318+
-DENABLE_ENCRYPTED_MEDIA=OFF \
318319
-GNinja \
319320
-DPORT=GTK \
320321
-DCMAKE_BUILD_TYPE=Release \
@@ -328,6 +329,8 @@ files for developing applications that use JavaScript engine from webkit2gtk-4.1
328329
%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.1
329330
%cmake \
330331
-DUSE_AVIF=OFF \
332+
-DENABLE_MEDIA_SOURCE=OFF \
333+
-DENABLE_ENCRYPTED_MEDIA=OFF \
331334
-GNinja \
332335
-DPORT=GTK \
333336
-DCMAKE_BUILD_TYPE=Release \
@@ -470,6 +473,9 @@ export NINJA_STATUS="[2/2][%f/%t %es] "
470473

471474
%changelog
472475
## START: Generated by rpmautospec
476+
* Sun May 24 2026 Chris Co <chrco@microsoft.com> - 2.50.5-5
477+
- fix(webkitgtk): drop gstreamer-plugins-bad BR, disable MSE/EME
478+
473479
* Thu May 21 2026 Chris Co <chrco@microsoft.com> - 2.50.5-4
474480
- fix(webkitgtk): remove Recommends on gstreamer1-plugins-bad-free
475481

0 commit comments

Comments
 (0)