-
Notifications
You must be signed in to change notification settings - Fork 639
fix(libavif): remove libavif and disable avif support in all dependent packages #17311
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.
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
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
449cb08
fix(efl): disable libavif dependency
binujp 0fe8f8c
fix(gd): disable libavif dependency
binujp 81d57fd
fix(SDL2_image): disable libavif dependency
binujp 8e269bd
fix(SDL3_image): disable libavif dependency and pin to f43
binujp 0062688
fix(opencv): disable libavif dependency
binujp d3c0a15
fix(webkitgtk): disable libavif dependency
binujp a44be90
fix(kf6-kimageformats): disable libavif dependency
binujp bbeb381
fix(libavif): remove libavif component from distro
binujp File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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' |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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' | ||
|
|
||
| [[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' | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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"] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,14 @@ | ||
| [components.gd] | ||
| # Release: 19%{?prever}%{?short}%{?dist} | ||
|
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}" | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 \''' |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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' |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 1 addition & 2 deletions
3
specs/l/libavif/libavif.azl.macros → specs/e/efl/efl.azl.macros
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.