From d498adfc691b97b2916c0204238ad8e325eb1f97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Mon, 22 Nov 2021 00:59:42 +0100 Subject: [PATCH 01/40] Rebuild (jpegxl) From eec59769aaff5a35582fce54259905cadbf39be6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Fri, 17 Dec 2021 15:31:13 +0100 Subject: [PATCH 02/40] Remove old source archive --- sources | 1 - 1 file changed, 1 deletion(-) diff --git a/sources b/sources index d7a96e7..22ed1c8 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ SHA512 (aom-287164d.tar.gz) = f4681f2ec0292baa8862992c9dd875e17189de3880275745fdd2a6bc8ec3130701beb60036c3f7f23d0241cb89dec04af791b220c032a2d23a397e0854e47d39 -SHA512 (aom-ae2be80.tar.gz) = f8bebe9e23bee99c2c76093bd6ee2c0eb2d99420aa768bb87820051fa6990ee392a29e36c837252bfa2811c21d6e97a72245820bc182ca9398e23a2316d9d682 From 2319ca1c90ea2d2db23dd1d0166659f9e1fd38d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Fri, 17 Dec 2021 18:45:33 +0100 Subject: [PATCH 03/40] Adapt for EPEL9 --- aom.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aom.spec b/aom.spec index bddab7b..929b400 100644 --- a/aom.spec +++ b/aom.spec @@ -7,7 +7,7 @@ %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global snapshotdate 20211013 -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 9 %ifarch x86_64 %bcond_without vmaf %endif From 2de29037ff74f10667cfbc47169535fbfafbc30e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 21:22:59 +0000 Subject: [PATCH 04/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 9ef1e07ce9531fdcf80829d2fd2f873af4fecf75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Sun, 19 Jun 2022 18:56:28 +0200 Subject: [PATCH 05/40] Update to 3.4.0 Close: rhbz#2049182, rhbz#2083009 --- .gitignore | 3 +++ aom.spec | 12 +++++++----- sources | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index e03deae..f56ef0a 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,6 @@ /aom-7fadc0e.tar.gz /aom-ae2be80.tar.gz /aom-287164d.tar.gz +/aom-f9babb6.tar.gz +/aom-87460ce.tar.gz +/aom-fc430c5.tar.gz diff --git a/aom.spec b/aom.spec index 929b400..2f1e09b 100644 --- a/aom.spec +++ b/aom.spec @@ -1,21 +1,21 @@ %global sover 3 # git describe -%global aom_version v3.2.0 +%global aom_version v3.3.0 # Use commit with updated changelog for correct versioning -%global commit 287164de79516c25c8c84fd544f67752c170082a +%global commit fc430c57c7b0307b4c5ffb686cd90b3c010d08d2 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global snapshotdate 20211013 +%global snapshotdate 20220619 %if 0%{?fedora} || 0%{?rhel} >= 9 %ifarch x86_64 %bcond_without vmaf %endif -%bcond_without jpegxl +%bcond_with jpegxl %endif Name: aom -Version: 3.2.0 +Version: 3.4.0 Release: %autorelease Summary: Royalty-free next-generation video format @@ -77,6 +77,8 @@ video format. %autosetup -p1 -c %{name}-%{commit} # Set GIT revision in version sed -i 's@set(aom_version "")@set(aom_version "%{aom_version}")@' build/cmake/version.cmake +# Disable PDF generation which is buggy +sed -i "s@GENERATE_LATEX = YES@GENERATE_LATEX = NO@" libs.doxy_template %build %ifarch %{arm} diff --git a/sources b/sources index 22ed1c8..265d501 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aom-287164d.tar.gz) = f4681f2ec0292baa8862992c9dd875e17189de3880275745fdd2a6bc8ec3130701beb60036c3f7f23d0241cb89dec04af791b220c032a2d23a397e0854e47d39 +SHA512 (aom-fc430c5.tar.gz) = 993a74dfd2d8ecc99bceb0222fbcdb462e4c3e02f01f4327d7b3d28c1d0a24e93b0f6525d715e3767eb4fff8a1fb30a8c8c3f9245b6978b99540871ab2387fcb From 06ebe4eb56208f2e8530d69af297d8ee69990586 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Sun, 19 Jun 2022 22:37:13 +0200 Subject: [PATCH 06/40] Fix aom_version variable --- aom.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aom.spec b/aom.spec index 2f1e09b..ecafc6f 100644 --- a/aom.spec +++ b/aom.spec @@ -1,6 +1,6 @@ %global sover 3 # git describe -%global aom_version v3.3.0 +%global aom_version v3.4.0 # Use commit with updated changelog for correct versioning %global commit fc430c57c7b0307b4c5ffb686cd90b3c010d08d2 From ef388c8553b0d239fde1ae6fae7c6dcade25c643 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 20:57:22 +0000 Subject: [PATCH 07/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering From bcfaeddf2f1004143a25d62eb880402529abf088 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Sun, 9 Oct 2022 21:19:27 +0200 Subject: [PATCH 08/40] Update to 3.5.0 Close: rhbz#2132949 --- .gitignore | 1 + aom.spec | 8 ++++---- sources | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index f56ef0a..b603c1f 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /aom-f9babb6.tar.gz /aom-87460ce.tar.gz /aom-fc430c5.tar.gz +/aom-3.5.0.tar.gz diff --git a/aom.spec b/aom.spec index ecafc6f..12ceb38 100644 --- a/aom.spec +++ b/aom.spec @@ -1,6 +1,6 @@ %global sover 3 # git describe -%global aom_version v3.4.0 +%global aom_version v3.5.0 # Use commit with updated changelog for correct versioning %global commit fc430c57c7b0307b4c5ffb686cd90b3c010d08d2 @@ -15,13 +15,13 @@ %endif Name: aom -Version: 3.4.0 +Version: 3.5.0 Release: %autorelease Summary: Royalty-free next-generation video format License: BSD URL: http://aomedia.org/ -Source0: https://aomedia.googlesource.com/%{name}/+archive/%{commit}.tar.gz#/%{name}-%{shortcommit}.tar.gz +Source0: https://aomedia.googlesource.com/%{name}/+archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildRequires: gcc-c++ BuildRequires: gcc @@ -74,7 +74,7 @@ Development files for aom, the royalty-free next-generation video format. %prep -%autosetup -p1 -c %{name}-%{commit} +%autosetup -p1 -c %{name}-%{version} # Set GIT revision in version sed -i 's@set(aom_version "")@set(aom_version "%{aom_version}")@' build/cmake/version.cmake # Disable PDF generation which is buggy diff --git a/sources b/sources index 265d501..1a3e0b0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aom-fc430c5.tar.gz) = 993a74dfd2d8ecc99bceb0222fbcdb462e4c3e02f01f4327d7b3d28c1d0a24e93b0f6525d715e3767eb4fff8a1fb30a8c8c3f9245b6978b99540871ab2387fcb +SHA512 (aom-3.5.0.tar.gz) = 4a772351a51f2758695e54c1cddbed95ff2f815f367b3f347b0f3b6c14e87890bd624d507e8091f9475943c4ca61f8dfeb95ec3f11ca225307f3c83873edbf34 From a1960ad98bde6cc4d2a7746ef794fb485f99f1da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Sat, 19 Nov 2022 22:24:06 +0100 Subject: [PATCH 09/40] Enable JPEGXL dependency --- aom.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aom.spec b/aom.spec index 12ceb38..1407470 100644 --- a/aom.spec +++ b/aom.spec @@ -11,7 +11,7 @@ %ifarch x86_64 %bcond_without vmaf %endif -%bcond_with jpegxl +%bcond_without jpegxl %endif Name: aom @@ -19,7 +19,7 @@ Version: 3.5.0 Release: %autorelease Summary: Royalty-free next-generation video format -License: BSD +License: BSD-3-Clause URL: http://aomedia.org/ Source0: https://aomedia.googlesource.com/%{name}/+archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz From 47b04c2460110815cea5c892434b1f1dd74491bb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:52:19 +0000 Subject: [PATCH 10/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering From c26ee404fc6c7787689a7263103dcb9aabab9196 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Sat, 18 Mar 2023 18:53:09 +0100 Subject: [PATCH 11/40] Update to 3.6.0 Close: rhbz#2162146 --- .gitignore | 1 + aom.spec | 4 ++-- sources | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b603c1f..5322611 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /aom-87460ce.tar.gz /aom-fc430c5.tar.gz /aom-3.5.0.tar.gz +/aom-3.6.0.tar.gz diff --git a/aom.spec b/aom.spec index 1407470..3a96d61 100644 --- a/aom.spec +++ b/aom.spec @@ -1,6 +1,6 @@ %global sover 3 # git describe -%global aom_version v3.5.0 +%global aom_version v3.6.0 # Use commit with updated changelog for correct versioning %global commit fc430c57c7b0307b4c5ffb686cd90b3c010d08d2 @@ -15,7 +15,7 @@ %endif Name: aom -Version: 3.5.0 +Version: 3.6.0 Release: %autorelease Summary: Royalty-free next-generation video format diff --git a/sources b/sources index 1a3e0b0..1491848 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aom-3.5.0.tar.gz) = 4a772351a51f2758695e54c1cddbed95ff2f815f367b3f347b0f3b6c14e87890bd624d507e8091f9475943c4ca61f8dfeb95ec3f11ca225307f3c83873edbf34 +SHA512 (aom-3.6.0.tar.gz) = d90e661d0f5ecf14c1b474ad83a5d283922db0a2afdee4f0996ca1611be036fd1d220932bb025049d6e6a19f10d546d4fe9895e6b63701a51f215040712a87d1 From 9a6c91a157adb1137c1246b875b73a31901022b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sun, 18 Jun 2023 20:34:37 +0100 Subject: [PATCH 12/40] Mass rebuild for jpegxl-0.8.1 From 40f771cc93a3bc814098d13371677f662e504dd0 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 15 Jun 2023 22:22:22 +0200 Subject: [PATCH 13/40] Update to version 3.6.1; Fixes RHBZ#2193518 --- .gitignore | 1 + aom.spec | 4 ++-- sources | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5322611..6f7b465 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /aom-fc430c5.tar.gz /aom-3.5.0.tar.gz /aom-3.6.0.tar.gz +/aom-3.6.1.tar.gz diff --git a/aom.spec b/aom.spec index 3a96d61..d9e0f13 100644 --- a/aom.spec +++ b/aom.spec @@ -1,6 +1,6 @@ %global sover 3 # git describe -%global aom_version v3.6.0 +%global aom_version v3.6.1 # Use commit with updated changelog for correct versioning %global commit fc430c57c7b0307b4c5ffb686cd90b3c010d08d2 @@ -15,7 +15,7 @@ %endif Name: aom -Version: 3.6.0 +Version: 3.6.1 Release: %autorelease Summary: Royalty-free next-generation video format diff --git a/sources b/sources index 1491848..7fe82bc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aom-3.6.0.tar.gz) = d90e661d0f5ecf14c1b474ad83a5d283922db0a2afdee4f0996ca1611be036fd1d220932bb025049d6e6a19f10d546d4fe9895e6b63701a51f215040712a87d1 +SHA512 (aom-3.6.1.tar.gz) = e69e3734452be56857cc903000ca7d7c4bfd1110030fb58902ebda127ba04024fd60b209a2323d0945c0c4335c2dbb61a2d7dc57c7b6c6ec44280b2f215699bf From b5440d6e1d94f977caa8a4a7beff657ab262d91e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 13:26:24 +0000 Subject: [PATCH 14/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering From fe0a0f7b93a03e4cce78f826eb559c1d073fd895 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Fri, 1 Sep 2023 21:26:03 +0200 Subject: [PATCH 15/40] Update to version 3.7.0; Fixes RHBZ#2236624 --- .gitignore | 1 + aom.spec | 10 ++-------- sources | 2 +- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 6f7b465..49543fc 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /aom-3.5.0.tar.gz /aom-3.6.0.tar.gz /aom-3.6.1.tar.gz +/aom-3.7.0.tar.gz diff --git a/aom.spec b/aom.spec index d9e0f13..ecfbe16 100644 --- a/aom.spec +++ b/aom.spec @@ -1,11 +1,5 @@ %global sover 3 -# git describe -%global aom_version v3.6.1 - -# Use commit with updated changelog for correct versioning -%global commit fc430c57c7b0307b4c5ffb686cd90b3c010d08d2 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global snapshotdate 20220619 +%global aom_version v3.7.0 %if 0%{?fedora} || 0%{?rhel} >= 9 %ifarch x86_64 @@ -15,7 +9,7 @@ %endif Name: aom -Version: 3.6.1 +Version: 3.7.0 Release: %autorelease Summary: Royalty-free next-generation video format diff --git a/sources b/sources index 7fe82bc..3d4a2b7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aom-3.6.1.tar.gz) = e69e3734452be56857cc903000ca7d7c4bfd1110030fb58902ebda127ba04024fd60b209a2323d0945c0c4335c2dbb61a2d7dc57c7b6c6ec44280b2f215699bf +SHA512 (aom-3.7.0.tar.gz) = b142c03fb6ab1792f32e18dacc394d67308546f1c41379cd7e4c7afc80cc8f5bd562a6ec5e2733774e27891258df89e9c9e706e578baaee7c7e83071fe4d629f From d10cd72734b404139d39a0951306485212a30153 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 29 Nov 2023 16:06:16 +0100 Subject: [PATCH 16/40] Update to version 3.7.1; Fixes RHBZ#2250720 --- .gitignore | 1 + aom.spec | 4 ++-- sources | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 49543fc..88fc3ad 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /aom-3.6.0.tar.gz /aom-3.6.1.tar.gz /aom-3.7.0.tar.gz +/aom-3.7.1.tar.gz diff --git a/aom.spec b/aom.spec index ecfbe16..ae6e66c 100644 --- a/aom.spec +++ b/aom.spec @@ -1,5 +1,5 @@ %global sover 3 -%global aom_version v3.7.0 +%global aom_version v3.7.1 %if 0%{?fedora} || 0%{?rhel} >= 9 %ifarch x86_64 @@ -9,7 +9,7 @@ %endif Name: aom -Version: 3.7.0 +Version: 3.7.1 Release: %autorelease Summary: Royalty-free next-generation video format diff --git a/sources b/sources index 3d4a2b7..b7f2726 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aom-3.7.0.tar.gz) = b142c03fb6ab1792f32e18dacc394d67308546f1c41379cd7e4c7afc80cc8f5bd562a6ec5e2733774e27891258df89e9c9e706e578baaee7c7e83071fe4d629f +SHA512 (aom-3.7.1.tar.gz) = 36c9d84b3c36c30726abd9fd2fffd9797806f3b0cc89b89cd67f34588625f156cfb8f88fd10437fc5a11e2ec068401da6d0259e45b40a2bbf147f55928b6d573 From ef9b0cdb25a49cbc20a44f434d8ed216e3965916 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 28 Dec 2023 14:59:37 +0100 Subject: [PATCH 17/40] Update to version 3.8.0; Fixes RHBZ#2252498 --- .gitignore | 1 + aom.spec | 4 ++-- sources | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 88fc3ad..d45bf6e 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /aom-3.6.1.tar.gz /aom-3.7.0.tar.gz /aom-3.7.1.tar.gz +/aom-3.8.0.tar.gz diff --git a/aom.spec b/aom.spec index ae6e66c..536d2e6 100644 --- a/aom.spec +++ b/aom.spec @@ -1,5 +1,5 @@ %global sover 3 -%global aom_version v3.7.1 +%global aom_version v3.8.0 %if 0%{?fedora} || 0%{?rhel} >= 9 %ifarch x86_64 @@ -9,7 +9,7 @@ %endif Name: aom -Version: 3.7.1 +Version: 3.8.0 Release: %autorelease Summary: Royalty-free next-generation video format diff --git a/sources b/sources index b7f2726..8056548 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aom-3.7.1.tar.gz) = 36c9d84b3c36c30726abd9fd2fffd9797806f3b0cc89b89cd67f34588625f156cfb8f88fd10437fc5a11e2ec068401da6d0259e45b40a2bbf147f55928b6d573 +SHA512 (aom-3.8.0.tar.gz) = 0377052cdbfd3624369d720e41e0d1f6fce8b32f121a762a9f943195ca88186e37c9d6121bd8402bb7483d1d36c8b96d93cc8c31842bb0cdb9f9dc8f1935dbd5 From ec2b97e0f4ac3a6b2e3339aa59b971498e2c086b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 13:09:06 +0000 Subject: [PATCH 18/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 914f16777d069a30f795d6c64ba6b71545e199cf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 23:11:43 +0000 Subject: [PATCH 19/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From f854aac5adb7528a13eebd3d8758e70f2ac4a81d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Wed, 14 Feb 2024 01:37:21 +0000 Subject: [PATCH 20/40] Rebuild for jpegxl (libjxl) 0.9.2 with soname bump From 866ca0946e5d15a8f3bd19a68f1d9b1cf9219c96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Wed, 14 Feb 2024 01:45:08 +0000 Subject: [PATCH 21/40] Disable jpegxl on Fedora 40+ jpegxl 0.9 removed butteraugli api --- aom.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aom.spec b/aom.spec index 536d2e6..45f84fe 100644 --- a/aom.spec +++ b/aom.spec @@ -5,7 +5,7 @@ %ifarch x86_64 %bcond_without vmaf %endif -%bcond_without jpegxl +%bcond_with jpegxl %endif Name: aom From 77b1b941926b84f6e800f352157632f18305e75c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Wed, 14 Feb 2024 01:53:30 +0000 Subject: [PATCH 22/40] fix previous commit --- aom.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/aom.spec b/aom.spec index 45f84fe..dbe37d1 100644 --- a/aom.spec +++ b/aom.spec @@ -5,7 +5,11 @@ %ifarch x86_64 %bcond_without vmaf %endif +%if 0%{?fedora} >= 40 %bcond_with jpegxl +%else +%bcond_without jpegxl +%endif %endif Name: aom From 25efcdccdf41c6ba82765273720601ddd55534eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Wed, 13 Mar 2024 01:51:06 +0000 Subject: [PATCH 23/40] Rebuild for jpegxl (libjxl) 0.10.2 From 466ada492de898334f248f4cec9be16f9808c81f Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 14 Mar 2024 17:51:09 +0100 Subject: [PATCH 24/40] Update to version 3.8.2; Fixes RHBZ#2258897 --- .gitignore | 1 + aom.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d45bf6e..f222e90 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /aom-3.7.0.tar.gz /aom-3.7.1.tar.gz /aom-3.8.0.tar.gz +/aom-3.8.2.tar.gz diff --git a/aom.spec b/aom.spec index dbe37d1..868d9e4 100644 --- a/aom.spec +++ b/aom.spec @@ -13,7 +13,7 @@ %endif Name: aom -Version: 3.8.0 +Version: 3.8.2 Release: %autorelease Summary: Royalty-free next-generation video format diff --git a/sources b/sources index 8056548..3441986 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aom-3.8.0.tar.gz) = 0377052cdbfd3624369d720e41e0d1f6fce8b32f121a762a9f943195ca88186e37c9d6121bd8402bb7483d1d36c8b96d93cc8c31842bb0cdb9f9dc8f1935dbd5 +SHA512 (aom-3.8.2.tar.gz) = d6554abc0a931354efe23f928137984c76ac65f4731b46bca087e085cf77e801d2dda067e40c9a65cd61684fcad2375f5f7550b056a558f67da22c4c26ac8524 From a8328c6e2aa0ef2f673af20dbe06682b1abab0e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Thu, 18 Apr 2024 13:33:09 +0100 Subject: [PATCH 25/40] Fix build for eln --- aom.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aom.spec b/aom.spec index 868d9e4..1b05650 100644 --- a/aom.spec +++ b/aom.spec @@ -5,7 +5,7 @@ %ifarch x86_64 %bcond_without vmaf %endif -%if 0%{?fedora} >= 40 +%if 0%{?fedora} >= 40 || 0%{?rhel} > 9 %bcond_with jpegxl %else %bcond_without jpegxl From 78268a201200ff9edb56fa708590479aa8c5279c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Thu, 18 Apr 2024 15:34:51 +0100 Subject: [PATCH 26/40] jpegxl-0.10.x did not land on F40 --- aom.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aom.spec b/aom.spec index 1b05650..61b1b0b 100644 --- a/aom.spec +++ b/aom.spec @@ -5,7 +5,7 @@ %ifarch x86_64 %bcond_without vmaf %endif -%if 0%{?fedora} >= 40 || 0%{?rhel} > 9 +%if 0%{?fedora} > 40 || 0%{?rhel} > 9 %bcond_with jpegxl %else %bcond_without jpegxl From 0d352aae9a8fbe5d954ec7cb16bdf3692b502d1d Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 15 May 2024 22:23:22 +0200 Subject: [PATCH 27/40] Update to version 3.9.0; Fixes RHBZ#2274372 --- .gitignore | 1 + aom.spec | 4 ++-- sources | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f222e90..cfd45e4 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /aom-3.7.1.tar.gz /aom-3.8.0.tar.gz /aom-3.8.2.tar.gz +/aom-3.9.0.tar.gz diff --git a/aom.spec b/aom.spec index 61b1b0b..7251001 100644 --- a/aom.spec +++ b/aom.spec @@ -1,5 +1,5 @@ %global sover 3 -%global aom_version v3.8.0 +%global aom_version v3.9.0 %if 0%{?fedora} || 0%{?rhel} >= 9 %ifarch x86_64 @@ -13,7 +13,7 @@ %endif Name: aom -Version: 3.8.2 +Version: 3.9.0 Release: %autorelease Summary: Royalty-free next-generation video format diff --git a/sources b/sources index 3441986..5aab0f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aom-3.8.2.tar.gz) = d6554abc0a931354efe23f928137984c76ac65f4731b46bca087e085cf77e801d2dda067e40c9a65cd61684fcad2375f5f7550b056a558f67da22c4c26ac8524 +SHA512 (aom-3.9.0.tar.gz) = e070b5078d69bced62ff1f2329639fff6218d2dcd0724618b93fd7a06e351fdb26933787e4c624999735e913476d14db3f386c4d66693d1c37b29124c97af0ff From 3223257faa1ede336ed0aa6a9f0c218da93ac3a5 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 16 Jul 2024 17:49:49 +0200 Subject: [PATCH 28/40] Rebuild for vmaf From 30700c9ae50d3687a58f80e8b21cb1767546a072 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 17:08:56 +0000 Subject: [PATCH 29/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 6d7cfa16dbd295a8022096f6f93d9e7ca3b0aa76 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 11:13:23 +0000 Subject: [PATCH 30/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From fecf8cb936616f295bddf48c5ec56a8744e0c3a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Thu, 30 Jan 2025 06:18:01 +0100 Subject: [PATCH 31/40] Fix FTBFS with GCC15 The issue was within third party libwebm mkvparser module. It was fixed upstream in https://aomedia.issues.chromium.org/issues/357622679 by adding a missing include to `mkvparser/mkvparser.cc` Fix: rhbz#2339894 --- ...webm-to-libwebm-1.0.0.31-10-g3b63004.patch | 58 +++++++++++++++++++ aom.spec | 8 ++- 2 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 0001-update-libwebm-to-libwebm-1.0.0.31-10-g3b63004.patch diff --git a/0001-update-libwebm-to-libwebm-1.0.0.31-10-g3b63004.patch b/0001-update-libwebm-to-libwebm-1.0.0.31-10-g3b63004.patch new file mode 100644 index 0000000..7d90059 --- /dev/null +++ b/0001-update-libwebm-to-libwebm-1.0.0.31-10-g3b63004.patch @@ -0,0 +1,58 @@ +From e448dcd13a9f534c7291903e9ab18dfc4fea54ad Mon Sep 17 00:00:00 2001 +From: James Zern +Date: Tue, 6 Aug 2024 10:38:00 -0700 +Subject: [PATCH] update libwebm to libwebm-1.0.0.31-10-g3b63004 + +This fixes a build error seen in gcc 15: +3b63004 mkvparser/mkvparser.cc: add missing include + +Bug: aomedia:357622679 +Change-Id: I6c4a1795d189f9993d4f2c5c9f0375912bc58f0c +--- + third_party/libwebm/README.libaom | 2 +- + third_party/libwebm/mkvmuxer/mkvmuxerutil.h | 4 ++-- + third_party/libwebm/mkvparser/mkvparser.cc | 1 + + 3 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/third_party/libwebm/README.libaom b/third_party/libwebm/README.libaom +index a038418acd..6e43487540 100644 +--- a/third_party/libwebm/README.libaom ++++ b/third_party/libwebm/README.libaom +@@ -1,5 +1,5 @@ + URL: https://chromium.googlesource.com/webm/libwebm +-Version: affd7f4d9644aa2b65981fa6c7616400be760e6e ++Version: 3b630045052e1e4d563207ab9e3be8d137c26067 + License: BSD + License File: LICENSE.TXT + +diff --git a/third_party/libwebm/mkvmuxer/mkvmuxerutil.h b/third_party/libwebm/mkvmuxer/mkvmuxerutil.h +index 3355428bd1..85fc2a209e 100644 +--- a/third_party/libwebm/mkvmuxer/mkvmuxerutil.h ++++ b/third_party/libwebm/mkvmuxer/mkvmuxerutil.h +@@ -8,9 +8,9 @@ + #ifndef MKVMUXER_MKVMUXERUTIL_H_ + #define MKVMUXER_MKVMUXERUTIL_H_ + +-#include "mkvmuxertypes.h" ++#include + +-#include "stdint.h" ++#include "mkvmuxertypes.h" + + namespace mkvmuxer { + class Cluster; +diff --git a/third_party/libwebm/mkvparser/mkvparser.cc b/third_party/libwebm/mkvparser/mkvparser.cc +index eddbc7eb50..042a0c56cd 100644 +--- a/third_party/libwebm/mkvparser/mkvparser.cc ++++ b/third_party/libwebm/mkvparser/mkvparser.cc +@@ -16,6 +16,7 @@ + #include + #include + #include ++#include + #include + #include + #include +-- +2.48.1 + diff --git a/aom.spec b/aom.spec index 7251001..d618d6d 100644 --- a/aom.spec +++ b/aom.spec @@ -19,7 +19,13 @@ Summary: Royalty-free next-generation video format License: BSD-3-Clause URL: http://aomedia.org/ -Source0: https://aomedia.googlesource.com/%{name}/+archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source: https://aomedia.googlesource.com/%{name}/+archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +# This fixes a build error seen in gcc 15: +# 3b63004 mkvparser/mkvparser.cc: add missing include +# +# Bug: aomedia:35762267 https://aomedia.issues.chromium.org/issues/357622679 +# https://aomedia.googlesource.com/aom/+/e448dcd13a9f534c7291903e9ab18dfc4fea54ad%5E%21/ +Patch: 0001-update-libwebm-to-libwebm-1.0.0.31-10-g3b63004.patch BuildRequires: gcc-c++ BuildRequires: gcc From 7298adf6e7d5d7209c621bc8fb80722aa1a1c9d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Tue, 7 Jan 2025 20:47:11 +0100 Subject: [PATCH 32/40] Update to 3.11 Close: rhbz#2291234 --- .gitignore | 1 + ...webm-to-libwebm-1.0.0.31-10-g3b63004.patch | 58 ------------------- aom.spec | 10 +--- sources | 2 +- 4 files changed, 4 insertions(+), 67 deletions(-) delete mode 100644 0001-update-libwebm-to-libwebm-1.0.0.31-10-g3b63004.patch diff --git a/.gitignore b/.gitignore index cfd45e4..aa19702 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /aom-3.8.0.tar.gz /aom-3.8.2.tar.gz /aom-3.9.0.tar.gz +/aom-3.11.0.tar.gz diff --git a/0001-update-libwebm-to-libwebm-1.0.0.31-10-g3b63004.patch b/0001-update-libwebm-to-libwebm-1.0.0.31-10-g3b63004.patch deleted file mode 100644 index 7d90059..0000000 --- a/0001-update-libwebm-to-libwebm-1.0.0.31-10-g3b63004.patch +++ /dev/null @@ -1,58 +0,0 @@ -From e448dcd13a9f534c7291903e9ab18dfc4fea54ad Mon Sep 17 00:00:00 2001 -From: James Zern -Date: Tue, 6 Aug 2024 10:38:00 -0700 -Subject: [PATCH] update libwebm to libwebm-1.0.0.31-10-g3b63004 - -This fixes a build error seen in gcc 15: -3b63004 mkvparser/mkvparser.cc: add missing include - -Bug: aomedia:357622679 -Change-Id: I6c4a1795d189f9993d4f2c5c9f0375912bc58f0c ---- - third_party/libwebm/README.libaom | 2 +- - third_party/libwebm/mkvmuxer/mkvmuxerutil.h | 4 ++-- - third_party/libwebm/mkvparser/mkvparser.cc | 1 + - 3 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/third_party/libwebm/README.libaom b/third_party/libwebm/README.libaom -index a038418acd..6e43487540 100644 ---- a/third_party/libwebm/README.libaom -+++ b/third_party/libwebm/README.libaom -@@ -1,5 +1,5 @@ - URL: https://chromium.googlesource.com/webm/libwebm --Version: affd7f4d9644aa2b65981fa6c7616400be760e6e -+Version: 3b630045052e1e4d563207ab9e3be8d137c26067 - License: BSD - License File: LICENSE.TXT - -diff --git a/third_party/libwebm/mkvmuxer/mkvmuxerutil.h b/third_party/libwebm/mkvmuxer/mkvmuxerutil.h -index 3355428bd1..85fc2a209e 100644 ---- a/third_party/libwebm/mkvmuxer/mkvmuxerutil.h -+++ b/third_party/libwebm/mkvmuxer/mkvmuxerutil.h -@@ -8,9 +8,9 @@ - #ifndef MKVMUXER_MKVMUXERUTIL_H_ - #define MKVMUXER_MKVMUXERUTIL_H_ - --#include "mkvmuxertypes.h" -+#include - --#include "stdint.h" -+#include "mkvmuxertypes.h" - - namespace mkvmuxer { - class Cluster; -diff --git a/third_party/libwebm/mkvparser/mkvparser.cc b/third_party/libwebm/mkvparser/mkvparser.cc -index eddbc7eb50..042a0c56cd 100644 ---- a/third_party/libwebm/mkvparser/mkvparser.cc -+++ b/third_party/libwebm/mkvparser/mkvparser.cc -@@ -16,6 +16,7 @@ - #include - #include - #include -+#include - #include - #include - #include --- -2.48.1 - diff --git a/aom.spec b/aom.spec index d618d6d..db1c27a 100644 --- a/aom.spec +++ b/aom.spec @@ -1,5 +1,5 @@ %global sover 3 -%global aom_version v3.9.0 +%global aom_version v3.11.0 %if 0%{?fedora} || 0%{?rhel} >= 9 %ifarch x86_64 @@ -13,19 +13,13 @@ %endif Name: aom -Version: 3.9.0 +Version: 3.11.0 Release: %autorelease Summary: Royalty-free next-generation video format License: BSD-3-Clause URL: http://aomedia.org/ Source: https://aomedia.googlesource.com/%{name}/+archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -# This fixes a build error seen in gcc 15: -# 3b63004 mkvparser/mkvparser.cc: add missing include -# -# Bug: aomedia:35762267 https://aomedia.issues.chromium.org/issues/357622679 -# https://aomedia.googlesource.com/aom/+/e448dcd13a9f534c7291903e9ab18dfc4fea54ad%5E%21/ -Patch: 0001-update-libwebm-to-libwebm-1.0.0.31-10-g3b63004.patch BuildRequires: gcc-c++ BuildRequires: gcc diff --git a/sources b/sources index 5aab0f7..729cd4b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aom-3.9.0.tar.gz) = e070b5078d69bced62ff1f2329639fff6218d2dcd0724618b93fd7a06e351fdb26933787e4c624999735e913476d14db3f386c4d66693d1c37b29124c97af0ff +SHA512 (aom-3.11.0.tar.gz) = 5c87159e4ae81af0f01b35bda5ced5ad58a777f57333f77b39fbdb27840e01031c4555b94e6ad4245ee3ba791dc0d84df6090e23240548680518353c3a2f71e3 From 7b6a27395f74df37dca3e73e8bb5267fcc4ca9ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Tue, 11 Feb 2025 02:38:48 +0100 Subject: [PATCH 33/40] Update to 3.12.0 Close: rhbz#2344781 --- .gitignore | 1 + aom.spec | 4 ++-- sources | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index aa19702..8776744 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /aom-3.8.2.tar.gz /aom-3.9.0.tar.gz /aom-3.11.0.tar.gz +/aom-3.12.0.tar.gz diff --git a/aom.spec b/aom.spec index db1c27a..eb2777b 100644 --- a/aom.spec +++ b/aom.spec @@ -1,5 +1,5 @@ %global sover 3 -%global aom_version v3.11.0 +%global aom_version v3.12.0 %if 0%{?fedora} || 0%{?rhel} >= 9 %ifarch x86_64 @@ -13,7 +13,7 @@ %endif Name: aom -Version: 3.11.0 +Version: 3.12.0 Release: %autorelease Summary: Royalty-free next-generation video format diff --git a/sources b/sources index 729cd4b..3f1fa2f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aom-3.11.0.tar.gz) = 5c87159e4ae81af0f01b35bda5ced5ad58a777f57333f77b39fbdb27840e01031c4555b94e6ad4245ee3ba791dc0d84df6090e23240548680518353c3a2f71e3 +SHA512 (aom-3.12.0.tar.gz) = 74336adc67527567f90a6e3dd6832af92e20ae9c41e6fdd13cb93eb44ecd43933d526497fb692519419c328ba95bc2bee3e50788183dce859abaefd0d7b1d6e7 From a1460a438abed30dbf844477d47d20b231afbb27 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Tue, 22 Jul 2025 09:12:53 +0200 Subject: [PATCH 34/40] use nasm instead of unmaintained yasm See https://fedoraproject.org/wiki/Changes/DeprecateYASM for details. --- aom.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aom.spec b/aom.spec index eb2777b..6de3199 100644 --- a/aom.spec +++ b/aom.spec @@ -30,7 +30,7 @@ BuildRequires: git-core BuildRequires: perl-interpreter BuildRequires: perl(Getopt::Long) BuildRequires: python3-devel -BuildRequires: yasm +BuildRequires: nasm %if %{with jpegxl} BuildRequires: pkgconfig(libjxl) BuildRequires: pkgconfig(libhwy) From 253d0108a9e27d5cbb95f5f2559e8e15b7717973 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 17:04:42 +0000 Subject: [PATCH 35/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 292315b7c1ab6f0e2be4604eca87e27ddf35f205 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 3 Sep 2025 20:49:39 +0200 Subject: [PATCH 36/40] Update to version 3.13.0; Fixes RHBZ#2359193 --- .gitignore | 1 + aom.spec | 21 ++++++++++++++------- sources | 2 +- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 8776744..f3a3601 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /aom-3.9.0.tar.gz /aom-3.11.0.tar.gz /aom-3.12.0.tar.gz +/aom-3.13.0.tar.gz diff --git a/aom.spec b/aom.spec index 6de3199..5a0fe47 100644 --- a/aom.spec +++ b/aom.spec @@ -1,5 +1,5 @@ %global sover 3 -%global aom_version v3.12.0 +%global aom_version v3.13.0 %if 0%{?fedora} || 0%{?rhel} >= 9 %ifarch x86_64 @@ -13,7 +13,7 @@ %endif Name: aom -Version: 3.12.0 +Version: 3.13.0 Release: %autorelease Summary: Royalty-free next-generation video format @@ -71,6 +71,14 @@ Requires: libaom%{?_isa} = %{version}-%{release} Development files for aom, the royalty-free next-generation video format. +%package -n libaom-devel-docs +Summary: Documentation for libaom +Requires: libaom-devel%{?_isa} = %{version}-%{release} + +%description -n libaom-devel-docs +Documentation for libaom, the royalty-free next-generation +video format. + %prep %autosetup -p1 -c %{name}-%{version} # Set GIT revision in version @@ -79,10 +87,6 @@ sed -i 's@set(aom_version "")@set(aom_version "%{aom_version}")@' build/cmake/ve sed -i "s@GENERATE_LATEX = YES@GENERATE_LATEX = NO@" libs.doxy_template %build -%ifarch %{arm} -%global optflags %{__global_compiler_flags} -march=armv7-a -mfpu=neon -mtune=cortex-a8 -mabi=aapcs-linux -mfloat-abi=hard -%endif - %cmake3 -DENABLE_CCACHE=1 \ -DCMAKE_SKIP_RPATH=1 \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ @@ -115,10 +119,13 @@ rm -rvf %{buildroot}%{_libdir}/libaom.a %{_libdir}/libaom.so.%{sover}* %files -n libaom-devel -%doc %{_vpath_builddir}/docs/html/ %{_includedir}/%{name} %{_libdir}/libaom.so +%{_libdir}/cmake/AOM/ %{_libdir}/pkgconfig/%{name}.pc +%files -n libaom-devel-docs +%doc %{_vpath_builddir}/docs/html/ + %changelog %autochangelog diff --git a/sources b/sources index 3f1fa2f..cccf7c8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aom-3.12.0.tar.gz) = 74336adc67527567f90a6e3dd6832af92e20ae9c41e6fdd13cb93eb44ecd43933d526497fb692519419c328ba95bc2bee3e50788183dce859abaefd0d7b1d6e7 +SHA512 (aom-3.13.0.tar.gz) = bd5447f2667ab2103ecfeaba75f21aa8da2db5619048bf1825fe1cfb4907d41c60276309be825638cc81ca42cd3781d72e355a647304f6da5ed4474a23b3e902 From 2026b73ed44f2a06410811b7c27fa37a93370698 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sun, 7 Sep 2025 16:16:59 +0200 Subject: [PATCH 37/40] Update to version 3.13.1 --- .gitignore | 1 + aom.spec | 4 ++-- sources | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f3a3601..3727cb1 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /aom-3.11.0.tar.gz /aom-3.12.0.tar.gz /aom-3.13.0.tar.gz +/aom-3.13.1.tar.gz diff --git a/aom.spec b/aom.spec index 5a0fe47..1fe6de3 100644 --- a/aom.spec +++ b/aom.spec @@ -1,5 +1,5 @@ %global sover 3 -%global aom_version v3.13.0 +%global aom_version v3.13.1 %if 0%{?fedora} || 0%{?rhel} >= 9 %ifarch x86_64 @@ -13,7 +13,7 @@ %endif Name: aom -Version: 3.13.0 +Version: 3.13.1 Release: %autorelease Summary: Royalty-free next-generation video format diff --git a/sources b/sources index cccf7c8..85f4d55 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aom-3.13.0.tar.gz) = bd5447f2667ab2103ecfeaba75f21aa8da2db5619048bf1825fe1cfb4907d41c60276309be825638cc81ca42cd3781d72e355a647304f6da5ed4474a23b3e902 +SHA512 (aom-3.13.1.tar.gz) = 20cdde0fc4304ba0056e4dac55838587a3671112ec74274f8dcb1588549a524ed9a8e702d1f068c46833dfb93f565eb5a03ab610b0222a6f137d3cd8a8866de7 From 37f6454cc92cd96f904b2864b62ce9f7bcf425ef Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Tue, 14 Oct 2025 11:08:23 +0200 Subject: [PATCH 38/40] fix nasm detection with nasm 3 Backports upstream fix. --- 0001-cmake-fix-nasm-detection-w-3.0.patch | 41 +++++++++++++++++++++++ aom.spec | 2 ++ 2 files changed, 43 insertions(+) create mode 100644 0001-cmake-fix-nasm-detection-w-3.0.patch diff --git a/0001-cmake-fix-nasm-detection-w-3.0.patch b/0001-cmake-fix-nasm-detection-w-3.0.patch new file mode 100644 index 0000000..eef863c --- /dev/null +++ b/0001-cmake-fix-nasm-detection-w-3.0.patch @@ -0,0 +1,41 @@ +From 6d2b7f71b98bfa28e372b1f2d85f137280bdb3de Mon Sep 17 00:00:00 2001 +From: James Zern +Date: Tue, 7 Oct 2025 14:08:44 -0700 +Subject: [PATCH] cmake: fix nasm detection w/3.0 + +nasm 3.0 separated Oflags (-Ox) output to `-hO` which is used to +validate the nasm binary. This change is compatible with older versions +(tested with NASM version 2.16.03 & 2.13.02). + +Bug: aomedia:448994065 +Fixed: aomedia:448994065 +Change-Id: I704dcfe39ac6e68bc4d5b9e409fb59a0d277170e +--- + build/cmake/aom_optimization.cmake | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/build/cmake/aom_optimization.cmake b/build/cmake/aom_optimization.cmake +index 9cc34de362..2750a0be41 100644 +--- a/build/cmake/aom_optimization.cmake ++++ b/build/cmake/aom_optimization.cmake +@@ -212,7 +212,7 @@ endfunction() + # Currently checks only for presence of required object formats and support for + # the -Ox argument (multipass optimization). + function(test_nasm) +- execute_process(COMMAND ${CMAKE_ASM_NASM_COMPILER} -hf ++ execute_process(COMMAND ${CMAKE_ASM_NASM_COMPILER} -hO + OUTPUT_VARIABLE nasm_helptext) + + if(NOT "${nasm_helptext}" MATCHES "-Ox") +@@ -220,6 +220,8 @@ function(test_nasm) + FATAL_ERROR "Unsupported nasm: multipass optimization not supported.") + endif() + ++ execute_process(COMMAND ${CMAKE_ASM_NASM_COMPILER} -hf ++ OUTPUT_VARIABLE nasm_helptext) + if("${AOM_TARGET_CPU}" STREQUAL "x86") + if("${AOM_TARGET_SYSTEM}" STREQUAL "Darwin") + if(NOT "${nasm_helptext}" MATCHES "macho32") +-- +2.51.0 + diff --git a/aom.spec b/aom.spec index 1fe6de3..3fbcb06 100644 --- a/aom.spec +++ b/aom.spec @@ -20,6 +20,8 @@ Summary: Royalty-free next-generation video format License: BSD-3-Clause URL: http://aomedia.org/ Source: https://aomedia.googlesource.com/%{name}/+archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +# https://aomedia.issues.chromium.org/issues/448994065 +Patch: 0001-cmake-fix-nasm-detection-w-3.0.patch BuildRequires: gcc-c++ BuildRequires: gcc From 2f8edd40b3eb7e3202f53a58d4cec15ca4b90577 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Tue, 30 Dec 2025 21:10:37 +0100 Subject: [PATCH 39/40] drop aom_static from installed .cmake files We don't ship it anyway, and it breaks AOM detection using cmake. - libaom-devel: add explicit dependency on main package for aomdec binary expected by cmake files --- aom-nostatic.patch | 12 ++++++++++++ aom.spec | 5 ++++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 aom-nostatic.patch diff --git a/aom-nostatic.patch b/aom-nostatic.patch new file mode 100644 index 0000000..acd6941 --- /dev/null +++ b/aom-nostatic.patch @@ -0,0 +1,12 @@ +diff -up aom-3.13.1/build/cmake/aom_install.cmake.orig aom-3.13.1/build/cmake/aom_install.cmake +--- aom-3.13.1/build/cmake/aom_install.cmake.orig 2025-09-07 16:11:27.789000000 +0200 ++++ aom-3.13.1/build/cmake/aom_install.cmake 2025-12-30 21:08:54.594005985 +0100 +@@ -79,7 +79,7 @@ macro(setup_aom_install_targets) + endif() + + if(BUILD_SHARED_LIBS) +- set(AOM_INSTALL_LIBS aom aom_static) ++ set(AOM_INSTALL_LIBS aom) + else() + set(AOM_INSTALL_LIBS aom) + endif() diff --git a/aom.spec b/aom.spec index 3fbcb06..75544c6 100644 --- a/aom.spec +++ b/aom.spec @@ -22,6 +22,8 @@ URL: http://aomedia.org/ Source: https://aomedia.googlesource.com/%{name}/+archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz # https://aomedia.issues.chromium.org/issues/448994065 Patch: 0001-cmake-fix-nasm-detection-w-3.0.patch +# Building static library breaks .cmake files if we don't ship it, so drop it +Patch: aom-nostatic.patch BuildRequires: gcc-c++ BuildRequires: gcc @@ -67,6 +69,8 @@ video format. %package -n libaom-devel Summary: Development files for aom +# cmake files assume /usr/bin/aomdec is present +Requires: aom%{?_isa} = %{version}-%{release} Requires: libaom%{?_isa} = %{version}-%{release} %description -n libaom-devel @@ -108,7 +112,6 @@ sed -i "s@GENERATE_LATEX = YES@GENERATE_LATEX = NO@" libs.doxy_t %install %cmake3_install -rm -rvf %{buildroot}%{_libdir}/libaom.a %files %doc AUTHORS CHANGELOG README.md From a6b34154ea58813f669470b33fa7d7e4ee1291b9 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Mon, 5 Jan 2026 15:38:15 +0100 Subject: [PATCH 40/40] stop exporting AOM_STATIC_LIBRARIES in CMake config The variable references the AOM::aom_static target which we're patching out. Resolves rhbz#2426269 . --- aom-nostatic.patch | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/aom-nostatic.patch b/aom-nostatic.patch index acd6941..1755b03 100644 --- a/aom-nostatic.patch +++ b/aom-nostatic.patch @@ -10,3 +10,20 @@ diff -up aom-3.13.1/build/cmake/aom_install.cmake.orig aom-3.13.1/build/cmake/ao else() set(AOM_INSTALL_LIBS aom) endif() +diff -up aom-3.13.1/build/cmake/config.cmake.in.orig aom-3.13.1/build/cmake/config.cmake.in +--- aom-3.13.1/build/cmake/config.cmake.in.orig 2025-09-07 16:11:27.791000000 +0200 ++++ aom-3.13.1/build/cmake/config.cmake.in 2026-01-05 15:35:24.588489147 +0100 +@@ -10,13 +10,6 @@ include("${CMAKE_CURRENT_LIST_DIR}/@AOM_ + + set_and_check(@PROJECT_NAME@_INCLUDE_DIRS "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@") + +-# @PROJECT_NAME@::aom_static is defined only if BUILD_SHARED_LIBS=1 when libaom +-# was configured. When it is false, @PROJECT_NAME@::aom is a static library. +-if(TARGET @PROJECT_NAME@::aom_static) +- set(@PROJECT_NAME@_STATIC_LIBRARIES "@PROJECT_NAME@::aom_static") +-else() +- set(@PROJECT_NAME@_STATIC_LIBRARIES "@PROJECT_NAME@::aom") +-endif() + set(@PROJECT_NAME@_LIBRARIES "@PROJECT_NAME@::aom") + + check_required_components(@PROJECT_NAME@)