Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion base/comps/components-publish-channels.toml
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,6 @@ components = [
"cyrus-imapd",
"cyrus-sasl",
"Cython",
"dav1d",
Comment thread
trungams marked this conversation as resolved.
"dbus",
"dbus-broker",
"dbus-python",
Expand Down
4 changes: 0 additions & 4 deletions base/comps/components.toml
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,6 @@ includes = ["**/*.comp.toml", "component-check-disablement.toml", "component-min
[components.cyrus-imapd]
[components.cyrus-sasl]
[components.date]
[components.dav1d]
[components.dblatex]
[components.dbus]
[components.dbus-broker]
Expand Down Expand Up @@ -1899,7 +1898,6 @@ includes = ["**/*.comp.toml", "component-check-disablement.toml", "component-min
[components.librevenge]
[components.librhsm]
[components.librist]
[components.librsvg2]
[components.librttopo]
[components.libsamplerate]
[components.libsass]
Expand Down Expand Up @@ -5134,8 +5132,6 @@ includes = ["**/*.comp.toml", "component-check-disablement.toml", "component-min
[components.rust-databake]
[components.rust-databake-derive]
[components.rust-datatest-stable]
[components.rust-dav1d]
[components.rust-dav1d-sys]
[components.rust-dbl]
[components.rust-dbus]
[components.rust-dbus-tree]
Expand Down
16 changes: 14 additions & 2 deletions base/comps/libavif/libavif.comp.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
# Disable the optional `rav1e` build conditional. Azure Linux does not ship
# the rust-rav1e component, so its `pkgconfig(rav1e)` BuildRequires and the
# `-DAVIF_CODEC_RAV1E=SYSTEM` CMake flag cannot be satisfied. libavif still
# builds with the aom, dav1d and SVT-AV1 codecs enabled.
# `-DAVIF_CODEC_RAV1E=SYSTEM` CMake flag cannot be satisfied.
[components.libavif]
build.without = ["rav1e"]

[[components.libavif.overlays]]
description = "Disable dav1d decoder - use aom instead"
type = "spec-search-replace"
Comment thread
trungams marked this conversation as resolved.
section = "%build"
regex = '-DAVIF_CODEC_DAV1D=SYSTEM'
replacement = '-DAVIF_CODEC_DAV1D=OFF'

[[components.libavif.overlays]]
description = "Remove dav1d BuildRequires"
type = "spec-remove-tag"
tag = "BuildRequires"
value = "pkgconfig(dav1d)"
8 changes: 8 additions & 0 deletions base/comps/librsvg2/librsvg2.comp.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[components.librsvg2]

[[components.librsvg2.overlays]]
description = "Disable AVIF support to remove dav1d dependency"
type = "spec-search-replace"
Comment thread
trungams marked this conversation as resolved.
section = "%build"
regex = '%meson %\{\?rhel:-Davif=disabled\} -Dpixbuf-loader=disabled'
replacement = '%meson -Davif=disabled -Dpixbuf-loader=disabled'
6 changes: 0 additions & 6 deletions locks/dav1d.lock

This file was deleted.

2 changes: 1 addition & 1 deletion locks/libavif.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
version = 1
import-commit = 'ed92deeea6124f2c6375c01107cc2ec761614171'
upstream-commit = 'ed92deeea6124f2c6375c01107cc2ec761614171'
input-fingerprint = 'sha256:a4014e49ce9027f98145a33b029ea27605b697533362b049e75ae20b8c5a424b'
input-fingerprint = 'sha256:e36847269613d98b4b412d8fdffc6b291f0633a606ab7d96ce6d5ef32a885811'
resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e'
2 changes: 1 addition & 1 deletion locks/librsvg2.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
version = 1
import-commit = '020553e6ac8882267f982a33a68ec3c139f02457'
upstream-commit = '020553e6ac8882267f982a33a68ec3c139f02457'
input-fingerprint = 'sha256:e25bccd92ea3466dca535638d61c9083c9b4d7966519578469c9cfecbb31626a'
input-fingerprint = 'sha256:2192e6a2924b3dd4dd83180fdb69c4e463dbaac7bb948a61badde02c853317cb'
resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e'
6 changes: 0 additions & 6 deletions locks/rust-dav1d-sys.lock

This file was deleted.

6 changes: 0 additions & 6 deletions locks/rust-dav1d.lock

This file was deleted.

225 changes: 0 additions & 225 deletions specs/d/dav1d/dav1d.spec

This file was deleted.

1 change: 0 additions & 1 deletion specs/d/dav1d/sources

This file was deleted.

8 changes: 5 additions & 3 deletions specs/l/libavif/libavif.spec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
## (rpmautospec version 0.8.3)
## RPMAUTOSPEC: autorelease, autochangelog
%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
release_number = 4;
release_number = 5;
base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
print(release_number + base_release_number - 1);
}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
Expand Down Expand Up @@ -58,7 +58,6 @@ BuildRequires: gcc-c++
%{?with_check:%{?with_gtest:BuildRequires: gtest-devel}}
BuildRequires: nasm
%{?with_aom:BuildRequires: pkgconfig(aom)}
BuildRequires: pkgconfig(dav1d)
BuildRequires: pkgconfig(libjpeg)
BuildRequires: pkgconfig(libpng)
BuildRequires: pkgconfig(libxml-2.0)
Expand Down Expand Up @@ -104,7 +103,7 @@ tar --strip-components=1 -xvf %{S:1} -C ext/libargparse
-DAVIF_BUILD_APPS=1 \
-DAVIF_BUILD_GDK_PIXBUF=1 \
%{?with_aom:-DAVIF_CODEC_AOM=SYSTEM} \
-DAVIF_CODEC_DAV1D=SYSTEM \
-DAVIF_CODEC_DAV1D=OFF \
%{?with_rav1e:-DAVIF_CODEC_RAV1E=SYSTEM} \
%{?with_svt:-DAVIF_CODEC_SVT=SYSTEM} \
-DAVIF_LIBXML2=SYSTEM
Expand Down Expand Up @@ -138,6 +137,9 @@ tar --strip-components=1 -xvf %{S:1} -C ext/libargparse

%changelog
## START: Generated by rpmautospec
* Mon May 18 2026 Thien Trung Vuong <tvuong@microsoft.com> - 1.3.0-5
- fix(libavif): switch AV1 decoder from dav1d to aom

* Sun May 17 2026 Chris Co <chrco@microsoft.com> - 1.3.0-4
- feat(libavif): disable rav1e codec

Expand Down
7 changes: 5 additions & 2 deletions specs/l/librsvg2/librsvg2.spec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
## (rpmautospec version 0.8.3)
## RPMAUTOSPEC: autorelease, autochangelog
%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
release_number = 6;
release_number = 7;
base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
print(release_number + base_release_number - 1);
}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
Expand Down Expand Up @@ -149,7 +149,7 @@ sed -i 's/, "--locked"//g' meson/cargo_wrapper.py
%endif

%build
%meson %{?rhel:-Davif=disabled} -Dpixbuf-loader=disabled
%meson -Davif=disabled -Dpixbuf-loader=disabled
%meson_build

%cargo_license_summary
Expand Down Expand Up @@ -198,6 +198,9 @@ rm -f %{buildroot}%{_pkgdocdir}/COMPILING.md

%changelog
## START: Generated by rpmautospec
* Mon May 18 2026 Thien Trung Vuong <tvuong@microsoft.com> - 2.61.0-7
- fix(librsvg2): disable AVIF support to remove dav1d dependency

* Thu Apr 30 2026 Daniel McIlvaney <damcilva@microsoft.com> - 2.61.0-6
- feat: introduce deterministic commit resolution via Azure Linux lock file

Expand Down
Loading
Loading