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
18 changes: 18 additions & 0 deletions base/comps/SDL2_image/SDL2_image.comp.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# AZL does not ship libavif — disable avif image loading support.
# SDL2_image has no bcond for avif; remove the BR and change configure
# flag from --disable-avif-shared to --disable-avif.

[components.SDL2_image]

[[components.SDL2_image.overlays]]
description = "Remove libavif-devel BuildRequires (libavif not available in AZL)"
type = "spec-remove-tag"
tag = "BuildRequires"
value = "libavif-devel"

[[components.SDL2_image.overlays]]
description = "Disable avif support entirely instead of just disabling shared linking"
type = "spec-search-replace"
section = "%build"
regex = '--disable-avif-shared'
replacement = '--disable-avif'
39 changes: 39 additions & 0 deletions base/comps/SDL3_image/SDL3_image.comp.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# Pin to f43 commit that adds BuildRequires: libpng-static.
# libpng switched to cmake-native config which unconditionally declares a
# PNG::png_static target referencing libpng16.a — cmake fails at configure
# time if that file is absent. The pinned commit already carries the fix
# upstream (BuildRequires: libpng-static), so no additional overlay is needed.
#
# AZL does not ship libavif — disable avif image loading support.
# SDL3_image uses cmake with explicit AVIF flags; remove the BR and
# turn the flags OFF.

[components.SDL3_image]
spec = { type = "upstream", upstream-commit = "6b9cdf9cf3e3798c9443bf425017b152d78b9d65" }

[[components.SDL3_image.overlays]]
description = "Remove cmake(libavif) BuildRequires (libavif not available in AZL)"
type = "spec-remove-tag"
tag = "BuildRequires"
value = "cmake(libavif)"

[[components.SDL3_image.overlays]]
description = "Disable avif support in cmake build flags"
type = "spec-search-replace"
section = "%build"
regex = '-DSDLIMAGE_AVIF=ON'
replacement = '-DSDLIMAGE_AVIF=OFF'
Comment thread
binujp marked this conversation as resolved.

[[components.SDL3_image.overlays]]
description = "Disable avif save support in cmake build flags"
type = "spec-search-replace"
section = "%build"
regex = '-DSDLIMAGE_AVIF_SAVE=ON'
replacement = '-DSDLIMAGE_AVIF_SAVE=OFF'

[[components.SDL3_image.overlays]]
description = "Disable avif shared linking in cmake build flags"
type = "spec-search-replace"
section = "%build"
regex = '-DSDLIMAGE_AVIF_SHARED=ON'
replacement = '-DSDLIMAGE_AVIF_SHARED=OFF'
1 change: 0 additions & 1 deletion base/comps/components-publish-channels.toml
Original file line number Diff line number Diff line change
Expand Up @@ -762,7 +762,6 @@ components = [
"libasyncns",
"libatasmart",
"libatomic_ops",
"libavif",
"libb2",
Comment thread
binujp marked this conversation as resolved.
"libblkio",
"libblockdev",
Expand Down
4 changes: 0 additions & 4 deletions base/comps/components.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,7 @@ includes = ["**/*.comp.toml", "component-check-disablement.toml", "component-min
[components.PyYAML]
[components.R]
[components.R-rpm-macros]
[components.SDL2_image]
[components.SDL3]
Comment thread
binujp marked this conversation as resolved.
[components.SDL3_image]
[components.SDL3_ttf]
[components.SDL_gfx]
[components.SFCGAL]
Expand Down Expand Up @@ -382,7 +380,6 @@ includes = ["**/*.comp.toml", "component-check-disablement.toml", "component-min
[components.efibootmgr]
[components.efitools]
[components.efivar]
[components.efl]
[components.egl-wayland]
[components.eglexternalplatform]
[components.eigen3]
Expand Down Expand Up @@ -6920,7 +6917,6 @@ includes = ["**/*.comp.toml", "component-check-disablement.toml", "component-min
[components.wayland]
[components.wayland-protocols]
[components.web-assets]
[components.webkitgtk]
[components.websocketpp]
[components.weldr-client]
[components.wget1]
Expand Down
4 changes: 4 additions & 0 deletions base/comps/efl/efl.comp.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# AZL does not ship libavif — disable avif evas loader.
# The avif bcond defaults ON in Fedora builds.
[components.efl]
build.without = ["avif"]
11 changes: 11 additions & 0 deletions base/comps/gd/gd.comp.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
[components.gd]
# Release: 19%{?prever}%{?short}%{?dist}
Comment thread
binujp marked this conversation as resolved.
release = { calculation = "manual" }

# AZL does not ship libavif — disable avif support.
# The avif bcond defaults ON via %bcond_without on Fedora.
build.without = ["avif"]

# Bump release for avif removal rebuild.
[[components.gd.overlays]]
description = "Bump release for avif removal rebuild"
type = "spec-set-tag"
tag = "Release"
value = "20%{?prever}%{?short}%{?dist}"
9 changes: 9 additions & 0 deletions base/comps/kf6-kimageformats/kf6-kimageformats.comp.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,12 @@ type = "spec-search-replace"
section = "%build"
regex = '-DKIMAGEFORMATS_HEIF:BOOL=ON'
replacement = '-DKIMAGEFORMATS_HEIF:BOOL=OFF'

# AZL does not ship libavif — remove the cmake(libavif) BR so the avif
# plugin is not discovered or built.

[[components.kf6-kimageformats.overlays]]
description = "Remove libavif BuildRequires (libavif not available in AZL)"
type = "spec-remove-tag"
tag = "BuildRequires"
value = "cmake(libavif)"
21 changes: 0 additions & 21 deletions base/comps/libavif/libavif.comp.toml

This file was deleted.

17 changes: 17 additions & 0 deletions base/comps/opencv/opencv.comp.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,23 @@
[components.opencv.build]
without = ["openni", "ffmpeg", "xine"]

# AZL does not ship libavif — disable avif support in imgcodecs.
# No bcond exists; need to remove the BR and pass -DWITH_AVIF=OFF.

[[components.opencv.overlays]]
description = "Remove libavif BuildRequires (libavif not available in AZL)"
type = "spec-remove-tag"
tag = "BuildRequires"
value = "pkgconfig(libavif)"

[[components.opencv.overlays]]
description = "Disable avif support in opencv imgcodecs"
type = "spec-search-replace"
section = "%build"
regex = '%cmake \\'
replacement = '''%cmake \
-DWITH_AVIF=OFF \'''
Comment thread
binujp marked this conversation as resolved.

# CVE-2025-53644 patch targets bundled 3rdparty/openjpeg, which Fedora's spec
# deletes during %prep (it uses system openjpeg2-devel instead). The patch
# can't find the file and fails. Remove both the patch declaration and its
Expand Down
19 changes: 19 additions & 0 deletions base/comps/webkitgtk/webkitgtk.comp.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# AZL does not ship libavif — disable avif support in WebKitGTK.
# No bcond exists; remove the BR and pass -DUSE_AVIF=OFF to cmake.
# WebKitGTK has two cmake builds (GTK4 + GTK3); the flag applies globally.

[components.webkitgtk]

[[components.webkitgtk.overlays]]
description = "Remove libavif BuildRequires (libavif not available in AZL)"
type = "spec-remove-tag"
tag = "BuildRequires"
value = "pkgconfig(libavif)"

[[components.webkitgtk.overlays]]
description = "Disable avif support in WebKitGTK cmake builds"
type = "spec-search-replace"
section = "%build"
regex = '%cmake \\'
replacement = '''%cmake \
-DUSE_AVIF=OFF \'''
2 changes: 1 addition & 1 deletion locks/SDL2_image.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
version = 1
import-commit = 'fc0a076bec59bb9233d396611d4352467435d528'
upstream-commit = 'fc0a076bec59bb9233d396611d4352467435d528'
input-fingerprint = 'sha256:e3f31440d2c22749c5d3b401b36c85456e696913f4e555fa24bcbb00527a8e3b'
input-fingerprint = 'sha256:893525b67b85e6e6a6ad5fae4c22a8945e605ce0f830636179997129fc546849'
resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e'
6 changes: 3 additions & 3 deletions locks/SDL3_image.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Managed by azldev component update. Do not edit manually.
version = 1
import-commit = '54bb0af5d1b7aad8c987dc329fe4f0ce2aaedcba'
upstream-commit = '54bb0af5d1b7aad8c987dc329fe4f0ce2aaedcba'
input-fingerprint = 'sha256:0c5f8859f5f74bcb5fa191dc56d355a14a8ca3a520923a9787b2cc854c047b3a'
resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e'
upstream-commit = '6b9cdf9cf3e3798c9443bf425017b152d78b9d65'
input-fingerprint = 'sha256:6a9fb1000a965bff47f9c01e267e2d5a5878db35ce0ec20bace5296dd89036ae'
resolution-input-hash = 'sha256:72856115f94676b0214e5121711e9d870865ee16cc5d327eee9d9b1de5292d85'
2 changes: 1 addition & 1 deletion locks/efl.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
version = 1
import-commit = '44ef2d3be0ad96eb0fbae2f96b03fd1c174a4771'
upstream-commit = '44ef2d3be0ad96eb0fbae2f96b03fd1c174a4771'
input-fingerprint = 'sha256:2efba54b73d6ae47aec9def52ecbfd955b975adbc5921cfe2a55839fbcb8b03b'
input-fingerprint = 'sha256:662caeb52535ca46e9e1b0981630c566032589f7dba340a58e6cdaa0de8e5b06'
resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e'
2 changes: 1 addition & 1 deletion locks/gd.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
version = 1
import-commit = 'a641c09bbc2be46de2bf3b35d4603c694e638aef'
upstream-commit = 'a641c09bbc2be46de2bf3b35d4603c694e638aef'
input-fingerprint = 'sha256:cb5aa38d315c59b5992a97fba835b0932680ce602dcac4ed93d42649866c20a0'
input-fingerprint = 'sha256:09f4724217e06f4c0e025d11b08cde68e9a8212f4100dd08efb96590f1ac415e'
resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e'
2 changes: 1 addition & 1 deletion locks/kf6-kimageformats.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
version = 1
import-commit = '39c1d26d4d1105d66769f236625b74a1fe12ebdd'
upstream-commit = '39c1d26d4d1105d66769f236625b74a1fe12ebdd'
input-fingerprint = 'sha256:594f1bca7bfbe7d945c286af95d68bab1c6d065a597457bd85f1045332ef3f41'
input-fingerprint = 'sha256:a0aac027798435417e272c2a89de6599d2b0021d91461679e496e978d328aa49'
resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e'
6 changes: 0 additions & 6 deletions locks/libavif.lock

This file was deleted.

2 changes: 1 addition & 1 deletion locks/opencv.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
version = 1
import-commit = 'f7431cfb4d366253f2ed916211e43019bee2a846'
upstream-commit = 'f7431cfb4d366253f2ed916211e43019bee2a846'
input-fingerprint = 'sha256:b89b56e90714621c1d0d8861d3eef60a9d9d84a192862ecfb81f6d69b7eddadb'
input-fingerprint = 'sha256:f174b51b88d8fd84ff7a1fb26fcc99577945ee1a727c1bdafda87af7a39b9203'
resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e'
2 changes: 1 addition & 1 deletion locks/webkitgtk.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
version = 1
import-commit = '1a9da7e82122526bd080d6c83afea2cf5a7d083d'
upstream-commit = '1a9da7e82122526bd080d6c83afea2cf5a7d083d'
input-fingerprint = 'sha256:930556af5f2619c614452109a86b43e18a814d6ff0fdba52f46f84bb87726b09'
input-fingerprint = 'sha256:317897f186ffafe2215860fb9797ec5d73ea0791beabb2dafa54456d036577c1'
resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e'
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# Macros file automatically generated by azldev.
# Do not edit manually; changes will be overwritten.
%_without_rav1e 1
%_without_svt 1
%_without_avif 1
6 changes: 5 additions & 1 deletion specs/e/efl/efl.spec
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# This spec file has been modified by azldev to include build configuration overlays.
# Do not edit manually; changes may be overwritten.

# All Azure Linux specs with overlays include this macro file, irrespective of whether new macros have been added.
%{load:%{_sourcedir}/efl.azl.macros}

%global has_luajit 1

%ifarch ppc64le s390x riscv64
Expand All @@ -17,12 +20,13 @@

Name: efl
Version: 1.28.1
Release: 3%{?dist}
Release: 4%{?dist}
Summary: Collection of Enlightenment libraries
# Automatically converted from old format: BSD and LGPLv2+ and GPLv2 and zlib - review is highly recommended.
License: LicenseRef-Callaway-BSD AND LicenseRef-Callaway-LGPLv2+ AND GPL-2.0-only AND Zlib
URL: http://enlightenment.org/
Source0: http://download.enlightenment.org/rel/libs/efl/efl-%{version}.tar.xz
Source9999: efl.azl.macros
# This is hacky, but it gets us building in rawhide again.
# Upstream efl probably needs to rework how they use check in their C tests
Patch1: efl-1.25.0-check-fix.patch
Expand Down
3 changes: 3 additions & 0 deletions specs/g/gd/gd.azl.macros
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Macros file automatically generated by azldev.
# Do not edit manually; changes will be overwritten.
%_without_avif 1
6 changes: 5 additions & 1 deletion specs/g/gd/gd.spec
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# This spec file has been modified by azldev to include build configuration overlays.
# Do not edit manually; changes may be overwritten.

# All Azure Linux specs with overlays include this macro file, irrespective of whether new macros have been added.
%{load:%{_sourcedir}/gd.azl.macros}

%if 0%{?rhel}
%bcond_with liq
%bcond_with raqm
Expand All @@ -21,7 +24,7 @@
Summary: A graphics library for quick creation of PNG or JPEG images
Name: gd
Version: 2.3.3
Release: 19%{?prever}%{?short}%{?dist}
Release: 20%{?prever}%{?short}%{?dist}
License: GD
URL: http://libgd.github.io/
%if 0%{?commit:1}
Expand All @@ -31,6 +34,7 @@ Source0: libgd-%{version}-%{commit}.tgz
%else
Source0: https://github.com/libgd/libgd/releases/download/gd-%{version}/libgd-%{version}.tar.xz
%endif
Source9999: gd.azl.macros

# Needed by PHP see https://github.com/libgd/libgd/pull/766
Patch0: libgd-flip.patch
Expand Down
3 changes: 1 addition & 2 deletions specs/k/kf6-kimageformats/kf6-kimageformats.spec
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

Name: kf6-%{framework}
Version: 6.23.0
Release: 4%{?dist}
Release: 5%{?dist}
Summary: KDE Frameworks 6 Tier 1 addon with additional image plugins for QtGui

License: LGPLv2+
Expand All @@ -26,7 +26,6 @@ BuildRequires: cmake(KF6Archive)
BuildRequires: cmake(Qt6PrintSupport)
BuildRequires: pkgconfig(cups)
BuildRequires: cmake(OpenEXR)
BuildRequires: cmake(libavif)
%if !((0%{?fedora} && 0%{?fedora} < 41) || (0%{?rhel} && 0%{?rhel} < 10))
BuildRequires: pkgconfig(libjxl) >= 0.9.4
BuildRequires: pkgconfig(libjxl_threads) >= 0.9.4
Expand Down
Loading
Loading