From 12094584631f8d5354a543aa75fcdf3f8a17068f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 17:24:47 +0000 Subject: [PATCH 01/23] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- aalib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aalib.spec b/aalib.spec index 32eb272..5d994d6 100644 --- a/aalib.spec +++ b/aalib.spec @@ -3,7 +3,7 @@ Summary: ASCII art library Name: aalib Version: 1.4.0 -Release: 0.36.%{rc_subver}%{?dist} +Release: 0.37.%{rc_subver}%{?dist} License: LGPLv2+ URL: http://aa-project.sourceforge.net/aalib/ Source0: http://download.sourceforge.net/aa-project/%{name}-1.4%{rc_subver}.tar.gz @@ -84,6 +84,9 @@ touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/aalib-config $RPM_BUILD_ROOT%{_datadir}/ %{_datadir}/aclocal/aalib.m4 %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 1.4.0-0.37.rc5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 1.4.0-0.36.rc5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From b467e55e97ffc574fc61e0325155770d6c2c40a6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 11:04:55 +0000 Subject: [PATCH 02/23] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- aalib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aalib.spec b/aalib.spec index 5d994d6..67e5b57 100644 --- a/aalib.spec +++ b/aalib.spec @@ -3,7 +3,7 @@ Summary: ASCII art library Name: aalib Version: 1.4.0 -Release: 0.37.%{rc_subver}%{?dist} +Release: 0.38.%{rc_subver}%{?dist} License: LGPLv2+ URL: http://aa-project.sourceforge.net/aalib/ Source0: http://download.sourceforge.net/aa-project/%{name}-1.4%{rc_subver}.tar.gz @@ -84,6 +84,9 @@ touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/aalib-config $RPM_BUILD_ROOT%{_datadir}/ %{_datadir}/aclocal/aalib.m4 %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 1.4.0-0.38.rc5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Jul 24 2019 Fedora Release Engineering - 1.4.0-0.37.rc5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 17f9bdd77c0405139823dfe7183ea5d0289ee886 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 11:38:08 +0000 Subject: [PATCH 03/23] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- aalib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aalib.spec b/aalib.spec index 67e5b57..d6a3556 100644 --- a/aalib.spec +++ b/aalib.spec @@ -3,7 +3,7 @@ Summary: ASCII art library Name: aalib Version: 1.4.0 -Release: 0.38.%{rc_subver}%{?dist} +Release: 0.39.%{rc_subver}%{?dist} License: LGPLv2+ URL: http://aa-project.sourceforge.net/aalib/ Source0: http://download.sourceforge.net/aa-project/%{name}-1.4%{rc_subver}.tar.gz @@ -84,6 +84,9 @@ touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/aalib-config $RPM_BUILD_ROOT%{_datadir}/ %{_datadir}/aclocal/aalib.m4 %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 1.4.0-0.39.rc5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jan 28 2020 Fedora Release Engineering - 1.4.0-0.38.rc5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From dd1b1e2533ca73084450a169d2b82557e7b92101 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jul 2020 23:46:13 +0000 Subject: [PATCH 04/23] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- aalib.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/aalib.spec b/aalib.spec index d6a3556..e51bd3f 100644 --- a/aalib.spec +++ b/aalib.spec @@ -3,7 +3,7 @@ Summary: ASCII art library Name: aalib Version: 1.4.0 -Release: 0.39.%{rc_subver}%{?dist} +Release: 0.40.%{rc_subver}%{?dist} License: LGPLv2+ URL: http://aa-project.sourceforge.net/aalib/ Source0: http://download.sourceforge.net/aa-project/%{name}-1.4%{rc_subver}.tar.gz @@ -84,6 +84,10 @@ touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/aalib-config $RPM_BUILD_ROOT%{_datadir}/ %{_datadir}/aclocal/aalib.m4 %changelog +* Fri Jul 31 2020 Fedora Release Engineering - 1.4.0-0.40.rc5 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 1.4.0-0.39.rc5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 24c519a12a2bc7e53b95b77e5d4700b6252f85b1 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 15 Dec 2020 01:38:05 +0000 Subject: [PATCH 05/23] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- aalib.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/aalib.spec b/aalib.spec index e51bd3f..0751843 100644 --- a/aalib.spec +++ b/aalib.spec @@ -15,6 +15,7 @@ Patch4: aalib-1.4rc5-x_libs.patch Patch5: aalib-1.4rc5-libflag.patch BuildRequires: slang-devel libXt-devel gpm-devel ncurses-devel BuildRequires: autoconf libtool +BuildRequires: make %description AA-lib is a low level gfx library just as many other libraries are. The From 40f58ecd29740ebeca251931564a7bdd4a24fe79 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 25 Jan 2021 23:42:07 +0000 Subject: [PATCH 06/23] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- aalib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aalib.spec b/aalib.spec index 0751843..cc28e88 100644 --- a/aalib.spec +++ b/aalib.spec @@ -3,7 +3,7 @@ Summary: ASCII art library Name: aalib Version: 1.4.0 -Release: 0.40.%{rc_subver}%{?dist} +Release: 0.41.%{rc_subver}%{?dist} License: LGPLv2+ URL: http://aa-project.sourceforge.net/aalib/ Source0: http://download.sourceforge.net/aa-project/%{name}-1.4%{rc_subver}.tar.gz @@ -85,6 +85,9 @@ touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/aalib-config $RPM_BUILD_ROOT%{_datadir}/ %{_datadir}/aclocal/aalib.m4 %changelog +* Mon Jan 25 2021 Fedora Release Engineering - 1.4.0-0.41.rc5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Fri Jul 31 2020 Fedora Release Engineering - 1.4.0-0.40.rc5 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 24fe8dc90e0211d76bf3e38d9a357c2282ef6118 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 12:13:59 +0000 Subject: [PATCH 07/23] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 349ccbc7d7eac5d1cf556acf4b8f78bfc13572c4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 17:09:03 +0000 Subject: [PATCH 08/23] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- aalib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aalib.spec b/aalib.spec index cc28e88..bcc0be7 100644 --- a/aalib.spec +++ b/aalib.spec @@ -3,7 +3,7 @@ Summary: ASCII art library Name: aalib Version: 1.4.0 -Release: 0.41.%{rc_subver}%{?dist} +Release: 0.42.%{rc_subver}%{?dist} License: LGPLv2+ URL: http://aa-project.sourceforge.net/aalib/ Source0: http://download.sourceforge.net/aa-project/%{name}-1.4%{rc_subver}.tar.gz @@ -85,6 +85,9 @@ touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/aalib-config $RPM_BUILD_ROOT%{_datadir}/ %{_datadir}/aclocal/aalib.m4 %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 1.4.0-0.42.rc5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Jan 25 2021 Fedora Release Engineering - 1.4.0-0.41.rc5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 68ca9a0c914d6b1fe49c83b21d369b81e854d7f9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 20:48:56 +0000 Subject: [PATCH 09/23] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- aalib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aalib.spec b/aalib.spec index bcc0be7..011df26 100644 --- a/aalib.spec +++ b/aalib.spec @@ -3,7 +3,7 @@ Summary: ASCII art library Name: aalib Version: 1.4.0 -Release: 0.42.%{rc_subver}%{?dist} +Release: 0.43.%{rc_subver}%{?dist} License: LGPLv2+ URL: http://aa-project.sourceforge.net/aalib/ Source0: http://download.sourceforge.net/aa-project/%{name}-1.4%{rc_subver}.tar.gz @@ -85,6 +85,9 @@ touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/aalib-config $RPM_BUILD_ROOT%{_datadir}/ %{_datadir}/aclocal/aalib.m4 %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 1.4.0-0.43.rc5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 1.4.0-0.42.rc5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 67ec1e2cba722c07b489d77d3f55058ea436aab8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 20:19:28 +0000 Subject: [PATCH 10/23] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- aalib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aalib.spec b/aalib.spec index 011df26..74d90db 100644 --- a/aalib.spec +++ b/aalib.spec @@ -3,7 +3,7 @@ Summary: ASCII art library Name: aalib Version: 1.4.0 -Release: 0.43.%{rc_subver}%{?dist} +Release: 0.44.%{rc_subver}%{?dist} License: LGPLv2+ URL: http://aa-project.sourceforge.net/aalib/ Source0: http://download.sourceforge.net/aa-project/%{name}-1.4%{rc_subver}.tar.gz @@ -85,6 +85,9 @@ touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/aalib-config $RPM_BUILD_ROOT%{_datadir}/ %{_datadir}/aclocal/aalib.m4 %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 1.4.0-0.44.rc5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jan 19 2022 Fedora Release Engineering - 1.4.0-0.43.rc5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 757ddbdb7f8563bb5d8300d55edd7ec65b89ea07 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:17:06 +0000 Subject: [PATCH 11/23] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- aalib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aalib.spec b/aalib.spec index 74d90db..27fa3f9 100644 --- a/aalib.spec +++ b/aalib.spec @@ -3,7 +3,7 @@ Summary: ASCII art library Name: aalib Version: 1.4.0 -Release: 0.44.%{rc_subver}%{?dist} +Release: 0.45.%{rc_subver}%{?dist} License: LGPLv2+ URL: http://aa-project.sourceforge.net/aalib/ Source0: http://download.sourceforge.net/aa-project/%{name}-1.4%{rc_subver}.tar.gz @@ -85,6 +85,9 @@ touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/aalib-config $RPM_BUILD_ROOT%{_datadir}/ %{_datadir}/aclocal/aalib.m4 %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 1.4.0-0.45.rc5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jul 20 2022 Fedora Release Engineering - 1.4.0-0.44.rc5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 55e13614bff4ea3316e60eca037bb642a6e4fb4d Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Thu, 6 Apr 2023 15:28:08 +0200 Subject: [PATCH 12/23] Port to C99 Related to: --- aalib-c99.patch | 108 ++++++++++++++++++++++++++++++++++++++++++++++++ aalib.spec | 7 +++- 2 files changed, 114 insertions(+), 1 deletion(-) create mode 100644 aalib-c99.patch diff --git a/aalib-c99.patch b/aalib-c99.patch new file mode 100644 index 0000000..2a65cc2 --- /dev/null +++ b/aalib-c99.patch @@ -0,0 +1,108 @@ +Add additional system header #include directives for more +function prototypes. This avoids implicit function declarations +and build failures with future compilers. + +Submitted upstream: + +diff --git a/src/aafire.c b/src/aafire.c +index 4f36149aa84fba57..a59b5c5fa58e085b 100644 +--- a/src/aafire.c ++++ b/src/aafire.c +@@ -1,4 +1,5 @@ + #include ++#include + #include "aalib.h" + + #define XSIZ aa_imgwidth(context) +diff --git a/src/aainfo.c b/src/aainfo.c +index d3f6d50f34590638..f4250ee37ae46134 100644 +--- a/src/aainfo.c ++++ b/src/aainfo.c +@@ -1,3 +1,4 @@ ++#include + + #include "aalib.h" + #include "aaint.h" +diff --git a/src/aakbdreg.c b/src/aakbdreg.c +index def65fe25646d75a..682616313c1b6ebd 100644 +--- a/src/aakbdreg.c ++++ b/src/aakbdreg.c +@@ -1,4 +1,5 @@ + #include ++#include + #include "config.h" + #include "aalib.h" + #include "aaint.h" +diff --git a/src/aalib.c b/src/aalib.c +index 11fecc8fe8ef6b59..1ef12c0dfa9026a4 100644 +--- a/src/aalib.c ++++ b/src/aalib.c +@@ -1,4 +1,5 @@ + #include ++#include + #include + #include + #include "aalib.h" +diff --git a/src/aalinuxkbd.c b/src/aalinuxkbd.c +index c7f388abfe9e8c7f..ea988154518dfc8e 100644 +--- a/src/aalinuxkbd.c ++++ b/src/aalinuxkbd.c +@@ -8,6 +8,7 @@ + */ + + #include "config.h" ++#include + #ifdef LINUX_DRIVER + #include + #include +diff --git a/src/aamoureg.c b/src/aamoureg.c +index 03808289eb59b928..6d807416ae0d3dc2 100644 +--- a/src/aamoureg.c ++++ b/src/aamoureg.c +@@ -1,4 +1,5 @@ + #include ++#include + #include "config.h" + #include "aalib.h" + #include "aaint.h" +diff --git a/src/aaregist.c b/src/aaregist.c +index 54abec0b9797533a..768b8ce29e286b00 100644 +--- a/src/aaregist.c ++++ b/src/aaregist.c +@@ -1,4 +1,5 @@ + #include ++#include + #include "config.h" + #include "aalib.h" + #include "aaint.h" +diff --git a/src/aasavefont.c b/src/aasavefont.c +index b00e1e6d7f181952..864ba225d5ef626c 100644 +--- a/src/aasavefont.c ++++ b/src/aasavefont.c +@@ -1,3 +1,4 @@ ++#include + #include "aalib.h" + int main(int argc, char **argv) + { +diff --git a/src/aatest.c b/src/aatest.c +index 9816f5d855134894..89933cfba6344270 100644 +--- a/src/aatest.c ++++ b/src/aatest.c +@@ -1,3 +1,5 @@ ++#include ++#include + #include "aalib.h" + int main(int argc, char **argv) + { +diff --git a/src/aaxkbd.c b/src/aaxkbd.c +index f16afc63bb565512..44b91458b4bef3bc 100644 +--- a/src/aaxkbd.c ++++ b/src/aaxkbd.c +@@ -7,6 +7,7 @@ + #include + #include + #include ++#include + #include "aalib.h" + #include "aaint.h" + #include "aaxint.h" diff --git a/aalib.spec b/aalib.spec index 27fa3f9..bc020f2 100644 --- a/aalib.spec +++ b/aalib.spec @@ -3,7 +3,7 @@ Summary: ASCII art library Name: aalib Version: 1.4.0 -Release: 0.45.%{rc_subver}%{?dist} +Release: 0.46.%{rc_subver}%{?dist} License: LGPLv2+ URL: http://aa-project.sourceforge.net/aalib/ Source0: http://download.sourceforge.net/aa-project/%{name}-1.4%{rc_subver}.tar.gz @@ -13,6 +13,7 @@ Patch2: aalib-1.4rc5-bug149361.patch Patch3: aalib-1.4rc5-rpath.patch Patch4: aalib-1.4rc5-x_libs.patch Patch5: aalib-1.4rc5-libflag.patch +Patch6: aalib-c99.patch BuildRequires: slang-devel libXt-devel gpm-devel ncurses-devel BuildRequires: autoconf libtool BuildRequires: make @@ -46,6 +47,7 @@ with aalib. %patch3 -p1 -b .rpath %patch4 -p1 -b .x_libs %patch5 -p0 -b .libflag +%patch6 -p1 # included libtool is too old, we need to rebuild autoreconf -v -f -i @@ -85,6 +87,9 @@ touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/aalib-config $RPM_BUILD_ROOT%{_datadir}/ %{_datadir}/aclocal/aalib.m4 %changelog +* Thu Apr 06 2023 Florian Weimer - 1.4.0-0.46.rc5 +- Port to C99 + * Wed Jan 18 2023 Fedora Release Engineering - 1.4.0-0.45.rc5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From e3965d99a94504e4c131fd998a1000969f5a8da0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 12:46:56 +0000 Subject: [PATCH 13/23] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- aalib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aalib.spec b/aalib.spec index bc020f2..fa177ad 100644 --- a/aalib.spec +++ b/aalib.spec @@ -3,7 +3,7 @@ Summary: ASCII art library Name: aalib Version: 1.4.0 -Release: 0.46.%{rc_subver}%{?dist} +Release: 0.47.%{rc_subver}%{?dist} License: LGPLv2+ URL: http://aa-project.sourceforge.net/aalib/ Source0: http://download.sourceforge.net/aa-project/%{name}-1.4%{rc_subver}.tar.gz @@ -87,6 +87,9 @@ touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/aalib-config $RPM_BUILD_ROOT%{_datadir}/ %{_datadir}/aclocal/aalib.m4 %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 1.4.0-0.47.rc5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Apr 06 2023 Florian Weimer - 1.4.0-0.46.rc5 - Port to C99 From 3525f826db9748a8aacb3427357e2de404a6a200 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 11:58:06 +0000 Subject: [PATCH 14/23] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- aalib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aalib.spec b/aalib.spec index fa177ad..c770be9 100644 --- a/aalib.spec +++ b/aalib.spec @@ -3,7 +3,7 @@ Summary: ASCII art library Name: aalib Version: 1.4.0 -Release: 0.47.%{rc_subver}%{?dist} +Release: 0.48.%{rc_subver}%{?dist} License: LGPLv2+ URL: http://aa-project.sourceforge.net/aalib/ Source0: http://download.sourceforge.net/aa-project/%{name}-1.4%{rc_subver}.tar.gz @@ -87,6 +87,9 @@ touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/aalib-config $RPM_BUILD_ROOT%{_datadir}/ %{_datadir}/aclocal/aalib.m4 %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 1.4.0-0.48.rc5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 1.4.0-0.47.rc5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 719e6c6dd6e476de2ffcbaf665f25af611979863 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 22:32:10 +0000 Subject: [PATCH 15/23] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- aalib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aalib.spec b/aalib.spec index c770be9..3f8c27d 100644 --- a/aalib.spec +++ b/aalib.spec @@ -3,7 +3,7 @@ Summary: ASCII art library Name: aalib Version: 1.4.0 -Release: 0.48.%{rc_subver}%{?dist} +Release: 0.49.%{rc_subver}%{?dist} License: LGPLv2+ URL: http://aa-project.sourceforge.net/aalib/ Source0: http://download.sourceforge.net/aa-project/%{name}-1.4%{rc_subver}.tar.gz @@ -87,6 +87,9 @@ touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/aalib-config $RPM_BUILD_ROOT%{_datadir}/ %{_datadir}/aclocal/aalib.m4 %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 1.4.0-0.49.rc5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 1.4.0-0.48.rc5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 39b0b936152ef02c6a00a8a0afc3bd8c3cb409ea Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Sat, 10 Feb 2024 06:39:21 -0500 Subject: [PATCH 16/23] fix FTBFS, cleanups, gentoo patches --- aalib-1.4_rc5-fix-aarender.patch | 34 ++++++++++++++++++++++ aalib-1.4_rc5-free-offset-pointer.patch | 14 +++++++++ aalib-1.4rc5-opaque-ncurses-fix.patch | 14 +++++++++ aalib.spec | 38 ++++++++++++++++++------- 4 files changed, 89 insertions(+), 11 deletions(-) create mode 100644 aalib-1.4_rc5-fix-aarender.patch create mode 100644 aalib-1.4_rc5-free-offset-pointer.patch create mode 100644 aalib-1.4rc5-opaque-ncurses-fix.patch diff --git a/aalib-1.4_rc5-fix-aarender.patch b/aalib-1.4_rc5-fix-aarender.patch new file mode 100644 index 0000000..2c3d5bf --- /dev/null +++ b/aalib-1.4_rc5-fix-aarender.patch @@ -0,0 +1,34 @@ +This bug can be seen very clearly with e.g. mplayer -vo aa -monitoraspect 3 +in which case a big part of the picture is missing or there is even completely +black output. + +The reason for this is, when drawing only a part of the picture via aarender() +the first X coordinate is used for the loop count, but it is not applied to the +destination and source image index, thus instead of (re)drawing the middle part +of the image, it draws always the left part. + +Actual Results: +only the left part of the image is draw (depending on the video, only the left +black bar might be draw, so you will see nothing at all - if so use a slightly +smaller value for -monitoraspect). + +Expected Results: +All of the image should be drawn, and -monitoraspect should only squeeze the +image, not cause part of it to miss. + +Gentoo-bug: http://bugs.gentoo.org/id=214142 +Reported-by: Reimar Döffinger +Fixed-by: Reimar Döffinger +--- a/src/aarender.c.orig 2008-03-18 23:55:32.000000000 +0100 ++++ b/src/aarender.c 2008-03-18 23:55:50.000000000 +0100 +@@ -94,8 +94,8 @@ + gamma = randomval / 2; + mval = (c->parameters[c->filltable[255]].p[4]); + for (y = y1; y < y2; y++) { +- pos = 2 * y * wi; +- pos1 = y * aa_scrwidth(c); ++ pos = 2 * (y * wi + x1); ++ pos1 = y * aa_scrwidth(c) + x1; + esum = 0; + for (x = x1; x < x2; x++) { + i1 = table[((((int) c->imagebuffer[pos])))]; diff --git a/aalib-1.4_rc5-free-offset-pointer.patch b/aalib-1.4_rc5-free-offset-pointer.patch new file mode 100644 index 0000000..3ae697e --- /dev/null +++ b/aalib-1.4_rc5-free-offset-pointer.patch @@ -0,0 +1,14 @@ +--- a/src/aarender.c ++++ b/src/aarender.c +@@ -63,10 +63,10 @@ void aa_renderpalette(aa_context * c, __ + errors[0] = calloc(1, (x2 + 5) * sizeof(int)); + if (errors[0] == NULL) + dither = AA_ERRORDISTRIB; +- errors[0] += 3; + errors[1] = calloc(1, (x2 + 5) * sizeof(int)); + if (errors[1] == NULL) + free(errors[0]), dither = AA_ERRORDISTRIB; ++ errors[0] += 3; + errors[1] += 3; + cur = 0; + } diff --git a/aalib-1.4rc5-opaque-ncurses-fix.patch b/aalib-1.4rc5-opaque-ncurses-fix.patch new file mode 100644 index 0000000..42c430c --- /dev/null +++ b/aalib-1.4rc5-opaque-ncurses-fix.patch @@ -0,0 +1,14 @@ +diff -up aalib-1.4.0/src/aacurses.c.opaque-ncurses-fix aalib-1.4.0/src/aacurses.c +--- aalib-1.4.0/src/aacurses.c.opaque-ncurses-fix 2024-02-10 06:32:32.008267145 -0500 ++++ aalib-1.4.0/src/aacurses.c 2024-02-10 06:33:38.648245270 -0500 +@@ -71,8 +71,8 @@ static void curses_getsize(aa_context * + { + if (__resized_curses) + curses_uninit(c), curses_init(&c->params, NULL,&c->driverparams, NULL), __resized_curses = 0; +- *width = stdscr->_maxx + 1; +- *height = stdscr->_maxy + 1; ++ *width = getmaxx(stdscr); ++ *height = getmaxy(stdscr); + #ifdef GPM_MOUSEDRIVER + gpm_mx = *width; + gpm_my = *height; diff --git a/aalib.spec b/aalib.spec index 3f8c27d..1a7b0f1 100644 --- a/aalib.spec +++ b/aalib.spec @@ -3,8 +3,8 @@ Summary: ASCII art library Name: aalib Version: 1.4.0 -Release: 0.49.%{rc_subver}%{?dist} -License: LGPLv2+ +Release: 0.50.%{rc_subver}%{?dist} +License: LGPL-2.1-or-later URL: http://aa-project.sourceforge.net/aalib/ Source0: http://download.sourceforge.net/aa-project/%{name}-1.4%{rc_subver}.tar.gz Patch0: aalib-aclocal.patch @@ -13,10 +13,16 @@ Patch2: aalib-1.4rc5-bug149361.patch Patch3: aalib-1.4rc5-rpath.patch Patch4: aalib-1.4rc5-x_libs.patch Patch5: aalib-1.4rc5-libflag.patch -Patch6: aalib-c99.patch +Patch6: aalib-c99.patch +Patch7: https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/aalib/files/aalib-1.4_rc5-free-offset-pointer.patch +Patch8: https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/aalib/files/aalib-1.4_rc5-fix-aarender.patch +# Modern ncurses has an opaque WINDOW structure (you cannot address its members directly) +# Use the getmaxx() and getmaxy() functions provided by ncurses instead. +Patch9: aalib-1.4rc5-opaque-ncurses-fix.patch + BuildRequires: slang-devel libXt-devel gpm-devel ncurses-devel BuildRequires: autoconf libtool -BuildRequires: make +BuildRequires: make %description AA-lib is a low level gfx library just as many other libraries are. The @@ -41,13 +47,16 @@ with aalib. %prep %setup -q -%patch0 -p0 -%patch1 -p0 -%patch2 -p1 -b .bug149361 -%patch3 -p1 -b .rpath -%patch4 -p1 -b .x_libs -%patch5 -p0 -b .libflag -%patch6 -p1 +%patch -P0 -p0 +%patch -P1 -p0 +%patch -P2 -p1 -b .bug149361 +%patch -P3 -p1 -b .rpath +%patch -P4 -p1 -b .x_libs +%patch -P5 -p0 -b .libflag +%patch -P6 -p1 +%patch -P7 -p1 -b .free-offset-pointer +%patch -P8 -p1 -b .fix-aarender +%patch -P9 -p1 -b .opaque-ncurses-fix # included libtool is too old, we need to rebuild autoreconf -v -f -i @@ -87,6 +96,13 @@ touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/aalib-config $RPM_BUILD_ROOT%{_datadir}/ %{_datadir}/aclocal/aalib.m4 %changelog +* Sat Feb 10 2024 Tom Callaway - 1.4.0-0.50.rc5 +- apply two fixes from gentoo +- fix aalib to handle opaque WINDOW in ncurses +- fix license tag +- fix patch macro syntax +- fixes FTBFS + * Mon Jan 22 2024 Fedora Release Engineering - 1.4.0-0.49.rc5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From a4bdfb2cb87563107b89ec1a6fc7e568073150db Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 16:28:31 +0000 Subject: [PATCH 17/23] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- aalib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aalib.spec b/aalib.spec index 1a7b0f1..dfe6cad 100644 --- a/aalib.spec +++ b/aalib.spec @@ -3,7 +3,7 @@ Summary: ASCII art library Name: aalib Version: 1.4.0 -Release: 0.50.%{rc_subver}%{?dist} +Release: 0.51.%{rc_subver}%{?dist} License: LGPL-2.1-or-later URL: http://aa-project.sourceforge.net/aalib/ Source0: http://download.sourceforge.net/aa-project/%{name}-1.4%{rc_subver}.tar.gz @@ -96,6 +96,9 @@ touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/aalib-config $RPM_BUILD_ROOT%{_datadir}/ %{_datadir}/aclocal/aalib.m4 %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 1.4.0-0.51.rc5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Feb 10 2024 Tom Callaway - 1.4.0-0.50.rc5 - apply two fixes from gentoo - fix aalib to handle opaque WINDOW in ncurses From 45b3913b11b2c9e296efefcef1ac776a21db0d00 Mon Sep 17 00:00:00 2001 From: Xavier Bachelot Date: Fri, 4 Oct 2024 11:37:57 +0200 Subject: [PATCH 18/23] Do not BuildRequires gpm-devel on EL10 --- aalib.spec | 40 ++++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/aalib.spec b/aalib.spec index dfe6cad..7d0c117 100644 --- a/aalib.spec +++ b/aalib.spec @@ -1,9 +1,15 @@ %global rc_subver rc5 +%if 0%{?el10} +%bcond_with gpm +%else +%bcond_without gpm +%endif + Summary: ASCII art library Name: aalib Version: 1.4.0 -Release: 0.51.%{rc_subver}%{?dist} +Release: 0.52.%{rc_subver}%{?dist} License: LGPL-2.1-or-later URL: http://aa-project.sourceforge.net/aalib/ Source0: http://download.sourceforge.net/aa-project/%{name}-1.4%{rc_subver}.tar.gz @@ -11,18 +17,24 @@ Patch0: aalib-aclocal.patch Patch1: aalib-config-rpath.patch Patch2: aalib-1.4rc5-bug149361.patch Patch3: aalib-1.4rc5-rpath.patch -Patch4: aalib-1.4rc5-x_libs.patch -Patch5: aalib-1.4rc5-libflag.patch -Patch6: aalib-c99.patch -Patch7: https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/aalib/files/aalib-1.4_rc5-free-offset-pointer.patch -Patch8: https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/aalib/files/aalib-1.4_rc5-fix-aarender.patch +Patch4: aalib-1.4rc5-x_libs.patch +Patch5: aalib-1.4rc5-libflag.patch +Patch6: aalib-c99.patch +Patch7: https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/aalib/files/aalib-1.4_rc5-free-offset-pointer.patch +Patch8: https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/aalib/files/aalib-1.4_rc5-fix-aarender.patch # Modern ncurses has an opaque WINDOW structure (you cannot address its members directly) # Use the getmaxx() and getmaxy() functions provided by ncurses instead. Patch9: aalib-1.4rc5-opaque-ncurses-fix.patch -BuildRequires: slang-devel libXt-devel gpm-devel ncurses-devel -BuildRequires: autoconf libtool -BuildRequires: make +BuildRequires: autoconf +%if 0%{with gpm} +BuildRequires: gpm-devel +%endif +BuildRequires: libtool +BuildRequires: libXt-devel +BuildRequires: make +BuildRequires: ncurses-devel +BuildRequires: slang-devel %description AA-lib is a low level gfx library just as many other libraries are. The @@ -63,11 +75,11 @@ autoreconf -v -f -i %build %configure --disable-static --with-curses-driver=yes --with-ncurses -make %{?_smp_mflags} +%make_build %install -make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p" +%make_install rm -f $RPM_BUILD_ROOT{%{_libdir}/libaa.la,%{_infodir}/dir} # clean up multilib conflicts @@ -85,7 +97,7 @@ touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/aalib-config $RPM_BUILD_ROOT%{_datadir}/ %files libs %doc README ChangeLog NEWS %license COPYING -%{_libdir}/libaa.so.* +%{_libdir}/libaa.so.1* %files devel %{_bindir}/aalib-config @@ -96,6 +108,10 @@ touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/aalib-config $RPM_BUILD_ROOT%{_datadir}/ %{_datadir}/aclocal/aalib.m4 %changelog +* Fri Oct 04 2024 Xavier Bachelot - 1.4.0-0.52.rc5 +- Do not BuildRequires gpm-devel on EL10 +- Specfile clean up + * Wed Jul 17 2024 Fedora Release Engineering - 1.4.0-0.51.rc5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From d0b43be8d80d7c1facd8b3f7a579c58aa8518754 Mon Sep 17 00:00:00 2001 From: Xavier Bachelot Date: Fri, 3 Jan 2025 12:37:27 +0100 Subject: [PATCH 19/23] Re-enable gpm on EL10 --- aalib.spec | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/aalib.spec b/aalib.spec index 7d0c117..d47ca08 100644 --- a/aalib.spec +++ b/aalib.spec @@ -1,15 +1,9 @@ %global rc_subver rc5 -%if 0%{?el10} -%bcond_with gpm -%else -%bcond_without gpm -%endif - Summary: ASCII art library Name: aalib Version: 1.4.0 -Release: 0.52.%{rc_subver}%{?dist} +Release: 0.53.%{rc_subver}%{?dist} License: LGPL-2.1-or-later URL: http://aa-project.sourceforge.net/aalib/ Source0: http://download.sourceforge.net/aa-project/%{name}-1.4%{rc_subver}.tar.gz @@ -27,9 +21,7 @@ Patch8: https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/aalib Patch9: aalib-1.4rc5-opaque-ncurses-fix.patch BuildRequires: autoconf -%if 0%{with gpm} BuildRequires: gpm-devel -%endif BuildRequires: libtool BuildRequires: libXt-devel BuildRequires: make @@ -108,6 +100,9 @@ touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/aalib-config $RPM_BUILD_ROOT%{_datadir}/ %{_datadir}/aclocal/aalib.m4 %changelog +* Fri Jan 03 2025 Xavier Bachelot - 1.4.0-0.53.rc5 +- Re-enable gpm on EL10 + * Fri Oct 04 2024 Xavier Bachelot - 1.4.0-0.52.rc5 - Do not BuildRequires gpm-devel on EL10 - Specfile clean up From 9bb1400076ddec5d51a2c9589eb91fe31fe50506 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 10:26:19 +0000 Subject: [PATCH 20/23] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- aalib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aalib.spec b/aalib.spec index d47ca08..87ad1e7 100644 --- a/aalib.spec +++ b/aalib.spec @@ -3,7 +3,7 @@ Summary: ASCII art library Name: aalib Version: 1.4.0 -Release: 0.53.%{rc_subver}%{?dist} +Release: 0.54.%{rc_subver}%{?dist} License: LGPL-2.1-or-later URL: http://aa-project.sourceforge.net/aalib/ Source0: http://download.sourceforge.net/aa-project/%{name}-1.4%{rc_subver}.tar.gz @@ -100,6 +100,9 @@ touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/aalib-config $RPM_BUILD_ROOT%{_datadir}/ %{_datadir}/aclocal/aalib.m4 %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 1.4.0-0.54.rc5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jan 03 2025 Xavier Bachelot - 1.4.0-0.53.rc5 - Re-enable gpm on EL10 From 4944acc1b3319a87583442d56e265f8c11f92498 Mon Sep 17 00:00:00 2001 From: Tom spot Callaway Date: Mon, 3 Mar 2025 10:17:14 -0500 Subject: [PATCH 21/23] force std=gnu17 (it does not support C23), fixes FTBFS --- aalib.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/aalib.spec b/aalib.spec index 87ad1e7..ece382f 100644 --- a/aalib.spec +++ b/aalib.spec @@ -1,9 +1,10 @@ %global rc_subver rc5 +%global optflags %{optflags} -std=gnu17 Summary: ASCII art library Name: aalib Version: 1.4.0 -Release: 0.54.%{rc_subver}%{?dist} +Release: 0.55.%{rc_subver}%{?dist} License: LGPL-2.1-or-later URL: http://aa-project.sourceforge.net/aalib/ Source0: http://download.sourceforge.net/aa-project/%{name}-1.4%{rc_subver}.tar.gz @@ -100,6 +101,10 @@ touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/aalib-config $RPM_BUILD_ROOT%{_datadir}/ %{_datadir}/aclocal/aalib.m4 %changelog +* Mon Mar 3 2025 Tom Callaway - 1.4.0-0.55.rc5 +- force std=gnu17 (it does not support C23) +- fixes FTBFS + * Thu Jan 16 2025 Fedora Release Engineering - 1.4.0-0.54.rc5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 6f05cc2232d5b3b744ffc562cae91934d2860465 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 16:41:11 +0000 Subject: [PATCH 22/23] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- aalib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aalib.spec b/aalib.spec index ece382f..06061d6 100644 --- a/aalib.spec +++ b/aalib.spec @@ -4,7 +4,7 @@ Summary: ASCII art library Name: aalib Version: 1.4.0 -Release: 0.55.%{rc_subver}%{?dist} +Release: 0.56.%{rc_subver}%{?dist} License: LGPL-2.1-or-later URL: http://aa-project.sourceforge.net/aalib/ Source0: http://download.sourceforge.net/aa-project/%{name}-1.4%{rc_subver}.tar.gz @@ -101,6 +101,9 @@ touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/aalib-config $RPM_BUILD_ROOT%{_datadir}/ %{_datadir}/aclocal/aalib.m4 %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 1.4.0-0.56.rc5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Mar 3 2025 Tom Callaway - 1.4.0-0.55.rc5 - force std=gnu17 (it does not support C23) - fixes FTBFS From aa8d25ac810a920743e632075864a67828f39a0d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:22:30 +0000 Subject: [PATCH 23/23] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- aalib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aalib.spec b/aalib.spec index 06061d6..f43ae9c 100644 --- a/aalib.spec +++ b/aalib.spec @@ -4,7 +4,7 @@ Summary: ASCII art library Name: aalib Version: 1.4.0 -Release: 0.56.%{rc_subver}%{?dist} +Release: 0.57.%{rc_subver}%{?dist} License: LGPL-2.1-or-later URL: http://aa-project.sourceforge.net/aalib/ Source0: http://download.sourceforge.net/aa-project/%{name}-1.4%{rc_subver}.tar.gz @@ -101,6 +101,9 @@ touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/aalib-config $RPM_BUILD_ROOT%{_datadir}/ %{_datadir}/aclocal/aalib.m4 %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 1.4.0-0.57.rc5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Wed Jul 23 2025 Fedora Release Engineering - 1.4.0-0.56.rc5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild