From 33197ba969ace2e4102da8a9408e6118a5aff578 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 05:52:31 +0000 Subject: [PATCH 01/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- allegro.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/allegro.spec b/allegro.spec index c0b0703..b2142b0 100644 --- a/allegro.spec +++ b/allegro.spec @@ -6,7 +6,7 @@ Name: allegro Version: 4.4.2 -Release: 14%{?dist} +Release: 15%{?dist} Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -418,6 +418,9 @@ fi %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 4.4.2-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Wed Feb 03 2016 Fedora Release Engineering - 4.4.2-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 90164e881c7562da42296c18ee017132fcba942a Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Wed, 15 Mar 2017 17:11:44 +0100 Subject: [PATCH 02/42] Fix FBTFS --- allegro-4.4.2-Werror-format-security.patch | 95 ++++++++++++++++++++++ allegro.spec | 7 +- 2 files changed, 101 insertions(+), 1 deletion(-) create mode 100644 allegro-4.4.2-Werror-format-security.patch diff --git a/allegro-4.4.2-Werror-format-security.patch b/allegro-4.4.2-Werror-format-security.patch new file mode 100644 index 0000000..f2b837c --- /dev/null +++ b/allegro-4.4.2-Werror-format-security.patch @@ -0,0 +1,95 @@ +diff -up allegro-4.4.2/src/unix/umodules.c~ allegro-4.4.2/src/unix/umodules.c +--- allegro-4.4.2/src/unix/umodules.c~ 2011-05-13 10:11:33.000000000 +0200 ++++ allegro-4.4.2/src/unix/umodules.c 2017-03-15 14:42:39.822612368 +0100 +@@ -126,11 +126,11 @@ void _unix_load_modules(int system_drive + continue; + + if (!fullpath_slash) { +- snprintf(fullpath, sizeof fullpath, filename); ++ snprintf(fullpath, sizeof fullpath, "%s", filename); + fullpath[(sizeof fullpath) - 1] = 0; + } + else { +- snprintf(fullpath_slash+1, (sizeof fullpath) - (fullpath_slash - fullpath) - 1, filename); ++ snprintf(fullpath_slash+1, (sizeof fullpath) - (fullpath_slash - fullpath) - 1, "%s", filename); + fullpath[(sizeof fullpath) - 1] = 0; + } + +diff -up allegro-4.4.2/src/linux/ljoy.c~ allegro-4.4.2/src/linux/ljoy.c +--- allegro-4.4.2/src/linux/ljoy.c~ 2010-02-20 06:18:16.000000000 +0100 ++++ allegro-4.4.2/src/linux/ljoy.c 2017-03-15 14:52:28.474215615 +0100 +@@ -93,7 +93,7 @@ static int joy_init(void) + + if (ioctl(joy_fd[i], JSIOCGVERSION, &raw_version) < 0) { + /* NOTE: IOCTL fails if the joystick API is version 0.x */ +- uszprintf(allegro_error, ALLEGRO_ERROR_SIZE, get_config_text("Your Linux joystick API is version 0.x which is unsupported.")); ++ uszprintf(allegro_error, ALLEGRO_ERROR_SIZE, "%s", get_config_text("Your Linux joystick API is version 0.x which is unsupported.")); + return -1; + } + +diff -up allegro-4.4.2/examples/extrans2.c~ allegro-4.4.2/examples/extrans2.c +--- allegro-4.4.2/examples/extrans2.c~ 2008-01-30 11:56:50.000000000 +0100 ++++ allegro-4.4.2/examples/extrans2.c 2017-03-15 15:43:03.494831521 +0100 +@@ -211,7 +211,7 @@ int main(int argc, char **argv) + } else { + msg = "no flipping"; + } +- textprintf_ex(buffer, font, 1, 1, makecol(255, 255, 255), -1, msg); ++ textprintf_ex(buffer, font, 1, 1, makecol(255, 255, 255), -1, "%s", msg); + + /* finally blit the back buffer on the screen */ + blit(buffer, screen, 0, 0, 0, 0, buffer->w, buffer->h); +diff -up allegro-4.4.2/setup/setup.c~ allegro-4.4.2/setup/setup.c +--- allegro-4.4.2/setup/setup.c~ 2010-05-23 18:05:33.000000000 +0200 ++++ allegro-4.4.2/setup/setup.c 2017-03-15 16:13:42.243136380 +0100 +@@ -1163,7 +1163,7 @@ static void plot_joystick_state(BITMAP * + textprintf_ex(bmp, font, SCREEN_W/2-96, SCREEN_H/2-60+c*20, -1, -1, uconvert_ascii("%s (%d/%d)", tmp), + joystick_driver->name, i+1, num_joysticks); + else +- textprintf_ex(bmp, font, SCREEN_W/2-96, SCREEN_H/2-60+c*20, -1, -1, joystick_driver->name); ++ textprintf_ex(bmp, font, SCREEN_W/2-96, SCREEN_H/2-60+c*20, -1, -1, "%s", joystick_driver->name); + c++; + } + +@@ -2879,7 +2879,7 @@ int main(void) + alert(uconvert_ascii("Error loading " SETUP_DATA_FILE, tmp1), NULL, NULL, uconvert_ascii("OK", tmp2), NULL, 13, 0); + #else + set_gfx_mode(GFX_TEXT, 0, 0, 0, 0); +- allegro_message(uconvert_ascii("Error loading " SETUP_DATA_FILE "\n", tmp1)); ++ allegro_message("%s", uconvert_ascii("Error loading " SETUP_DATA_FILE "\n", tmp1)); + #endif + return 1; + } +diff -up allegro-4.4.2/examples/exkeys.c~ allegro-4.4.2/examples/exkeys.c +--- allegro-4.4.2/examples/exkeys.c~ 2008-01-10 20:46:00.000000000 +0100 ++++ allegro-4.4.2/examples/exkeys.c 2017-03-15 16:17:30.268545467 +0100 +@@ -193,7 +193,7 @@ int main(void) + if (key_shifts & KB_NUMLOCK_FLAG) strcat(buf, " num"); + if (key_shifts & KB_SCROLOCK_FLAG) strcat(buf, " scrl"); + scroll(); +- textprintf_ex(screen, font, 8, SCREEN_H-16, makecol(0, 0, 0), makecol(255, 255, 255), buf); ++ textprintf_ex(screen, font, 8, SCREEN_H-16, makecol(0, 0, 0), makecol(255, 255, 255), "%s", buf); + } while (k != 27); + + /* various scan codes are defined in allegro.h as KEY_* constants */ +@@ -234,7 +234,7 @@ int main(void) + if (key[KEY_8]) buf[8] = '8'; else buf[8] = ' '; + if (key[KEY_9]) buf[9] = '9'; else buf[9] = ' '; + buf[10] = 0; +- textprintf_ex(screen, font, 8, SCREEN_H-16, makecol(0, 0, 0), makecol(255, 255, 255), buf); ++ textprintf_ex(screen, font, 8, SCREEN_H-16, makecol(0, 0, 0), makecol(255, 255, 255), "%s", buf); + rest(1); + } while (!keypressed() || (readkey() >> 8) != KEY_ESC); + +diff -up allegro-4.4.2/tests/play.c~ allegro-4.4.2/tests/play.c +--- allegro-4.4.2/tests/play.c~ 2005-03-19 12:15:07.000000000 +0100 ++++ allegro-4.4.2/tests/play.c 2017-03-15 16:35:18.628156496 +0100 +@@ -74,7 +74,7 @@ void usage(void) + + strcat(msg, "\nIf you don't specify the card, Allegro will auto-detect (ie. guess :-)\n"); + +- allegro_message(msg); ++ allegro_message("%s", msg); + free(msg); + } + diff --git a/allegro.spec b/allegro.spec index b2142b0..e3bb2b7 100644 --- a/allegro.spec +++ b/allegro.spec @@ -6,7 +6,7 @@ Name: allegro Version: 4.4.2 -Release: 15%{?dist} +Release: 16%{?dist} Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -31,6 +31,7 @@ Patch8: allegro-4.4.2-mutex-fix.patch Patch9: allegro-4.4.2-no-xsync-from-thread.patch # gnome-shell starts apps while gnome-shell has the keyb grabbed... Patch10: allegro-4.4.2-keybgrab-fix.patch +Patch11: allegro-4.4.2-Werror-format-security.patch BuildRequires: texinfo cmake BuildRequires: xorg-x11-proto-devel libX11-devel libXpm-devel libXcursor-devel BuildRequires: libXxf86vm-devel libXxf86dga-devel libGL-devel libGLU-devel @@ -250,6 +251,7 @@ developing applications that use logg. %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 %build @@ -418,6 +420,9 @@ fi %changelog +* Wed Mar 15 2017 Hans de Goede - 4.4.2-16 +- Fix FBTFS + * Fri Feb 10 2017 Fedora Release Engineering - 4.4.2-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 9317db5864341d9f25dd15048ae8f20e31433e8b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 02:45:24 +0000 Subject: [PATCH 03/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- allegro.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/allegro.spec b/allegro.spec index e3bb2b7..f2f6144 100644 --- a/allegro.spec +++ b/allegro.spec @@ -6,7 +6,7 @@ Name: allegro Version: 4.4.2 -Release: 16%{?dist} +Release: 17%{?dist} Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -420,6 +420,9 @@ fi %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 4.4.2-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Wed Mar 15 2017 Hans de Goede - 4.4.2-16 - Fix FBTFS From 8aabfa39eefbca815818f535eede0ec906d733a2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 17:30:11 +0000 Subject: [PATCH 04/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- allegro.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/allegro.spec b/allegro.spec index f2f6144..d61ad94 100644 --- a/allegro.spec +++ b/allegro.spec @@ -6,7 +6,7 @@ Name: allegro Version: 4.4.2 -Release: 17%{?dist} +Release: 18%{?dist} Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -420,6 +420,9 @@ fi %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 4.4.2-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 4.4.2-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 9f64535323091488172d86a2788238bd564ec892 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 02:06:49 +0000 Subject: [PATCH 05/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- allegro.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/allegro.spec b/allegro.spec index d61ad94..30bad6a 100644 --- a/allegro.spec +++ b/allegro.spec @@ -6,7 +6,7 @@ Name: allegro Version: 4.4.2 -Release: 18%{?dist} +Release: 19%{?dist} Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -420,6 +420,9 @@ fi %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 4.4.2-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Aug 02 2017 Fedora Release Engineering - 4.4.2-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 4e815d69d73ad73ee3af023947747ee7aedab696 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Tue, 29 May 2018 13:12:49 +0200 Subject: [PATCH 06/42] Fix PPC allegro app builds failing due to alcompat.h defining aliases for fadd / fdiv / fmull which conflict with system headers (#1582916, #1582917) Modernize spec-file a bit --- allegro-4.4.2-no-fix-aliases.patch | 12 +++++++++++ allegro.spec | 32 +++++++++++++----------------- 2 files changed, 26 insertions(+), 18 deletions(-) create mode 100644 allegro-4.4.2-no-fix-aliases.patch diff --git a/allegro-4.4.2-no-fix-aliases.patch b/allegro-4.4.2-no-fix-aliases.patch new file mode 100644 index 0000000..d3c7830 --- /dev/null +++ b/allegro-4.4.2-no-fix-aliases.patch @@ -0,0 +1,12 @@ +diff -up allegro-4.4.2/include/allegro/alcompat.h~ allegro-4.4.2/include/allegro/alcompat.h +--- allegro-4.4.2/include/allegro/alcompat.h~ 2009-12-20 02:10:56.000000000 +0100 ++++ allegro-4.4.2/include/allegro/alcompat.h 2018-05-29 12:57:32.182913729 +0200 +@@ -40,7 +40,7 @@ + #endif + #endif + +- #ifndef ALLEGRO_NO_FIX_ALIASES ++ #ifdef ALLEGRO_FIX_ALIASES + AL_ALIAS(fixed fadd(fixed x, fixed y), fixadd(x, y)) + AL_ALIAS(fixed fsub(fixed x, fixed y), fixsub(x, y)) + AL_ALIAS(fixed fmul(fixed x, fixed y), fixmul(x, y)) diff --git a/allegro.spec b/allegro.spec index 30bad6a..2fce1fa 100644 --- a/allegro.spec +++ b/allegro.spec @@ -6,7 +6,7 @@ Name: allegro Version: 4.4.2 -Release: 19%{?dist} +Release: 20%{?dist} Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -23,8 +23,11 @@ Patch2: allegro-4.0.3-libdir.patch Patch3: allegro-4.2.3-pack-formatstring.patch Patch4: allegro-4.4.2-dynamic-addons.patch Patch5: allegro-4.4.2-buildsys-fix.patch +%if ! 0%{?fedora}%{?rhel} || 0%{?fedora} >= 20 || 0%{?rhel} >= 8 Patch6: allegro-4.4.2-doc-noversion.patch +%else Patch7: allegro-4.4.2-doc-install.patch +%endif # Replace racy recursive mutex implementation with proper recursive mutexes Patch8: allegro-4.4.2-mutex-fix.patch # Calling Xsync from the bg thread causes deadlock issues @@ -32,6 +35,8 @@ Patch9: allegro-4.4.2-no-xsync-from-thread.patch # gnome-shell starts apps while gnome-shell has the keyb grabbed... Patch10: allegro-4.4.2-keybgrab-fix.patch Patch11: allegro-4.4.2-Werror-format-security.patch +# PPC builds fail when we define aliases for fadd / fdiv / fmull +Patch12: allegro-4.4.2-no-fix-aliases.patch BuildRequires: texinfo cmake BuildRequires: xorg-x11-proto-devel libX11-devel libXpm-devel libXcursor-devel BuildRequires: libXxf86vm-devel libXxf86dga-devel libGL-devel libGLU-devel @@ -237,21 +242,7 @@ developing applications that use logg. %prep -%setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%if ! 0%{?fedora}%{?rhel} || 0%{?fedora} >= 20 || 0%{?rhel} >= 8 -%patch6 -p1 -%else -%patch7 -p1 -%endif -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 +%autosetup -p1 %build @@ -271,7 +262,7 @@ done %install -make install DESTDIR=$RPM_BUILD_ROOT +%make_install # installation of these is broken, because they use a cmake GLOB, but # that gets "resolved" when runnning cmake, and at that time the files # to install aren't generated yet ... @@ -320,8 +311,8 @@ fi %doc %{_maindocdir}/THANKS %doc %{_maindocdir}/addons.txt %doc %{_maindocdir}/faq.txt -%doc %{_maindocdir}/license.txt %doc %{_maindocdir}/readme.txt +%license %{_maindocdir}/license.txt %config(noreplace) %{_sysconfdir}/allegrorc %{_libdir}/liballeg.so.4* %{_libdir}/allegro @@ -420,6 +411,11 @@ fi %changelog +* Tue May 29 2018 Hans de Goede - 4.4.2-20 +- Fix PPC allegro app builds failing due to alcompat.h defining aliases for + fadd / fdiv / fmull which conflict with system headers (#1582916, #1582917) +- Modernize spec-file a bit + * Wed Feb 07 2018 Fedora Release Engineering - 4.4.2-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From e467f37ab32dea6e0bdbf05565871a3bb20307e3 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:42 +0200 Subject: [PATCH 07/42] add BuildRequires: gcc-c++,gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- allegro.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/allegro.spec b/allegro.spec index 2fce1fa..e89b64a 100644 --- a/allegro.spec +++ b/allegro.spec @@ -37,6 +37,8 @@ Patch10: allegro-4.4.2-keybgrab-fix.patch Patch11: allegro-4.4.2-Werror-format-security.patch # PPC builds fail when we define aliases for fadd / fdiv / fmull Patch12: allegro-4.4.2-no-fix-aliases.patch +BuildRequires: gcc +BuildRequires: gcc-c++ BuildRequires: texinfo cmake BuildRequires: xorg-x11-proto-devel libX11-devel libXpm-devel libXcursor-devel BuildRequires: libXxf86vm-devel libXxf86dga-devel libGL-devel libGLU-devel From a7f5ef751bbb1ae0def3833cf34c30520cb9afb1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 20:08:11 +0000 Subject: [PATCH 08/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- allegro.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/allegro.spec b/allegro.spec index e89b64a..5f5b5d2 100644 --- a/allegro.spec +++ b/allegro.spec @@ -6,7 +6,7 @@ Name: allegro Version: 4.4.2 -Release: 20%{?dist} +Release: 21%{?dist} Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -413,6 +413,9 @@ fi %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 4.4.2-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Tue May 29 2018 Hans de Goede - 4.4.2-20 - Fix PPC allegro app builds failing due to alcompat.h defining aliases for fadd / fdiv / fmull which conflict with system headers (#1582916, #1582917) From a62db8060f8f47f46b2a4e186f247cc5bf2e2e60 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 22 Jan 2019 18:38:30 +0100 Subject: [PATCH 09/42] Remove obsolete ldconfig scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- allegro.spec | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/allegro.spec b/allegro.spec index 5f5b5d2..66a1388 100644 --- a/allegro.spec +++ b/allegro.spec @@ -282,8 +282,7 @@ install -pm 644 keyboard.dat language.dat $RPM_BUILD_ROOT%{_datadir}/allegro install -Dpm 644 misc/allegro.m4 $RPM_BUILD_ROOT%{_datadir}/aclocal/allegro.m4 -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %post devel /sbin/install-info %{_infodir}/allegro.info %{_infodir}/dir 2>/dev/null || : @@ -294,17 +293,13 @@ if [ $1 -eq 0 ] ; then 2>/dev/null || : fi -%post -n alleggl -p /sbin/ldconfig -%postun -n alleggl -p /sbin/ldconfig +%ldconfig_scriptlets -n alleggl -%post -n jpgalleg -p /sbin/ldconfig -%postun -n jpgalleg -p /sbin/ldconfig +%ldconfig_scriptlets -n jpgalleg -%post loadpng -p /sbin/ldconfig -%postun loadpng -p /sbin/ldconfig +%ldconfig_scriptlets loadpng -%post logg -p /sbin/ldconfig -%postun logg -p /sbin/ldconfig +%ldconfig_scriptlets logg %files From 2edc2d7ce532b3b31fa27b9872b9dc86094059ba Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 27 Jan 2019 15:24:04 +0100 Subject: [PATCH 10/42] Remove obsolete scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- allegro.spec | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/allegro.spec b/allegro.spec index 66a1388..1a06b44 100644 --- a/allegro.spec +++ b/allegro.spec @@ -76,8 +76,6 @@ Summary(cs): Knihovna pro programování her Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release}, xorg-x11-proto-devel Requires: libX11-devel, libXcursor-devel -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info %description devel Allegro is a cross-platform library intended for use in computer games @@ -283,16 +281,6 @@ install -Dpm 644 misc/allegro.m4 $RPM_BUILD_ROOT%{_datadir}/aclocal/allegro.m4 %ldconfig_scriptlets - -%post devel -/sbin/install-info %{_infodir}/allegro.info %{_infodir}/dir 2>/dev/null || : - -%preun devel -if [ $1 -eq 0 ] ; then - /sbin/install-info --delete %{_infodir}/allegro.info %{_infodir}/dir \ - 2>/dev/null || : -fi - %ldconfig_scriptlets -n alleggl %ldconfig_scriptlets -n jpgalleg From 51d611e286b31bda3517fce463ef9d3521f464f9 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:38 +0100 Subject: [PATCH 11/42] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- allegro.spec | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/allegro.spec b/allegro.spec index 1a06b44..13fee1d 100644 --- a/allegro.spec +++ b/allegro.spec @@ -14,7 +14,6 @@ Summary(fr): Une librairie de programmation de jeux Summary(it): Una libreria per la programmazione di videogiochi Summary(cs): Knihovna pro programování her -Group: System Environment/Libraries License: Giftware URL: http://alleg.sourceforge.net/ Source: http://downloads.sourceforge.net/alleg/allegro-%{version}.tar.gz @@ -73,7 +72,6 @@ Summary(es): Una libreria de programacion de juegos Summary(fr): Une librairie de programmation de jeux Summary(it): Una libreria per la programmazione di videogiochi Summary(cs): Knihovna pro programování her -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release}, xorg-x11-proto-devel Requires: libX11-devel, libXcursor-devel @@ -109,7 +107,6 @@ Summary(es): Herramientas adicionales para la librería de programación Alle Summary(fr): Outils supplémentaires pour la librairie de programmation Allegro Summary(it): Programmi di utilità aggiuntivi per la libreria Allegro Summary(cs): Přídavné nástroje pro programovou knihovnu Allegro -Group: Development/Tools Requires: %{name}%{?_isa} = %{version}-%{release} @@ -143,7 +140,6 @@ které jsou užitečné pro vývoj Allegro programů. %package jack-plugin Summary: Allegro JACK (Jack Audio Connection Kit) plugin -Group: System Environment/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} %description jack-plugin @@ -153,7 +149,6 @@ sound through JACK (Jack Audio Connection Kit). %package -n alleggl Summary: OpenGL support library for Allegro -Group: System Environment/Libraries License: zlib or GPL+ URL: http://allegrogl.sourceforge.net/ Requires: %{name}%{?_isa} = %{version}-%{release} @@ -167,7 +162,6 @@ that things like glut do. %package -n alleggl-devel Summary: Development files for alleggl -Group: Development/Libraries License: zlib or GPL+ Requires: alleggl%{?_isa} = %{version}-%{release} @@ -178,7 +172,6 @@ developing applications that use alleggl. %package -n jpgalleg Summary: JPEG library for the Allegro game library -Group: System Environment/Libraries License: zlib URL: http://www.ecplusplus.com/index.php?page=projects&pid=1 Requires: %{name}%{?_isa} = %{version}-%{release} @@ -189,7 +182,6 @@ using jpeg's as Allegro bitmaps. %package -n jpgalleg-devel Summary: Development files for jpgalleg -Group: Development/Libraries License: zlib Requires: jpgalleg%{?_isa} = %{version}-%{release} @@ -200,7 +192,6 @@ developing applications that use jpgalleg. %package loadpng Summary: OGG/Vorbis library for the Allegro game library -Group: System Environment/Libraries License: Public Domain URL: http://wiki.allegro.cc/index.php?title=LoadPNG Requires: %{name}%{?_isa} = %{version}-%{release} @@ -211,7 +202,6 @@ save bitmaps from Allegro programs. %package loadpng-devel Summary: Development files for loadpng -Group: Development/Libraries License: Public Domain Requires: %{name}-loadpng%{?_isa} = %{version}-%{release} @@ -222,7 +212,6 @@ developing applications that use loadpng. %package logg Summary: OGG/Vorbis library for the Allegro game library -Group: System Environment/Libraries License: MIT URL: http://trent.gamblin.ca/logg/ Requires: %{name}%{?_isa} = %{version}-%{release} @@ -232,7 +221,6 @@ LOGG is an Allegro add-on library for playing OGG/Vorbis audio files. %package logg-devel Summary: Development files for logg -Group: Development/Libraries License: MIT Requires: %{name}-logg%{?_isa} = %{version}-%{release} From 81c2494da78bcba57bd7e3f2132372d609d6bb15 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 13:11:13 +0000 Subject: [PATCH 12/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- allegro.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/allegro.spec b/allegro.spec index 13fee1d..8a6c5d2 100644 --- a/allegro.spec +++ b/allegro.spec @@ -6,7 +6,7 @@ Name: allegro Version: 4.4.2 -Release: 21%{?dist} +Release: 22%{?dist} Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -384,6 +384,9 @@ install -Dpm 644 misc/allegro.m4 $RPM_BUILD_ROOT%{_datadir}/aclocal/allegro.m4 %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 4.4.2-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Jul 12 2018 Fedora Release Engineering - 4.4.2-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From a4883794eda094aac958d606ba82316b193ed95e Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 17 Feb 2019 00:28:59 +0100 Subject: [PATCH 13/42] Fix FTBFS (rhbz#1674575) --- allegro-4.4.2-ftbfs.patch | 39 +++++++++++++++++++++++++++++++++++++++ allegro.spec | 7 ++++++- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 allegro-4.4.2-ftbfs.patch diff --git a/allegro-4.4.2-ftbfs.patch b/allegro-4.4.2-ftbfs.patch new file mode 100644 index 0000000..093df69 --- /dev/null +++ b/allegro-4.4.2-ftbfs.patch @@ -0,0 +1,39 @@ +diff -up allegro-4.4.2/addons/allegrogl/include/alleggl.h~ allegro-4.4.2/addons/allegrogl/include/alleggl.h +--- allegro-4.4.2/addons/allegrogl/include/alleggl.h~ 2019-02-17 00:22:14.000000000 +0100 ++++ allegro-4.4.2/addons/allegrogl/include/alleggl.h 2019-02-17 00:23:57.342718525 +0100 +@@ -60,12 +60,9 @@ typedef __int64 INT64; + + #else /* ALLEGRO_MACOSX */ + +-/* HACK: Prevent both Mesa and SGI's broken headers from screwing us */ +-#define __glext_h_ +-#define __glxext_h_ ++#define GL_GLEXT_PROTOTYPES ++#define GLX_GLXEXT_PROTOTYPES + #include +-#undef __glext_h_ +-#undef __glxext_h_ + + #endif /* ALLEGRO_MACOSX */ + +diff -up allegro-4.4.2/addons/allegrogl/src/x.c~ allegro-4.4.2/addons/allegrogl/src/x.c +--- allegro-4.4.2/addons/allegrogl/src/x.c~ 2009-10-17 09:05:52.000000000 +0200 ++++ allegro-4.4.2/addons/allegrogl/src/x.c 2019-02-17 00:23:20.470661820 +0100 +@@ -650,7 +650,7 @@ static int decode_fbconfig (GLXFBConfig + return -1; + } + +- if (!(render_type & GLX_RGBA_BIT) && !(render_type & GLX_RGBA_FLOAT_BIT)) { ++ if (!(render_type & GLX_RGBA_BIT) && !(render_type & GLX_RGBA_FLOAT_BIT_ARB)) { + TRACE(PREFIX_I "decode_fbconfig: Not RGBA mode\n"); + return -1; + } +@@ -674,7 +674,7 @@ static int decode_fbconfig (GLXFBConfig + /* Floating-point depth is not supported as glx extension (yet). */ + i->float_depth = 0; + +- i->float_color = (render_type & GLX_RGBA_FLOAT_BIT); ++ i->float_color = (render_type & GLX_RGBA_FLOAT_BIT_ARB); + + v = glXGetVisualFromFBConfig(_xwin.display, fbc); + if (!v) { diff --git a/allegro.spec b/allegro.spec index 8a6c5d2..74b022f 100644 --- a/allegro.spec +++ b/allegro.spec @@ -6,7 +6,7 @@ Name: allegro Version: 4.4.2 -Release: 22%{?dist} +Release: 23%{?dist} Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -36,6 +36,8 @@ Patch10: allegro-4.4.2-keybgrab-fix.patch Patch11: allegro-4.4.2-Werror-format-security.patch # PPC builds fail when we define aliases for fadd / fdiv / fmull Patch12: allegro-4.4.2-no-fix-aliases.patch +# Fix build errors with modern GL headers +Patch13: allegro-4.4.2-ftbfs.patch BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: texinfo cmake @@ -384,6 +386,9 @@ install -Dpm 644 misc/allegro.m4 $RPM_BUILD_ROOT%{_datadir}/aclocal/allegro.m4 %changelog +* Sat Feb 16 2019 Hans de Goede - 4.4.2-23 +- Fix FTBFS (rhbz#1674575) + * Thu Jan 31 2019 Fedora Release Engineering - 4.4.2-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 450f38b7e906906c2f2405feb968daa487a8d900 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 18 Feb 2019 09:55:37 +0100 Subject: [PATCH 14/42] New upstream release 4.4.3 --- .gitignore | 1 + allegro-4.2.3-pack-formatstring.patch | 12 --- allegro-4.4.2-Werror-format-security.patch | 95 ---------------------- allegro-4.4.2-compat-fix-aliases.patch | 27 ++++++ allegro-4.4.2-dynamic-addons.patch | 16 ---- allegro-4.4.2-ftbfs.patch | 39 --------- allegro-4.4.2-no-fix-aliases.patch | 12 --- allegro.spec | 20 ++--- sources | 2 +- 9 files changed, 38 insertions(+), 186 deletions(-) delete mode 100644 allegro-4.2.3-pack-formatstring.patch delete mode 100644 allegro-4.4.2-Werror-format-security.patch create mode 100644 allegro-4.4.2-compat-fix-aliases.patch delete mode 100644 allegro-4.4.2-dynamic-addons.patch delete mode 100644 allegro-4.4.2-ftbfs.patch delete mode 100644 allegro-4.4.2-no-fix-aliases.patch diff --git a/.gitignore b/.gitignore index 04aa4be..117cc77 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ allegro-4.2.3.tar.gz /allegro-4.4.2.tar.gz +/allegro-4.4.3.tar.gz diff --git a/allegro-4.2.3-pack-formatstring.patch b/allegro-4.2.3-pack-formatstring.patch deleted file mode 100644 index ea6188f..0000000 --- a/allegro-4.2.3-pack-formatstring.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up allegro-4.2.3/tools/pack.c~ allegro-4.2.3/tools/pack.c ---- allegro-4.2.3/tools/pack.c~ 2006-05-20 16:49:58.000000000 +0200 -+++ allegro-4.2.3/tools/pack.c 2010-12-30 11:20:42.425231307 +0100 -@@ -42,7 +42,7 @@ static void err(char *s1, char *s2) - printf(": %s", s1); - - if (s2) -- printf(s2); -+ printf("%s", s2); - - printf("\n"); - diff --git a/allegro-4.4.2-Werror-format-security.patch b/allegro-4.4.2-Werror-format-security.patch deleted file mode 100644 index f2b837c..0000000 --- a/allegro-4.4.2-Werror-format-security.patch +++ /dev/null @@ -1,95 +0,0 @@ -diff -up allegro-4.4.2/src/unix/umodules.c~ allegro-4.4.2/src/unix/umodules.c ---- allegro-4.4.2/src/unix/umodules.c~ 2011-05-13 10:11:33.000000000 +0200 -+++ allegro-4.4.2/src/unix/umodules.c 2017-03-15 14:42:39.822612368 +0100 -@@ -126,11 +126,11 @@ void _unix_load_modules(int system_drive - continue; - - if (!fullpath_slash) { -- snprintf(fullpath, sizeof fullpath, filename); -+ snprintf(fullpath, sizeof fullpath, "%s", filename); - fullpath[(sizeof fullpath) - 1] = 0; - } - else { -- snprintf(fullpath_slash+1, (sizeof fullpath) - (fullpath_slash - fullpath) - 1, filename); -+ snprintf(fullpath_slash+1, (sizeof fullpath) - (fullpath_slash - fullpath) - 1, "%s", filename); - fullpath[(sizeof fullpath) - 1] = 0; - } - -diff -up allegro-4.4.2/src/linux/ljoy.c~ allegro-4.4.2/src/linux/ljoy.c ---- allegro-4.4.2/src/linux/ljoy.c~ 2010-02-20 06:18:16.000000000 +0100 -+++ allegro-4.4.2/src/linux/ljoy.c 2017-03-15 14:52:28.474215615 +0100 -@@ -93,7 +93,7 @@ static int joy_init(void) - - if (ioctl(joy_fd[i], JSIOCGVERSION, &raw_version) < 0) { - /* NOTE: IOCTL fails if the joystick API is version 0.x */ -- uszprintf(allegro_error, ALLEGRO_ERROR_SIZE, get_config_text("Your Linux joystick API is version 0.x which is unsupported.")); -+ uszprintf(allegro_error, ALLEGRO_ERROR_SIZE, "%s", get_config_text("Your Linux joystick API is version 0.x which is unsupported.")); - return -1; - } - -diff -up allegro-4.4.2/examples/extrans2.c~ allegro-4.4.2/examples/extrans2.c ---- allegro-4.4.2/examples/extrans2.c~ 2008-01-30 11:56:50.000000000 +0100 -+++ allegro-4.4.2/examples/extrans2.c 2017-03-15 15:43:03.494831521 +0100 -@@ -211,7 +211,7 @@ int main(int argc, char **argv) - } else { - msg = "no flipping"; - } -- textprintf_ex(buffer, font, 1, 1, makecol(255, 255, 255), -1, msg); -+ textprintf_ex(buffer, font, 1, 1, makecol(255, 255, 255), -1, "%s", msg); - - /* finally blit the back buffer on the screen */ - blit(buffer, screen, 0, 0, 0, 0, buffer->w, buffer->h); -diff -up allegro-4.4.2/setup/setup.c~ allegro-4.4.2/setup/setup.c ---- allegro-4.4.2/setup/setup.c~ 2010-05-23 18:05:33.000000000 +0200 -+++ allegro-4.4.2/setup/setup.c 2017-03-15 16:13:42.243136380 +0100 -@@ -1163,7 +1163,7 @@ static void plot_joystick_state(BITMAP * - textprintf_ex(bmp, font, SCREEN_W/2-96, SCREEN_H/2-60+c*20, -1, -1, uconvert_ascii("%s (%d/%d)", tmp), - joystick_driver->name, i+1, num_joysticks); - else -- textprintf_ex(bmp, font, SCREEN_W/2-96, SCREEN_H/2-60+c*20, -1, -1, joystick_driver->name); -+ textprintf_ex(bmp, font, SCREEN_W/2-96, SCREEN_H/2-60+c*20, -1, -1, "%s", joystick_driver->name); - c++; - } - -@@ -2879,7 +2879,7 @@ int main(void) - alert(uconvert_ascii("Error loading " SETUP_DATA_FILE, tmp1), NULL, NULL, uconvert_ascii("OK", tmp2), NULL, 13, 0); - #else - set_gfx_mode(GFX_TEXT, 0, 0, 0, 0); -- allegro_message(uconvert_ascii("Error loading " SETUP_DATA_FILE "\n", tmp1)); -+ allegro_message("%s", uconvert_ascii("Error loading " SETUP_DATA_FILE "\n", tmp1)); - #endif - return 1; - } -diff -up allegro-4.4.2/examples/exkeys.c~ allegro-4.4.2/examples/exkeys.c ---- allegro-4.4.2/examples/exkeys.c~ 2008-01-10 20:46:00.000000000 +0100 -+++ allegro-4.4.2/examples/exkeys.c 2017-03-15 16:17:30.268545467 +0100 -@@ -193,7 +193,7 @@ int main(void) - if (key_shifts & KB_NUMLOCK_FLAG) strcat(buf, " num"); - if (key_shifts & KB_SCROLOCK_FLAG) strcat(buf, " scrl"); - scroll(); -- textprintf_ex(screen, font, 8, SCREEN_H-16, makecol(0, 0, 0), makecol(255, 255, 255), buf); -+ textprintf_ex(screen, font, 8, SCREEN_H-16, makecol(0, 0, 0), makecol(255, 255, 255), "%s", buf); - } while (k != 27); - - /* various scan codes are defined in allegro.h as KEY_* constants */ -@@ -234,7 +234,7 @@ int main(void) - if (key[KEY_8]) buf[8] = '8'; else buf[8] = ' '; - if (key[KEY_9]) buf[9] = '9'; else buf[9] = ' '; - buf[10] = 0; -- textprintf_ex(screen, font, 8, SCREEN_H-16, makecol(0, 0, 0), makecol(255, 255, 255), buf); -+ textprintf_ex(screen, font, 8, SCREEN_H-16, makecol(0, 0, 0), makecol(255, 255, 255), "%s", buf); - rest(1); - } while (!keypressed() || (readkey() >> 8) != KEY_ESC); - -diff -up allegro-4.4.2/tests/play.c~ allegro-4.4.2/tests/play.c ---- allegro-4.4.2/tests/play.c~ 2005-03-19 12:15:07.000000000 +0100 -+++ allegro-4.4.2/tests/play.c 2017-03-15 16:35:18.628156496 +0100 -@@ -74,7 +74,7 @@ void usage(void) - - strcat(msg, "\nIf you don't specify the card, Allegro will auto-detect (ie. guess :-)\n"); - -- allegro_message(msg); -+ allegro_message("%s", msg); - free(msg); - } - diff --git a/allegro-4.4.2-compat-fix-aliases.patch b/allegro-4.4.2-compat-fix-aliases.patch new file mode 100644 index 0000000..88164cb --- /dev/null +++ b/allegro-4.4.2-compat-fix-aliases.patch @@ -0,0 +1,27 @@ +--- a/include/allegro/alcompat.h ++++ b/include/allegro/alcompat.h +@@ -40,6 +40,24 @@ + #endif + #endif + ++ #ifdef ALLEGRO_FIX_ALIASES ++ AL_ALIAS(fixed fadd(fixed x, fixed y), fixadd(x, y)) ++ AL_ALIAS(fixed fsub(fixed x, fixed y), fixsub(x, y)) ++ AL_ALIAS(fixed fmul(fixed x, fixed y), fixmul(x, y)) ++ AL_ALIAS(fixed fdiv(fixed x, fixed y), fixdiv(x, y)) ++ AL_ALIAS(int fceil(fixed x), fixceil(x)) ++ AL_ALIAS(int ffloor(fixed x), fixfloor(x)) ++ AL_ALIAS(fixed fcos(fixed x), fixcos(x)) ++ AL_ALIAS(fixed fsin(fixed x), fixsin(x)) ++ AL_ALIAS(fixed ftan(fixed x), fixtan(x)) ++ AL_ALIAS(fixed facos(fixed x), fixacos(x)) ++ AL_ALIAS(fixed fasin(fixed x), fixasin(x)) ++ AL_ALIAS(fixed fatan(fixed x), fixatan(x)) ++ AL_ALIAS(fixed fatan2(fixed y, fixed x), fixatan2(y, x)) ++ AL_ALIAS(fixed fsqrt(fixed x), fixsqrt(x)) ++ AL_ALIAS(fixed fhypot(fixed x, fixed y), fixhypot(x, y)) ++ #endif ++ + #endif /* !defined ALLEGRO_SRC */ + + diff --git a/allegro-4.4.2-dynamic-addons.patch b/allegro-4.4.2-dynamic-addons.patch deleted file mode 100644 index 262c763..0000000 --- a/allegro-4.4.2-dynamic-addons.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -up allegro-4.4.2/CMakeLists.txt~ allegro-4.4.2/CMakeLists.txt ---- allegro-4.4.2/CMakeLists.txt~ 2011-03-25 00:18:50.000000000 +0100 -+++ allegro-4.4.2/CMakeLists.txt 2011-07-12 11:03:07.975383245 +0200 -@@ -907,11 +907,7 @@ option(WANT_LOADPNG "Enable loadpng" on) - option(WANT_LOGG "Enable logg" on) - option(WANT_JPGALLEG "Enable JPGAlleg" on) - --if(WANT_FRAMEWORKS) -- set(ADDON_LINKAGE SHARED) --else() -- set(ADDON_LINKAGE STATIC) --endif() -+set(ADDON_LINKAGE SHARED) - - if(WANT_ALLEGROGL) - add_subdirectory(addons/allegrogl) diff --git a/allegro-4.4.2-ftbfs.patch b/allegro-4.4.2-ftbfs.patch deleted file mode 100644 index 093df69..0000000 --- a/allegro-4.4.2-ftbfs.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -up allegro-4.4.2/addons/allegrogl/include/alleggl.h~ allegro-4.4.2/addons/allegrogl/include/alleggl.h ---- allegro-4.4.2/addons/allegrogl/include/alleggl.h~ 2019-02-17 00:22:14.000000000 +0100 -+++ allegro-4.4.2/addons/allegrogl/include/alleggl.h 2019-02-17 00:23:57.342718525 +0100 -@@ -60,12 +60,9 @@ typedef __int64 INT64; - - #else /* ALLEGRO_MACOSX */ - --/* HACK: Prevent both Mesa and SGI's broken headers from screwing us */ --#define __glext_h_ --#define __glxext_h_ -+#define GL_GLEXT_PROTOTYPES -+#define GLX_GLXEXT_PROTOTYPES - #include --#undef __glext_h_ --#undef __glxext_h_ - - #endif /* ALLEGRO_MACOSX */ - -diff -up allegro-4.4.2/addons/allegrogl/src/x.c~ allegro-4.4.2/addons/allegrogl/src/x.c ---- allegro-4.4.2/addons/allegrogl/src/x.c~ 2009-10-17 09:05:52.000000000 +0200 -+++ allegro-4.4.2/addons/allegrogl/src/x.c 2019-02-17 00:23:20.470661820 +0100 -@@ -650,7 +650,7 @@ static int decode_fbconfig (GLXFBConfig - return -1; - } - -- if (!(render_type & GLX_RGBA_BIT) && !(render_type & GLX_RGBA_FLOAT_BIT)) { -+ if (!(render_type & GLX_RGBA_BIT) && !(render_type & GLX_RGBA_FLOAT_BIT_ARB)) { - TRACE(PREFIX_I "decode_fbconfig: Not RGBA mode\n"); - return -1; - } -@@ -674,7 +674,7 @@ static int decode_fbconfig (GLXFBConfig - /* Floating-point depth is not supported as glx extension (yet). */ - i->float_depth = 0; - -- i->float_color = (render_type & GLX_RGBA_FLOAT_BIT); -+ i->float_color = (render_type & GLX_RGBA_FLOAT_BIT_ARB); - - v = glXGetVisualFromFBConfig(_xwin.display, fbc); - if (!v) { diff --git a/allegro-4.4.2-no-fix-aliases.patch b/allegro-4.4.2-no-fix-aliases.patch deleted file mode 100644 index d3c7830..0000000 --- a/allegro-4.4.2-no-fix-aliases.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up allegro-4.4.2/include/allegro/alcompat.h~ allegro-4.4.2/include/allegro/alcompat.h ---- allegro-4.4.2/include/allegro/alcompat.h~ 2009-12-20 02:10:56.000000000 +0100 -+++ allegro-4.4.2/include/allegro/alcompat.h 2018-05-29 12:57:32.182913729 +0200 -@@ -40,7 +40,7 @@ - #endif - #endif - -- #ifndef ALLEGRO_NO_FIX_ALIASES -+ #ifdef ALLEGRO_FIX_ALIASES - AL_ALIAS(fixed fadd(fixed x, fixed y), fixadd(x, y)) - AL_ALIAS(fixed fsub(fixed x, fixed y), fixsub(x, y)) - AL_ALIAS(fixed fmul(fixed x, fixed y), fixmul(x, y)) diff --git a/allegro.spec b/allegro.spec index 74b022f..9866642 100644 --- a/allegro.spec +++ b/allegro.spec @@ -5,8 +5,8 @@ %endif Name: allegro -Version: 4.4.2 -Release: 23%{?dist} +Version: 4.4.3 +Release: 1%{?dist} Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -15,12 +15,10 @@ Summary(it): Una libreria per la programmazione di videogiochi Summary(cs): Knihovna pro programování her License: Giftware -URL: http://alleg.sourceforge.net/ -Source: http://downloads.sourceforge.net/alleg/allegro-%{version}.tar.gz +URL: http://liballeg.org/ +Source0: https://github.com/liballeg/allegro5/releases/download/%{version}/allegro-%{version}.tar.gz Patch1: allegro-4.0.3-cfg.patch Patch2: allegro-4.0.3-libdir.patch -Patch3: allegro-4.2.3-pack-formatstring.patch -Patch4: allegro-4.4.2-dynamic-addons.patch Patch5: allegro-4.4.2-buildsys-fix.patch %if ! 0%{?fedora}%{?rhel} || 0%{?fedora} >= 20 || 0%{?rhel} >= 8 Patch6: allegro-4.4.2-doc-noversion.patch @@ -33,11 +31,8 @@ Patch8: allegro-4.4.2-mutex-fix.patch Patch9: allegro-4.4.2-no-xsync-from-thread.patch # gnome-shell starts apps while gnome-shell has the keyb grabbed... Patch10: allegro-4.4.2-keybgrab-fix.patch -Patch11: allegro-4.4.2-Werror-format-security.patch -# PPC builds fail when we define aliases for fadd / fdiv / fmull -Patch12: allegro-4.4.2-no-fix-aliases.patch -# Fix build errors with modern GL headers -Patch13: allegro-4.4.2-ftbfs.patch +# 4.4.3 has dropped the fadd/fsub etc aliases, but some apps need them +Patch11: allegro-4.4.2-compat-fix-aliases.patch BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: texinfo cmake @@ -386,6 +381,9 @@ install -Dpm 644 misc/allegro.m4 $RPM_BUILD_ROOT%{_datadir}/aclocal/allegro.m4 %changelog +* Mon Feb 18 2019 Hans de Goede - 4.4.3-1 +- New upstream release 4.4.3 + * Sat Feb 16 2019 Hans de Goede - 4.4.2-23 - Fix FTBFS (rhbz#1674575) diff --git a/sources b/sources index 9db2b35..07b5c7c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4db71b0460fc99926ae91d223199c2e6 allegro-4.4.2.tar.gz +SHA512 (allegro-4.4.3.tar.gz) = e2ad0b0e958fcfbc1e2afa012ca4f50968fe6e59fc0fa7779d31f8466412ee5e5d08e2d64845acdfdb30b872910354207dafcb1011fb00c61f825b612b72dcf5 From a428535d1712b137c62d83f5139cf840098b873d Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Tue, 26 Feb 2019 09:34:40 +0100 Subject: [PATCH 15/42] The 4.4.3 update broke the dat and grabber tools, fix them (rhbz#1682921) --- allegro-4.4.3-datafile-double-free.patch | 14 ++++++++++++++ allegro-4.4.3-tools-plugins.patch | 11 +++++++++++ allegro.spec | 8 +++++++- 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 allegro-4.4.3-datafile-double-free.patch create mode 100644 allegro-4.4.3-tools-plugins.patch diff --git a/allegro-4.4.3-datafile-double-free.patch b/allegro-4.4.3-datafile-double-free.patch new file mode 100644 index 0000000..9958b7c --- /dev/null +++ b/allegro-4.4.3-datafile-double-free.patch @@ -0,0 +1,14 @@ +Fix double free in load_file_object + +unload_datafile already calls _AL_FREE. +diff -up allegro-4.4.3/src/datafile.c~ allegro-4.4.3/src/datafile.c +--- allegro-4.4.3/src/datafile.c~ 2019-02-25 23:33:13.000000000 +0100 ++++ allegro-4.4.3/src/datafile.c 2019-02-25 23:39:39.320622137 +0100 +@@ -1348,7 +1348,6 @@ static void *load_file_object(PACKFILE * + /* gracefully handle failure */ + if (failed) { + unload_datafile(dat); +- _AL_FREE(dat); + dat = NULL; + } + diff --git a/allegro-4.4.3-tools-plugins.patch b/allegro-4.4.3-tools-plugins.patch new file mode 100644 index 0000000..40d9e80 --- /dev/null +++ b/allegro-4.4.3-tools-plugins.patch @@ -0,0 +1,11 @@ +--- allegro-4.4.3/tools/datedit.c 2009-10-17 09:09:57.000000000 +0200 ++++ allegro-4.4.3/tools/datedit.c 2019-02-02 20:28:46.000000000 +0100 +@@ -107,6 +107,8 @@ + int done, i; + AL_CONST char *prop_types; + ++ #include "plugins.h" ++ + do { + done = TRUE; + diff --git a/allegro.spec b/allegro.spec index 9866642..5b4a4a7 100644 --- a/allegro.spec +++ b/allegro.spec @@ -6,7 +6,7 @@ Name: allegro Version: 4.4.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -33,6 +33,9 @@ Patch9: allegro-4.4.2-no-xsync-from-thread.patch Patch10: allegro-4.4.2-keybgrab-fix.patch # 4.4.3 has dropped the fadd/fsub etc aliases, but some apps need them Patch11: allegro-4.4.2-compat-fix-aliases.patch +# 4.4.3 accidentally broke the tools, fix them (rhbz1682921) +Patch12: allegro-4.4.3-datafile-double-free.patch +Patch13: allegro-4.4.3-tools-plugins.patch BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: texinfo cmake @@ -381,6 +384,9 @@ install -Dpm 644 misc/allegro.m4 $RPM_BUILD_ROOT%{_datadir}/aclocal/allegro.m4 %changelog +* Tue Feb 26 2019 Hans de Goede - 4.4.3-2 +- The 4.4.3 update broke the dat and grabber tools, fix them (rhbz#1682921) + * Mon Feb 18 2019 Hans de Goede - 4.4.3-1 - New upstream release 4.4.3 From 22e64bd488bc706d05538070836200b2230e106e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 17:45:51 +0000 Subject: [PATCH 16/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- allegro.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/allegro.spec b/allegro.spec index 5b4a4a7..7a70432 100644 --- a/allegro.spec +++ b/allegro.spec @@ -6,7 +6,7 @@ Name: allegro Version: 4.4.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -384,6 +384,9 @@ install -Dpm 644 misc/allegro.m4 $RPM_BUILD_ROOT%{_datadir}/aclocal/allegro.m4 %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 4.4.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Tue Feb 26 2019 Hans de Goede - 4.4.3-2 - The 4.4.3 update broke the dat and grabber tools, fix them (rhbz#1682921) From 7799f367057311703fd929c018cba1c5d320e1df Mon Sep 17 00:00:00 2001 From: sagitter Date: Fri, 1 Nov 2019 14:32:38 +0100 Subject: [PATCH 17/42] Release 4.4.3.1 --- .gitignore | 1 + allegro-4.4.2-doc-install.patch | 30 ------- allegro-4.4.2-doc-noversion.patch | 4 +- allegro-4.4.3-tools-plugins.patch | 11 --- allegro.spec | 127 ++++++++++++++---------------- sources | 2 +- 6 files changed, 62 insertions(+), 113 deletions(-) delete mode 100644 allegro-4.4.2-doc-install.patch delete mode 100644 allegro-4.4.3-tools-plugins.patch diff --git a/.gitignore b/.gitignore index 117cc77..3976a2b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ allegro-4.2.3.tar.gz /allegro-4.4.2.tar.gz /allegro-4.4.3.tar.gz +/allegro-4.4.3.1.tar.gz diff --git a/allegro-4.4.2-doc-install.patch b/allegro-4.4.2-doc-install.patch deleted file mode 100644 index 06f138c..0000000 --- a/allegro-4.4.2-doc-install.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -up allegro-4.4.2/docs/CMakeLists.txt~ allegro-4.4.2/docs/CMakeLists.txt ---- allegro-4.4.2/docs/CMakeLists.txt~ 2009-10-31 00:05:30.000000000 +0100 -+++ allegro-4.4.2/docs/CMakeLists.txt 2011-07-12 11:24:06.604309215 +0200 -@@ -8,7 +8,7 @@ if(NOT WANT_DOCS OR CMAKE_CROSSCOMPILING - return() - endif() - --set(DOCDIR "doc" CACHE STRING "Install docs into $DOCDIR/allegro-$VERSION") -+set(DOCDIR "share/doc" CACHE STRING "Install docs into $DOCDIR/allegro-$VERSION") - set(ACTUAL_DOC_DIR "${DOCDIR}/allegro-${ALLEGRO_VERSION}") - - add_executable(makedoc -@@ -156,7 +156,7 @@ endif(UNIX) - # - - option(WANT_DOCS_MAN "Generate man pages" on) --set(MANDIR "man" CACHE STRING "Install man pages into this directory") -+set(MANDIR "share/man" CACHE STRING "Install man pages into this directory") - - if(WANT_DOCS_MAN) - set(man_out ${CMAKE_CURRENT_BINARY_DIR}/man/allegro_init.3) -@@ -187,7 +187,7 @@ endif(WANT_DOCS_MAN) - option(WANT_DOCS_INFO "Generate Info document" on) - find_program(MAKEINFO NAMES makeinfo) - mark_as_advanced(MAKEINFO) --set(INFODIR "info" CACHE STRING "Install Info docs into this directory") -+set(INFODIR "share/info" CACHE STRING "Install Info docs into this directory") - - if(WANT_DOCS_INFO AND MAKEINFO) - set(texi_out ${CMAKE_CURRENT_BINARY_DIR}/texi/allegro.texi) diff --git a/allegro-4.4.2-doc-noversion.patch b/allegro-4.4.2-doc-noversion.patch index b75d7ac..38b3f9d 100644 --- a/allegro-4.4.2-doc-noversion.patch +++ b/allegro-4.4.2-doc-noversion.patch @@ -7,8 +7,8 @@ diff -up allegro-4.4.2/docs/CMakeLists.txt~ allegro-4.4.2/docs/CMakeLists.txt -set(DOCDIR "doc" CACHE STRING "Install docs into $DOCDIR/allegro-$VERSION") -set(ACTUAL_DOC_DIR "${DOCDIR}/allegro-${ALLEGRO_VERSION}") -+set(DOCDIR "share/doc" CACHE STRING "Install docs into $DOCDIR/allegro") -+set(ACTUAL_DOC_DIR "${DOCDIR}/allegro") ++set(DOCDIR "doc" CACHE STRING "Install docs into $DOCDIR") ++set(ACTUAL_DOC_DIR "${DOCDIR}") add_executable(makedoc src/makedoc/makedoc.c diff --git a/allegro-4.4.3-tools-plugins.patch b/allegro-4.4.3-tools-plugins.patch deleted file mode 100644 index 40d9e80..0000000 --- a/allegro-4.4.3-tools-plugins.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- allegro-4.4.3/tools/datedit.c 2009-10-17 09:09:57.000000000 +0200 -+++ allegro-4.4.3/tools/datedit.c 2019-02-02 20:28:46.000000000 +0100 -@@ -107,6 +107,8 @@ - int done, i; - AL_CONST char *prop_types; - -+ #include "plugins.h" -+ - do { - done = TRUE; - diff --git a/allegro.spec b/allegro.spec index 7a70432..8dd9ac9 100644 --- a/allegro.spec +++ b/allegro.spec @@ -1,12 +1,6 @@ -%if ! 0%{?fedora}%{?rhel} || 0%{?fedora} >= 20 || 0%{?rhel} >= 8 -%define _maindocdir %{_docdir}/%{name} -%else -%define _maindocdir %{_docdir}/%{name}-%{version} -%endif - Name: allegro -Version: 4.4.3 -Release: 3%{?dist} +Version: 4.4.3.1 +Release: 1%{?dist} Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -20,11 +14,7 @@ Source0: https://github.com/liballeg/allegro5/releases/download/%{version Patch1: allegro-4.0.3-cfg.patch Patch2: allegro-4.0.3-libdir.patch Patch5: allegro-4.4.2-buildsys-fix.patch -%if ! 0%{?fedora}%{?rhel} || 0%{?fedora} >= 20 || 0%{?rhel} >= 8 Patch6: allegro-4.4.2-doc-noversion.patch -%else -Patch7: allegro-4.4.2-doc-install.patch -%endif # Replace racy recursive mutex implementation with proper recursive mutexes Patch8: allegro-4.4.2-mutex-fix.patch # Calling Xsync from the bg thread causes deadlock issues @@ -35,10 +25,10 @@ Patch10: allegro-4.4.2-keybgrab-fix.patch Patch11: allegro-4.4.2-compat-fix-aliases.patch # 4.4.3 accidentally broke the tools, fix them (rhbz1682921) Patch12: allegro-4.4.3-datafile-double-free.patch -Patch13: allegro-4.4.3-tools-plugins.patch + BuildRequires: gcc BuildRequires: gcc-c++ -BuildRequires: texinfo cmake +BuildRequires: texinfo cmake3 BuildRequires: xorg-x11-proto-devel libX11-devel libXpm-devel libXcursor-devel BuildRequires: libXxf86vm-devel libXxf86dga-devel libGL-devel libGLU-devel BuildRequires: alsa-lib-devel jack-audio-connection-kit-devel @@ -177,8 +167,8 @@ URL: http://www.ecplusplus.com/index.php?page=projects&pid=1 Requires: %{name}%{?_isa} = %{version}-%{release} %description -n jpgalleg -jpgalleg is a jpeg library for use with the Allegro game library. It allows -using jpeg's as Allegro bitmaps. +jpgalleg is a JPEG library for use with the Allegro game library. It allows +using JPEG's as Allegro bitmaps. %package -n jpgalleg-devel Summary: Development files for jpgalleg @@ -213,7 +203,6 @@ developing applications that use loadpng. %package logg Summary: OGG/Vorbis library for the Allegro game library License: MIT -URL: http://trent.gamblin.ca/logg/ Requires: %{name}%{?_isa} = %{version}-%{release} %description logg @@ -232,41 +221,57 @@ developing applications that use logg. %prep %autosetup -p1 - %build -%cmake -make %{?_smp_mflags} +mkdir -p build && pushd build +%cmake3 -DOpenGL_GL_PREFERENCE:STRING=LEGACY -DCMAKE_SKIP_RPATH:BOOL=YES -DCMAKE_SKIP_INSTALL_RPATH:BOOL=YES \ + -DDOCDIR:STRING=%{_pkgdocdir} -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE .. +%make_build # Converting text documentation to UTF-8 encoding. -for f in docs/AUTHORS docs/CHANGES docs/THANKS \ +for file in docs/AUTHORS docs/CHANGES docs/THANKS \ docs/info/*.info docs/txt/*.txt docs/man/get_camera_matrix.3 \ - addons/allegrogl/changelog; do - dirname=$(dirname "$f"); - basename=$(basename "$f"); - tmppath="${dirname}/${basename}.tmp"; - iconv -f 'iso-8859-1' -t 'utf-8' "$f" > "$tmppath"; - mv "$tmppath" "$f"; + ../addons/allegrogl/changelog; do + iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \ + touch -r $file $file.new && \ + mv $file.new $file done - +popd %install +pushd build %make_install # installation of these is broken, because they use a cmake GLOB, but # that gets "resolved" when runnning cmake, and at that time the files # to install aren't generated yet ... mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3 -mkdir -p $RPM_BUILD_ROOT%{_maindocdir}/html +mkdir -p $RPM_BUILD_ROOT%{_pkgdocdir}/html install -p -m 644 docs/man/*.3 $RPM_BUILD_ROOT%{_mandir}/man3 install -p -m 644 docs/html/*.{html,css} \ - $RPM_BUILD_ROOT%{_maindocdir}/html + $RPM_BUILD_ROOT%{_pkgdocdir}/html/ +install -m 755 docs/makedoc $RPM_BUILD_ROOT%{_bindir}/allegro-makedoc +popd + # Install some extra files install -Dpm 644 allegro.cfg $RPM_BUILD_ROOT%{_sysconfdir}/allegrorc install -pm 755 tools/x11/xfixicon.sh $RPM_BUILD_ROOT%{_bindir} -install -m 755 docs/makedoc $RPM_BUILD_ROOT%{_bindir}/allegro-makedoc install -dm 755 $RPM_BUILD_ROOT%{_datadir}/allegro install -pm 644 keyboard.dat language.dat $RPM_BUILD_ROOT%{_datadir}/allegro install -Dpm 644 misc/allegro.m4 $RPM_BUILD_ROOT%{_datadir}/aclocal/allegro.m4 +mkdir -p $RPM_BUILD_ROOT%{_pkgdocdir}/allegrogl +install -pm 644 addons/allegrogl/changelog addons/allegrogl/faq.txt \ + addons/allegrogl/readme.txt addons/allegrogl/bugs.txt \ + addons/allegrogl/extensions.txt addons/allegrogl/howto.txt addons/allegrogl/quickstart.txt \ + addons/allegrogl/todo.txt $RPM_BUILD_ROOT%{_pkgdocdir}/allegrogl/ + +mkdir -p $RPM_BUILD_ROOT%{_pkgdocdir}/loadpng +install -pm 644 addons/loadpng/CHANGES.txt addons/loadpng/README.txt addons/loadpng/THANKS.txt \ + $RPM_BUILD_ROOT%{_pkgdocdir}/loadpng/ + +mkdir -p $RPM_BUILD_ROOT%{_pkgdocdir}/jpgalleg +install -pm 644 addons/jpgalleg/license.txt addons/jpgalleg/readme.txt \ + $RPM_BUILD_ROOT%{_pkgdocdir}/jpgalleg/ + %ldconfig_scriptlets %ldconfig_scriptlets -n alleggl @@ -279,31 +284,17 @@ install -Dpm 644 misc/allegro.m4 $RPM_BUILD_ROOT%{_datadir}/aclocal/allegro.m4 %files -%doc %{_maindocdir}/AUTHORS -%doc %{_maindocdir}/CHANGES -%doc %{_maindocdir}/THANKS -%doc %{_maindocdir}/addons.txt -%doc %{_maindocdir}/faq.txt -%doc %{_maindocdir}/readme.txt -%license %{_maindocdir}/license.txt +%{_pkgdocdir}/ +%exclude %{_pkgdocdir}/dat*.txt +%exclude %{_pkgdocdir}/grabber.txt +%license %{_pkgdocdir}/license.txt %config(noreplace) %{_sysconfdir}/allegrorc %{_libdir}/liballeg.so.4* %{_libdir}/allegro %{_datadir}/allegro -%exclude %{_libdir}/allegro/%{version}/alleg-jack.so +%exclude %{_libdir}/allegro/4.4.3/alleg-jack.so %files devel -%doc %{_maindocdir}/abi.txt -%doc %{_maindocdir}/ahack.txt -%doc %{_maindocdir}/allegro.txt -%doc %{_maindocdir}/api.txt -%doc %{_maindocdir}/const.txt -%doc %{_maindocdir}/faq.txt -%doc %{_maindocdir}/help.txt -%doc %{_maindocdir}/html -%doc %{_maindocdir}/makedoc.txt -%doc %{_maindocdir}/mistakes.txt -%doc %{_maindocdir}/packfile.txt %{_bindir}/allegro-config %{_bindir}/allegro-makedoc %{_libdir}/liballeg.so @@ -316,8 +307,8 @@ install -Dpm 644 misc/allegro.m4 $RPM_BUILD_ROOT%{_datadir}/aclocal/allegro.m4 %{_mandir}/man3/* %files tools -%doc %{_maindocdir}/dat*.txt -%doc %{_maindocdir}/grabber.txt +%{_pkgdocdir}/dat*.txt +%{_pkgdocdir}/grabber.txt %{_bindir}/colormap %{_bindir}/dat %{_bindir}/dat2s @@ -331,41 +322,33 @@ install -Dpm 644 misc/allegro.m4 $RPM_BUILD_ROOT%{_datadir}/aclocal/allegro.m4 %{_bindir}/xfixicon.sh %files jack-plugin -%{_libdir}/allegro/%{version}/alleg-jack.so +%{_libdir}/allegro/4.4.3/alleg-jack.so %files -n alleggl -%doc addons/allegrogl/changelog -%doc addons/allegrogl/faq.txt -%doc addons/allegrogl/gpl.txt -%doc addons/allegrogl/readme.txt -%doc addons/allegrogl/zlib.txt +%license addons/allegrogl/gpl.txt +%license addons/allegrogl/zlib.txt %{_libdir}/liballeggl.so.4* %files -n alleggl-devel -%doc addons/allegrogl/bugs.txt -%doc addons/allegrogl/extensions.txt -%doc addons/allegrogl/howto.txt -%doc addons/allegrogl/quickstart.txt -%doc addons/allegrogl/todo.txt +%{_pkgdocdir}/allegrogl/ %{_libdir}/liballeggl.so %{_libdir}/pkgconfig/allegrogl.pc %{_includedir}/alleggl.h %{_includedir}/allegrogl %files -n jpgalleg -%doc addons/jpgalleg/license.txt -%doc addons/jpgalleg/readme.txt +%license addons/jpgalleg/license.txt %{_libdir}/libjpgalleg.so.4* %files -n jpgalleg-devel +%{_pkgdocdir}/jpgalleg/ %{_libdir}/libjpgalleg.so %{_libdir}/pkgconfig/jpgalleg.pc %{_includedir}/jpgalleg.h %files loadpng -%doc addons/loadpng/CHANGES.txt -%doc addons/loadpng/README.txt -%doc addons/loadpng/THANKS.txt +%license addons/loadpng/LICENSE.txt +%{_pkgdocdir}/loadpng/ %{_libdir}/libloadpng.so.4* %files loadpng-devel @@ -374,7 +357,7 @@ install -Dpm 644 misc/allegro.m4 $RPM_BUILD_ROOT%{_datadir}/aclocal/allegro.m4 %{_includedir}/loadpng.h %files logg -%doc addons/logg/LICENSE.txt +%license addons/logg/LICENSE.txt %{_libdir}/liblogg.so.4* %files logg-devel @@ -384,6 +367,12 @@ install -Dpm 644 misc/allegro.m4 $RPM_BUILD_ROOT%{_datadir}/aclocal/allegro.m4 %changelog +* Thu Oct 31 2019 Antonio Trande - 4.4.3.1-1 +- Release 4.4.3.1 +- Downgrade Make jobs +- Use CMake3 on epel +- Use dedicated CMake 'build' directory + * Wed Jul 24 2019 Fedora Release Engineering - 4.4.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 07b5c7c..d6c8d16 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (allegro-4.4.3.tar.gz) = e2ad0b0e958fcfbc1e2afa012ca4f50968fe6e59fc0fa7779d31f8466412ee5e5d08e2d64845acdfdb30b872910354207dafcb1011fb00c61f825b612b72dcf5 +SHA512 (allegro-4.4.3.1.tar.gz) = c5a552ab710226493447eb2547b3d7559badb96f511fbefd315b665b7486013a6710c83b69363eb09f90f53ef4278fe7b90cfee88d90d88f0fe8dc7df7606729 From 1f1e00f6162bd08a666c4f6e4a5833fbe3b166b9 Mon Sep 17 00:00:00 2001 From: sagitter Date: Fri, 1 Nov 2019 14:34:22 +0100 Subject: [PATCH 18/42] Use %%_pkgdocdir --- allegro.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/allegro.spec b/allegro.spec index 8dd9ac9..39e9b0a 100644 --- a/allegro.spec +++ b/allegro.spec @@ -369,7 +369,7 @@ install -pm 644 addons/jpgalleg/license.txt addons/jpgalleg/readme.txt \ %changelog * Thu Oct 31 2019 Antonio Trande - 4.4.3.1-1 - Release 4.4.3.1 -- Downgrade Make jobs +- Use %%_pkgdocdir - Use CMake3 on epel - Use dedicated CMake 'build' directory From a21a98b3d9184c6252aeb6a6357d414763a0f352 Mon Sep 17 00:00:00 2001 From: sagitter Date: Tue, 5 Nov 2019 11:09:34 +0100 Subject: [PATCH 19/42] Patched for texinfo-6.7 (rhbz#1767827) --- allegro-4.4.3-texinfo-non-utf8-input-fix.patch | 11 +++++++++++ allegro.spec | 13 +++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 allegro-4.4.3-texinfo-non-utf8-input-fix.patch diff --git a/allegro-4.4.3-texinfo-non-utf8-input-fix.patch b/allegro-4.4.3-texinfo-non-utf8-input-fix.patch new file mode 100644 index 0000000..30d8f27 --- /dev/null +++ b/allegro-4.4.3-texinfo-non-utf8-input-fix.patch @@ -0,0 +1,11 @@ +diff -up allegro-4.4.3/docs/src/allegro._tx.orig allegro-4.4.3/docs/src/allegro._tx +--- allegro-4.4.3/docs/src/allegro._tx.orig 2019-02-02 20:28:46.000000000 +0100 ++++ allegro-4.4.3/docs/src/allegro._tx 2019-11-04 11:12:39.352699777 +0100 +@@ -23,6 +23,7 @@ + @man_shortdesc_force1=allegro + @man_shortdesc_force2=Allegro game programming library. + @$\input texinfo ++@$@documentencoding ISO-8859-1 + @$@setfilename allegro.inf + @$@settitle Allegro Manual + @$@setchapternewpage odd diff --git a/allegro.spec b/allegro.spec index 39e9b0a..890455e 100644 --- a/allegro.spec +++ b/allegro.spec @@ -25,6 +25,10 @@ Patch10: allegro-4.4.2-keybgrab-fix.patch Patch11: allegro-4.4.2-compat-fix-aliases.patch # 4.4.3 accidentally broke the tools, fix them (rhbz1682921) Patch12: allegro-4.4.3-datafile-double-free.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1767827 +# starting texinfo-6.7 the default encoding is UTF-8 and because allegro's +# source .texi file is encoded in ISO-8859-1, additional command is needed +Patch13: allegro-4.4.3-texinfo-non-utf8-input-fix.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -219,7 +223,7 @@ developing applications that use logg. %prep -%autosetup -p1 +%autosetup -p 1 %build mkdir -p build && pushd build @@ -287,6 +291,10 @@ install -pm 644 addons/jpgalleg/license.txt addons/jpgalleg/readme.txt \ %{_pkgdocdir}/ %exclude %{_pkgdocdir}/dat*.txt %exclude %{_pkgdocdir}/grabber.txt +%exclude %{_pkgdocdir}/allegrogl +%exclude %{_pkgdocdir}/jpgalleg +%exclude %{_pkgdocdir}/loadpng +%exclude %{_pkgdocdir}/loadpng %license %{_pkgdocdir}/license.txt %config(noreplace) %{_sysconfdir}/allegrorc %{_libdir}/liballeg.so.4* @@ -367,11 +375,12 @@ install -pm 644 addons/jpgalleg/license.txt addons/jpgalleg/readme.txt \ %changelog -* Thu Oct 31 2019 Antonio Trande - 4.4.3.1-1 +* Tue Nov 05 2019 Antonio Trande - 4.4.3.1-1 - Release 4.4.3.1 - Use %%_pkgdocdir - Use CMake3 on epel - Use dedicated CMake 'build' directory +- Patched for texinfo-6.7 (rhbz#1767827) * Wed Jul 24 2019 Fedora Release Engineering - 4.4.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 4e7f832b9e1a1a2be8e5f9e11edbd5bd069471a5 Mon Sep 17 00:00:00 2001 From: sagitter Date: Tue, 5 Nov 2019 11:12:54 +0100 Subject: [PATCH 20/42] Fix autopatch command --- allegro.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/allegro.spec b/allegro.spec index 890455e..c2f7273 100644 --- a/allegro.spec +++ b/allegro.spec @@ -223,7 +223,7 @@ developing applications that use logg. %prep -%autosetup -p 1 +%autosetup -p1 %build mkdir -p build && pushd build From a54a6467c3e6c0e735a57441293a72a0a170e282 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 11 Nov 2019 18:09:14 +0100 Subject: [PATCH 21/42] Misc. small fixes -Do not install the jpgalleg license as both %license and %doc, only install it as %license -Stop packaging the alleg-jack.so build-id symlink in the main allegro pkg -Add rpmlintrc to filter out some rpmlint issues which we will not fix any time soon and/or which are false-positives --- allegro.rpmlintrc | 8 ++++++++ allegro.spec | 12 +++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 allegro.rpmlintrc diff --git a/allegro.rpmlintrc b/allegro.rpmlintrc new file mode 100644 index 0000000..e1ba769 --- /dev/null +++ b/allegro.rpmlintrc @@ -0,0 +1,8 @@ +# Silence silly information messages about dicts not being found +addFilter("I: enchant-dictionary-not-found .*") +# Some of our sub-packages do not contain docs +addFilter("W: no-documentation") +# Some of our tools do not have a manpage +addFilter("W: no-manual-page-for-binary .*") +# Ignore warnings about manpage groff macros +addFilter("W: manual-page-warning .*") diff --git a/allegro.spec b/allegro.spec index c2f7273..c771d9f 100644 --- a/allegro.spec +++ b/allegro.spec @@ -273,7 +273,7 @@ install -pm 644 addons/loadpng/CHANGES.txt addons/loadpng/README.txt addons/load $RPM_BUILD_ROOT%{_pkgdocdir}/loadpng/ mkdir -p $RPM_BUILD_ROOT%{_pkgdocdir}/jpgalleg -install -pm 644 addons/jpgalleg/license.txt addons/jpgalleg/readme.txt \ +install -pm 644 addons/jpgalleg/readme.txt \ $RPM_BUILD_ROOT%{_pkgdocdir}/jpgalleg/ @@ -298,9 +298,15 @@ install -pm 644 addons/jpgalleg/license.txt addons/jpgalleg/readme.txt \ %license %{_pkgdocdir}/license.txt %config(noreplace) %{_sysconfdir}/allegrorc %{_libdir}/liballeg.so.4* -%{_libdir}/allegro %{_datadir}/allegro -%exclude %{_libdir}/allegro/4.4.3/alleg-jack.so +# We cannot use exclude for alleg-jack.so because then the build-id for it +# still ends up in the main allegro package, e.g. rpmlint says: +# allegro.x86_64: W: dangling-relative-symlink /usr/lib/.build-id/48/024a0ddad02d9c6f4b956fb18f20d4a0bfde41 ../../../../usr/lib64/allegro/4.4.3/alleg-jack.so +%dir %{_libdir}/allegro +%dir %{_libdir}/allegro/4.4.3 +%{_libdir}/allegro/4.4.3/alleg-alsa*.so +%{_libdir}/allegro/4.4.3/alleg-dga2.so +%{_libdir}/allegro/4.4.3/modules.lst %files devel %{_bindir}/allegro-config From 34a866992010df5a4ca18fbeacb02d96897ebc99 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 11:25:23 +0000 Subject: [PATCH 22/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- allegro.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/allegro.spec b/allegro.spec index c771d9f..f1f5474 100644 --- a/allegro.spec +++ b/allegro.spec @@ -1,6 +1,6 @@ Name: allegro Version: 4.4.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -381,6 +381,9 @@ install -pm 644 addons/jpgalleg/readme.txt \ %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 4.4.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Nov 05 2019 Antonio Trande - 4.4.3.1-1 - Release 4.4.3.1 - Use %%_pkgdocdir From 38c8f6979e7a6ae103dbdd87553c3d51397db1ab Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sat, 18 Jul 2020 14:32:39 -0400 Subject: [PATCH 23/42] Update to new out-of-source build mechanism --- allegro.spec | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/allegro.spec b/allegro.spec index f1f5474..09b81c1 100644 --- a/allegro.spec +++ b/allegro.spec @@ -1,3 +1,6 @@ +# Force out of source build +%undefine __cmake_in_source_build + Name: allegro Version: 4.4.3.1 Release: 2%{?dist} @@ -226,11 +229,11 @@ developing applications that use logg. %autosetup -p1 %build -mkdir -p build && pushd build %cmake3 -DOpenGL_GL_PREFERENCE:STRING=LEGACY -DCMAKE_SKIP_RPATH:BOOL=YES -DCMAKE_SKIP_INSTALL_RPATH:BOOL=YES \ - -DDOCDIR:STRING=%{_pkgdocdir} -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE .. -%make_build + -DDOCDIR:STRING=%{_pkgdocdir} -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE +%cmake3_build +pushd %{_vpath_builddir} # Converting text documentation to UTF-8 encoding. for file in docs/AUTHORS docs/CHANGES docs/THANKS \ docs/info/*.info docs/txt/*.txt docs/man/get_camera_matrix.3 \ @@ -242,8 +245,9 @@ done popd %install -pushd build -%make_install +%cmake3_install + +pushd %{_vpath_builddir} # installation of these is broken, because they use a cmake GLOB, but # that gets "resolved" when runnning cmake, and at that time the files # to install aren't generated yet ... From 18d2f19d5df341b54009d2b160c91ea4c6435ea8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 11:55:46 +0000 Subject: [PATCH 24/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- allegro.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/allegro.spec b/allegro.spec index 09b81c1..8421cad 100644 --- a/allegro.spec +++ b/allegro.spec @@ -3,7 +3,7 @@ Name: allegro Version: 4.4.3.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -385,6 +385,9 @@ install -pm 644 addons/jpgalleg/readme.txt \ %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 4.4.3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jan 28 2020 Fedora Release Engineering - 4.4.3.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 446341812484b8743df1c7410fc8869c1ce3532b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jul 2020 23:54:30 +0000 Subject: [PATCH 25/42] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- allegro.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/allegro.spec b/allegro.spec index 8421cad..2934054 100644 --- a/allegro.spec +++ b/allegro.spec @@ -3,7 +3,7 @@ Name: allegro Version: 4.4.3.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -385,6 +385,10 @@ install -pm 644 addons/jpgalleg/readme.txt \ %changelog +* Fri Jul 31 2020 Fedora Release Engineering - 4.4.3.1-4 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 4.4.3.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 93b8a0f94b01dd8557e2dfea58187dc333a35e8a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 25 Jan 2021 23:59:02 +0000 Subject: [PATCH 26/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- allegro.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/allegro.spec b/allegro.spec index 2934054..64d7da9 100644 --- a/allegro.spec +++ b/allegro.spec @@ -3,7 +3,7 @@ Name: allegro Version: 4.4.3.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -385,6 +385,9 @@ install -pm 644 addons/jpgalleg/readme.txt \ %changelog +* Mon Jan 25 2021 Fedora Release Engineering - 4.4.3.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Fri Jul 31 2020 Fedora Release Engineering - 4.4.3.1-4 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 7c29e4a2d6aa91d7e6f185d25d9dd0bb14bffb67 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 12:31:11 +0000 Subject: [PATCH 27/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 7cd174c76214c9407aca0df0f62e4c66f1dc8249 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 17:26:33 +0000 Subject: [PATCH 28/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- allegro.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/allegro.spec b/allegro.spec index 64d7da9..faca4cf 100644 --- a/allegro.spec +++ b/allegro.spec @@ -3,7 +3,7 @@ Name: allegro Version: 4.4.3.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -385,6 +385,9 @@ install -pm 644 addons/jpgalleg/readme.txt \ %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 4.4.3.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Jan 25 2021 Fedora Release Engineering - 4.4.3.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 60f829f623fed1a5981401b2ffae93d3ba7b2026 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 21:07:30 +0000 Subject: [PATCH 29/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- allegro.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/allegro.spec b/allegro.spec index faca4cf..c646206 100644 --- a/allegro.spec +++ b/allegro.spec @@ -3,7 +3,7 @@ Name: allegro Version: 4.4.3.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -385,6 +385,9 @@ install -pm 644 addons/jpgalleg/readme.txt \ %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 4.4.3.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 4.4.3.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 9050a4088bf61fb4d1659a06dff871a479579d40 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 20:39:04 +0000 Subject: [PATCH 30/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- allegro.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/allegro.spec b/allegro.spec index c646206..42604be 100644 --- a/allegro.spec +++ b/allegro.spec @@ -3,7 +3,7 @@ Name: allegro Version: 4.4.3.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -385,6 +385,9 @@ install -pm 644 addons/jpgalleg/readme.txt \ %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 4.4.3.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jan 19 2022 Fedora Release Engineering - 4.4.3.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 4d0bcb86451dee7653089d650ab1a2a2d65ca0eb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:35:58 +0000 Subject: [PATCH 31/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- allegro.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/allegro.spec b/allegro.spec index 42604be..b035e9c 100644 --- a/allegro.spec +++ b/allegro.spec @@ -3,7 +3,7 @@ Name: allegro Version: 4.4.3.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -385,6 +385,9 @@ install -pm 644 addons/jpgalleg/readme.txt \ %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 4.4.3.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jul 20 2022 Fedora Release Engineering - 4.4.3.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 91eda6fdc6d530ed3d080089d93f086ea73ca1c0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 13:07:51 +0000 Subject: [PATCH 32/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- allegro.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/allegro.spec b/allegro.spec index b035e9c..87c5090 100644 --- a/allegro.spec +++ b/allegro.spec @@ -3,7 +3,7 @@ Name: allegro Version: 4.4.3.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -385,6 +385,9 @@ install -pm 644 addons/jpgalleg/readme.txt \ %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 4.4.3.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jan 18 2023 Fedora Release Engineering - 4.4.3.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 74d01b5b28ba9730d3f88123b64d4e62638135b7 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Wed, 26 Jul 2023 21:16:18 +0200 Subject: [PATCH 33/42] Fix dat2c bug causing FTBFS of allegro using packages (rhbz#2225996) Trim changelog --- allegro-4.4.3-dat2c-buffer-overflow.patch | 32 ++ allegro.rpmlintrc | 7 +- allegro.spec | 353 +--------------------- 3 files changed, 43 insertions(+), 349 deletions(-) create mode 100644 allegro-4.4.3-dat2c-buffer-overflow.patch diff --git a/allegro-4.4.3-dat2c-buffer-overflow.patch b/allegro-4.4.3-dat2c-buffer-overflow.patch new file mode 100644 index 0000000..118fd4d --- /dev/null +++ b/allegro-4.4.3-dat2c-buffer-overflow.patch @@ -0,0 +1,32 @@ +tools/dat2c: Fix a buffer overlow + +When prefix is set and datafile_name is not set then +strlen(prefix) + 6 bytes are necessary, not strlen(prefix) 5, +because then we get: "$(prefix)_data\0" which requires 6 bytes +extra for "_data\0". + +This fixes dat2c crashing like this: + + dat2c mbdata.dat -o mbdata.c -h mbdata.h -p mb -g + *** buffer overflow detected ***: terminated + make: *** [Makefile:45: mbdata.c] Aborted (core dumped) + +When compiled with a recent gcc version + a high FORTIFY_SOURCE setting. + +Link: https://bugzilla.redhat.com/show_bug.cgi?id=2225996 +diff -up allegro-4.4.3.1/tools/dat2c.c~ allegro-4.4.3.1/tools/dat2c.c +--- allegro-4.4.3.1/tools/dat2c.c~ 2019-03-04 02:30:11.000000000 +0100 ++++ allegro-4.4.3.1/tools/dat2c.c 2023-07-26 20:12:52.250765448 +0200 +@@ -1641,9 +1641,10 @@ int do_conversion(struct dat2c *dat2c) + int result = 0; + char *prefixed_name = 0; + +- prefixed_name = malloc(5 + ++ /* 2 for '_' + '\0' */ ++ prefixed_name = malloc(2 + + (dat2c->prefix ? (signed)strlen(dat2c->prefix) : 0) + +- (dat2c->datafile_name ? (signed)strlen(dat2c->datafile_name) : 0)); ++ (dat2c->datafile_name ? (signed)strlen(dat2c->datafile_name) : 4)); + if (!prefixed_name) + out_of_memory(); + sprintf(prefixed_name, "%s%s%s", diff --git a/allegro.rpmlintrc b/allegro.rpmlintrc index e1ba769..bb33462 100644 --- a/allegro.rpmlintrc +++ b/allegro.rpmlintrc @@ -1,8 +1,7 @@ -# Silence silly information messages about dicts not being found -addFilter("I: enchant-dictionary-not-found .*") # Some of our sub-packages do not contain docs addFilter("W: no-documentation") # Some of our tools do not have a manpage addFilter("W: no-manual-page-for-binary .*") -# Ignore warnings about manpage groff macros -addFilter("W: manual-page-warning .*") +# Ignore warnings about some manpages being shared between functions +addFilter("W: files-duplicate /usr/share/man/man3/.*") +addFilter("W: package-with-huge-docs.*") diff --git a/allegro.spec b/allegro.spec index 87c5090..4386a6c 100644 --- a/allegro.spec +++ b/allegro.spec @@ -3,7 +3,7 @@ Name: allegro Version: 4.4.3.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -32,6 +32,9 @@ Patch12: allegro-4.4.3-datafile-double-free.patch # starting texinfo-6.7 the default encoding is UTF-8 and because allegro's # source .texi file is encoded in ISO-8859-1, additional command is needed Patch13: allegro-4.4.3-texinfo-non-utf8-input-fix.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=2225996 +# Fix a buffer overflow in dat2c tool causing FTBFS of allegro using packages +Patch14: allegro-4.4.3-dat2c-buffer-overflow.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -385,6 +388,10 @@ install -pm 644 addons/jpgalleg/readme.txt \ %changelog +* Wed Jul 26 2023 Hans de Goede - 4.4.3.1-11 +- Fix dat2c bug causing FTBFS of allegro using packages (rhbz#2225996) +- Trim changelog + * Wed Jul 19 2023 Fedora Release Engineering - 4.4.3.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild @@ -419,347 +426,3 @@ install -pm 644 addons/jpgalleg/readme.txt \ - Use CMake3 on epel - Use dedicated CMake 'build' directory - Patched for texinfo-6.7 (rhbz#1767827) - -* Wed Jul 24 2019 Fedora Release Engineering - 4.4.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Tue Feb 26 2019 Hans de Goede - 4.4.3-2 -- The 4.4.3 update broke the dat and grabber tools, fix them (rhbz#1682921) - -* Mon Feb 18 2019 Hans de Goede - 4.4.3-1 -- New upstream release 4.4.3 - -* Sat Feb 16 2019 Hans de Goede - 4.4.2-23 -- Fix FTBFS (rhbz#1674575) - -* Thu Jan 31 2019 Fedora Release Engineering - 4.4.2-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jul 12 2018 Fedora Release Engineering - 4.4.2-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue May 29 2018 Hans de Goede - 4.4.2-20 -- Fix PPC allegro app builds failing due to alcompat.h defining aliases for - fadd / fdiv / fmull which conflict with system headers (#1582916, #1582917) -- Modernize spec-file a bit - -* Wed Feb 07 2018 Fedora Release Engineering - 4.4.2-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Aug 02 2017 Fedora Release Engineering - 4.4.2-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 4.4.2-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Wed Mar 15 2017 Hans de Goede - 4.4.2-16 -- Fix FBTFS - -* Fri Feb 10 2017 Fedora Release Engineering - 4.4.2-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Feb 03 2016 Fedora Release Engineering - 4.4.2-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Jun 23 2015 Hans de Goede - 4.4.2-13 -- Fix allegro apps which start fullscreen failing to start from gnome-shell - with a "Can not grab keyboard" error message - -* Tue Jun 16 2015 Fedora Release Engineering - 4.4.2-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Wed Oct 29 2014 Hans de Goede - 4.4.2-11 -- Replace racy recursive mutex implementation with proper recursive mutexes -- Use XPending instead of XSync + XeventsQueued to avoid a deadlock - -* Fri Aug 15 2014 Fedora Release Engineering - 4.4.2-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 4.4.2-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Sep 15 2013 Hans de Goede - 4.4.2-8 -- Fix docdir for unversioned docdir F-20 change (rhbz#993664) - -* Sat Aug 03 2013 Fedora Release Engineering - 4.4.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Mon Apr 29 2013 Hans de Goede - 4.4.2-6 -- Add /usr/share/aclocal/allegro.m4 to -devel package - -* Wed Feb 13 2013 Fedora Release Engineering - 4.4.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Jul 18 2012 Fedora Release Engineering - 4.4.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Jan 12 2012 Fedora Release Engineering - 4.4.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Nov 15 2011 Peter Robinson 4.4.2-2 -- Make pre/post dependencies for all non i686 arches sane - -* Tue Jul 12 2011 Hans de Goede 4.4.2-1 -- New upstream release -- Partially based on spec file update by Brandon McCaig -- Drop a number of no longer relevant patches -- Now comes with alleggl, jpgalleg, loadpng and logg bundled - -* Mon Feb 07 2011 Fedora Release Engineering - 4.2.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Fri Jan 7 2011 Hans de Goede 4.2.3-4 -- Fix a format string bug in the pack utility reported on bugtraq - (but without security implications) - -* Thu Sep 9 2010 Hans de Goede 4.2.3-3 -- Fix FTBFS (#631099) - -* Mon Jun 21 2010 Hans de Goede 4.2.3-2 -- Fix multilib conflict in -devel (#603836) - -* Mon Oct 5 2009 Jindrich Novy 4.2.3-1 -- update to 4.2.3 - -* Thu Sep 10 2009 Hans de Goede 4.2.2-14 -- Fix (workaround) viewport issues in fullscreen mode (#522116) - -* Fri Jul 24 2009 Fedora Release Engineering - 4.2.2-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Mon Feb 23 2009 Fedora Release Engineering - 4.2.2-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sun Jan 25 2009 Hans de Goede 4.2.2-11 -- Fix wrong file path in semanage call in scriptlets (#481407) - -* Mon May 5 2008 Hans de Goede 4.2.2-10 -- Look for /etc/timidity.cfg instead of /usr/share/timidity/timidity.cfg, - as the latter is no longer available now that Fedora has switched from - timidity++-patches to PersonalCopy-Lite-patches - -* Tue Apr 1 2008 Hans de Goede 4.2.2-9 -- Fix i386 asm code compilation with latest binutils -- Remove -fomit-frame-pointer from the compile flags of the default build, so - that we get a usefull debuginfo even for the normal (non debug/profile) lib - -* Tue Feb 19 2008 Fedora Release Engineering - 4.2.2-8 -- Autorebuild for GCC 4.3 - -* Mon Jan 21 2008 Hans de Goede 4.2.2-7 -- Add makedoc utility to allegro-devel as allegro-makedoc (bz 429450) -- Fix sound when using pulseaudio -- Fix compilation of inline asm with gcc 4.3 - -* Sun Oct 14 2007 Hans de Goede 4.2.2-6 -- Require timidity++-patches instead of timidity++ itself so that we don't - drag in arts and through arts, qt and boost -- Add BuildRequires: glib2-devel to workaround RH bug 331841 - -* Wed Aug 22 2007 Hans de Goede 4.2.2-5 -- Update to pristine upstream sources instead of using allegro.cc pre-release - -* Tue Aug 21 2007 Hans de Goede 4.2.2-4 -- Rebuild for buildId - -* Sun Aug 12 2007 Hans de Goede 4.2.2-3 -- Enable building of JACK (Jack Audio Connection Kit) sound output plugin -- Put non default sound output plugins in their own subpackage to avoid - dragging in unwanted deps (allegro-esound-plugin, allegro-arts-plugin, - allegro-jack-plugin) (bz 250736) -- Make man pages and info file UTF-8 - -* Tue Jul 24 2007 Hans de Goede 4.2.2-2 -- sync .libdir patch to 4.2.2 and use it again for multilib devel goodness - (make allegro-devel i386 and x86_64 parallel installable again) - -* Mon Jul 23 2007 Jindrich Novy 4.2.2-1 -- update to 4.2.2 -- drop .libdir patch -- sync .multilib patch - -* Fri Jul 6 2007 Hans de Goede 4.2.1-3 -- Silence output of chcon command in %%post, because otherwise users get this: - "chcon: can't apply partial context to unlabeled file" when installing with - selinux disabled (bz 246820) - -* Fri Dec 22 2006 Hans de Goede 4.2.1-2 -- Restore multilib devel goodness patch (make allegro-devel i386 and x86_64 - parallel installable) -- Restore execstack patch so that binaries linked against allegro do not - require an execstack and thus work under selinux (without this - liballeg_unshareable.a contains object files which require an executable - stack which will end up in any app linked against allegro) -- Make alleg-dga2.so plugin 100% PIC so it can load with selinux enabled -- Mark alleg-vga.so plugin as textrel_shlib_t as it isn't 100% PIC and cannot - be fixed (easily) to be 100% PIC - -* Tue Nov 28 2006 Jindrich Novy 4.2.1-1 -- update to 4.2.1 - -* Sun Oct 15 2006 Hans de Goede 4.2.0-18 -- Multilib devel goodness (make allegro-devel i386 and x86_64 parallel - installable) - -* Sat Sep 2 2006 Hans de Goede 4.2.0-17 -- FE6 Rebuild - -* Fri Jul 14 2006 Hans de Goede 4.2.0-16 -- Don't package the main allegro lib in -devel as its already in the main - package, iow only put the debug and profile versions -devel. - -* Thu Jul 6 2006 Hans de Goede 4.2.0-15 -- Stop allegro from making applications linked against it claim that they - need an executable stack (Patch11). Unfortunatly this requires a rebuild of - all applications linked against allegro. - -* Mon Jun 26 2006 Jindrich Novy 4.2.0-14 -- compile alld and allp debuging/profiling libraries (#196616) -- fix typo in release caused by recent changes - -* Sat Jun 10 2006 Hans de Goede 4.2.0-13 -- Add autoconf BR for missing autoheader with the new mock config. - -* Tue Mar 21 2006 Hans de Goede 4.2.0-12 -- Sleep in xwindows vsync emulation, instead of busy waiting. -- Add %%{dist} to Release - -* Mon Mar 13 2006 Hans de Goede 4.2.0-11 -- really, _really_ fix asm stretch code on i386 with NX processors, long - story see bugzilla bug 185214 . - -* Sat Mar 11 2006 Hans de Goede 4.2.0-10 -- really fix asm stretch code on i386 with NX processors, on OpenBSD mprotects - first argument does not need to be page-aligned, but on Linux it does. - Note that for this to work you may also need to disable selinux (rh 185214) - -* Wed Mar 8 2006 Hans de Goede 4.2.0-9 -- fix fullscreen <-> window switching bug (bz 183645) -- fix asm stretch code on i386 with NX processors, thanks to openBSD. - -* Mon Feb 27 2006 Hans de Goede 4.2.0-8 -- fix sound not working on PPC (bz 183112) -- fix allegro not finding and loading plugins/modules on x86_64 (bz 183113) - -* Wed Feb 8 2006 Jindrich Novy 4.2.0-7 -- set timidity++ as Requires instead of BuildRequires - -* Tue Feb 7 2006 Jindrich Novy 4.2.0-6 -- fix digmid loading of timidity midi patches (#180154) - -* Wed Jan 25 2006 Jindrich Novy 4.2.0-5 -- update default allegro configuration to use sound successfully, - thanks to Hans de Goede (#178383) -- add timidity++ dependency - -* Mon Jan 23 2006 Hans de Goede 4.2.0-4 -- add allegro-4.2.0-nostrip.patch, so that the main .so file - doesn't get stripped and we actually get debuginfo for it in - allegro-debuginfo - -* Fri Jan 20 2006 Hans de Goede 4.2.0-3 -- update / fix BuildRequires for modular X (bz 178245) - -* Fri Dec 16 2005 Jindrich Novy 4.2.0-2 -- update dependencies for the new modular X -- disable _smp_mflags to workaround build failure caused - by bad dependencies - -* Wed May 25 2005 Jindrich Novy 4.2.0-1 -- update to 4.2.0 -- package dat2c, allegro.m4 -- replace XFree86-devel Buildrequires with xorg-x11-devel -- drop mmaptest, novga, gcc4 patches - -* Wed May 25 2005 Jindrich Novy 4.0.3-13 -- fix compilation on x86_64 (#158648) - -* Sun May 22 2005 Jeremy Katz - 4.0.3-12 -- rebuild on all arches - -* Mon May 2 2005 Jindrich Novy 0:4.0.3-11 -- fix build failures with gcc4 (#156224) -- don't use %%{name} in patch names -- add Czech translation to package description/summary - -* Thu Apr 7 2005 Michael Schwendt -- rebuilt - -* Fri Mar 4 2005 Ville Skyttä -- Split context marked dependency syntax to work around #118773. - -* Sun Feb 13 2005 Ville Skyttä - 0:4.0.3-9 -- Disable vga and vbeaf on all non-%%{ix86}. -- Fix lib paths in allegro-config for 64-bit archs. -- Use *nix commands in allegrorc's [grabber] section. - -* Sun Feb 13 2005 Ville Skyttä - 0:4.0.3-8 -- Build without vga and vbeaf on non-x86-like archs. -- Apply upstream patch to fix build without vga. - -* Fri Nov 12 2004 Ville Skyttä - 0:4.0.3-7 -- Explicitly disable svgalib for now. -- Let rpm take care of all stripping. -- Build with whatever the compiler supports, MMX and friends are detected - at runtime. -- Minor specfile style improvements. - -* Wed Nov 10 2004 Michael Schwendt - 0:4.0.3-6 -- Fix build for FC3 via fixed mmap test in configure script. - -* Mon Nov 10 2003 Ville Skyttä - 0:4.0.3-0.fdr.5 -- Use MMX/SSE where appropriate (bug 959). - -* Mon May 26 2003 Ville Skyttä - 0:4.0.3-0.fdr.4 -- Include *.so.* symlink. -- Re-introduce ldconfigs. -- *grumble* - -* Mon May 26 2003 Ville Skyttä - 0:4.0.3-0.fdr.3 -- -devel Requires XFree86-devel. - -* Mon May 26 2003 Ville Skyttä - 0:4.0.3-0.fdr.2 -- Handle --excludedocs installs gracefully. -- BuildRequires arts-devel. -- Make *.so executable so RPM groks autodependencies. -- Update to accordance with current Fedora spec template. - -* Sat Apr 26 2003 Ville Skyttä - 0:4.0.3-0.fdr.1 -- Update to 4.0.3. -- Make build honor optflags. -- Remove redundant ldconfigs. - -* Sat Apr 5 2003 Ville Skyttä - 0:4.0.3-0.fdr.0.1.rc3 -- Update to 4.0.3RC3. - -* Thu Mar 20 2003 Ville Skyttä - 0:4.0.3-0.fdr.0.1.rc2 -- Update to 4.0.3RC2, and to current Fedora guidelines. -- make -jX works again. -- Don't remove info files on -devel upgrade. - -* Wed Feb 19 2003 Warren Togami 4.0.3-0.beta2.fedora.2 -- Disable smp make flags, Makefile needs fixing - -* Wed Feb 12 2003 Ville Skyttä - 4.0.3-0.beta2.fedora.1 -- First Fedora release, based on upstream source RPM. - -* Fri Dec 07 2001 Angelo Mottola 4.0.0-1 -- added italian translation - -* Tue Oct 02 2001 Peter Wang 3.9.39-1 -- icon courtesy of Johan Peitz - -* Mon Sep 24 2001 Peter Wang -- remaining translations by Eric Botcazou and Grzegorz Adam Hankiewicz - -* Sun Sep 23 2001 Peter Wang -- translations by Eric Botcazou and Javier González -- language.dat and keyboard.dat moved to main package -- devel split into devel and tools packages -- makedoc added to tools package - -* Sun Sep 16 2001 Peter Wang -- merged Osvaldo's spec file with gfoot's spec and some other changes - -* Wed Sep 27 2000 Osvaldo Santana Neto -- updated to 3.9.33 From 551b78696b549505f793922a8f0b57aaa61fab90 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 12:42:43 +0000 Subject: [PATCH 34/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- allegro.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/allegro.spec b/allegro.spec index 4386a6c..3fc1a72 100644 --- a/allegro.spec +++ b/allegro.spec @@ -3,7 +3,7 @@ Name: allegro Version: 4.4.3.1 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -388,6 +388,9 @@ install -pm 644 addons/jpgalleg/readme.txt \ %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 4.4.3.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 26 2023 Hans de Goede - 4.4.3.1-11 - Fix dat2c bug causing FTBFS of allegro using packages (rhbz#2225996) - Trim changelog From 2f12f09bab398ad5c6b38d4cded950d5b7bbe567 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 22:54:32 +0000 Subject: [PATCH 35/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- allegro.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/allegro.spec b/allegro.spec index 3fc1a72..bdd9bec 100644 --- a/allegro.spec +++ b/allegro.spec @@ -3,7 +3,7 @@ Name: allegro Version: 4.4.3.1 -Release: 12%{?dist} +Release: 13%{?dist} Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -388,6 +388,9 @@ install -pm 644 addons/jpgalleg/readme.txt \ %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 4.4.3.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 4.4.3.1-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From c3876b3aae8fb2282c21d0c4c7e54e4e2b8d071c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 16:51:00 +0000 Subject: [PATCH 36/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- allegro.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/allegro.spec b/allegro.spec index bdd9bec..7d5ca77 100644 --- a/allegro.spec +++ b/allegro.spec @@ -3,7 +3,7 @@ Name: allegro Version: 4.4.3.1 -Release: 13%{?dist} +Release: 14%{?dist} Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -388,6 +388,9 @@ install -pm 644 addons/jpgalleg/readme.txt \ %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 4.4.3.1-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 4.4.3.1-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 2f1070e9365cc45c296e965dae92fe47264816f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Thu, 16 Jan 2025 06:59:50 +0000 Subject: [PATCH 37/42] Migrate to SPDX license This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- allegro.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/allegro.spec b/allegro.spec index 7d5ca77..f1ce40a 100644 --- a/allegro.spec +++ b/allegro.spec @@ -149,7 +149,7 @@ sound through JACK (Jack Audio Connection Kit). %package -n alleggl Summary: OpenGL support library for Allegro -License: zlib or GPL+ +License: Zlib OR GPL-1.0-or-later URL: http://allegrogl.sourceforge.net/ Requires: %{name}%{?_isa} = %{version}-%{release} @@ -162,7 +162,7 @@ that things like glut do. %package -n alleggl-devel Summary: Development files for alleggl -License: zlib or GPL+ +License: Zlib OR GPL-1.0-or-later Requires: alleggl%{?_isa} = %{version}-%{release} %description -n alleggl-devel @@ -172,7 +172,7 @@ developing applications that use alleggl. %package -n jpgalleg Summary: JPEG library for the Allegro game library -License: zlib +License: Zlib URL: http://www.ecplusplus.com/index.php?page=projects&pid=1 Requires: %{name}%{?_isa} = %{version}-%{release} @@ -182,7 +182,7 @@ using JPEG's as Allegro bitmaps. %package -n jpgalleg-devel Summary: Development files for jpgalleg -License: zlib +License: Zlib Requires: jpgalleg%{?_isa} = %{version}-%{release} %description -n jpgalleg-devel @@ -192,7 +192,7 @@ developing applications that use jpgalleg. %package loadpng Summary: OGG/Vorbis library for the Allegro game library -License: Public Domain +License: LicenseRef-Fedora-Public-Domain URL: http://wiki.allegro.cc/index.php?title=LoadPNG Requires: %{name}%{?_isa} = %{version}-%{release} @@ -202,7 +202,7 @@ save bitmaps from Allegro programs. %package loadpng-devel Summary: Development files for loadpng -License: Public Domain +License: LicenseRef-Fedora-Public-Domain Requires: %{name}-loadpng%{?_isa} = %{version}-%{release} %description loadpng-devel From c52cd73b4c6a3f8d0d92ed065ced668bfb53a1bb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 10:52:13 +0000 Subject: [PATCH 38/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- allegro.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/allegro.spec b/allegro.spec index 7d5ca77..b925b87 100644 --- a/allegro.spec +++ b/allegro.spec @@ -3,7 +3,7 @@ Name: allegro Version: 4.4.3.1 -Release: 14%{?dist} +Release: 15%{?dist} Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -388,6 +388,9 @@ install -pm 644 addons/jpgalleg/readme.txt \ %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 4.4.3.1-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jul 17 2024 Fedora Release Engineering - 4.4.3.1-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 8937f92105d1f28798c25489cc2efdce2f9c9cce Mon Sep 17 00:00:00 2001 From: Cristian Le Date: Fri, 30 May 2025 16:22:24 +0200 Subject: [PATCH 39/42] Allow to build with CMake 4.0 --- allegro.spec | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/allegro.spec b/allegro.spec index f77cc18..41468ae 100644 --- a/allegro.spec +++ b/allegro.spec @@ -1,9 +1,6 @@ -# Force out of source build -%undefine __cmake_in_source_build - Name: allegro Version: 4.4.3.1 -Release: 15%{?dist} +Release: 16%{?dist} Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -38,7 +35,7 @@ Patch14: allegro-4.4.3-dat2c-buffer-overflow.patch BuildRequires: gcc BuildRequires: gcc-c++ -BuildRequires: texinfo cmake3 +BuildRequires: texinfo cmake BuildRequires: xorg-x11-proto-devel libX11-devel libXpm-devel libXcursor-devel BuildRequires: libXxf86vm-devel libXxf86dga-devel libGL-devel libGLU-devel BuildRequires: alsa-lib-devel jack-audio-connection-kit-devel @@ -232,9 +229,10 @@ developing applications that use logg. %autosetup -p1 %build -%cmake3 -DOpenGL_GL_PREFERENCE:STRING=LEGACY -DCMAKE_SKIP_RPATH:BOOL=YES -DCMAKE_SKIP_INSTALL_RPATH:BOOL=YES \ +export CMAKE_POLICY_VERSION_MINIMUM=3.5 +%cmake -DOpenGL_GL_PREFERENCE:STRING=LEGACY -DCMAKE_SKIP_RPATH:BOOL=YES -DCMAKE_SKIP_INSTALL_RPATH:BOOL=YES \ -DDOCDIR:STRING=%{_pkgdocdir} -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE -%cmake3_build +%cmake_build pushd %{_vpath_builddir} # Converting text documentation to UTF-8 encoding. @@ -248,7 +246,7 @@ done popd %install -%cmake3_install +%cmake_install pushd %{_vpath_builddir} # installation of these is broken, because they use a cmake GLOB, but @@ -388,6 +386,9 @@ install -pm 644 addons/jpgalleg/readme.txt \ %changelog +* Fri May 30 2025 Cristian Le - 4.4.3.1-16 +- Allow to build with CMake 4.0 + * Thu Jan 16 2025 Fedora Release Engineering - 4.4.3.1-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 60b3052206a97916dbae1b23f44d638b680e0943 Mon Sep 17 00:00:00 2001 From: Cristian Le Date: Thu, 17 Jul 2025 15:27:13 +0200 Subject: [PATCH 40/42] Add LIB_SUFFIX flag explicitly --- allegro.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/allegro.spec b/allegro.spec index 41468ae..e110580 100644 --- a/allegro.spec +++ b/allegro.spec @@ -1,6 +1,6 @@ Name: allegro Version: 4.4.3.1 -Release: 16%{?dist} +Release: 17%{?dist} Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -230,7 +230,11 @@ developing applications that use logg. %build export CMAKE_POLICY_VERSION_MINIMUM=3.5 -%cmake -DOpenGL_GL_PREFERENCE:STRING=LEGACY -DCMAKE_SKIP_RPATH:BOOL=YES -DCMAKE_SKIP_INSTALL_RPATH:BOOL=YES \ +%cmake \ +%if "%{?_lib}" == "lib64" + %{?_cmake_lib_suffix64} \ +%endif + -DOpenGL_GL_PREFERENCE:STRING=LEGACY -DCMAKE_SKIP_RPATH:BOOL=YES -DCMAKE_SKIP_INSTALL_RPATH:BOOL=YES \ -DDOCDIR:STRING=%{_pkgdocdir} -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE %cmake_build @@ -386,6 +390,9 @@ install -pm 644 addons/jpgalleg/readme.txt \ %changelog +* Thu Jul 17 2025 Cristian Le - 4.4.3.1-17 +- Add LIB_SUFFIX flag explicitly (rhbz#2381173) + * Fri May 30 2025 Cristian Le - 4.4.3.1-16 - Allow to build with CMake 4.0 From fff1693034d88519e51be9369695eafc0362388d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 16:54:01 +0000 Subject: [PATCH 41/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- allegro.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/allegro.spec b/allegro.spec index e110580..d31a292 100644 --- a/allegro.spec +++ b/allegro.spec @@ -1,6 +1,6 @@ Name: allegro Version: 4.4.3.1 -Release: 17%{?dist} +Release: 18%{?dist} Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -390,6 +390,9 @@ install -pm 644 addons/jpgalleg/readme.txt \ %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 4.4.3.1-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jul 17 2025 Cristian Le - 4.4.3.1-17 - Add LIB_SUFFIX flag explicitly (rhbz#2381173) From 8698323496e235eaada3102e9ead0348f2c2f21d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:35:33 +0000 Subject: [PATCH 42/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- allegro.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/allegro.spec b/allegro.spec index d31a292..8005301 100644 --- a/allegro.spec +++ b/allegro.spec @@ -1,6 +1,6 @@ Name: allegro Version: 4.4.3.1 -Release: 18%{?dist} +Release: 19%{?dist} Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -390,6 +390,9 @@ install -pm 644 addons/jpgalleg/readme.txt \ %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 4.4.3.1-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Wed Jul 23 2025 Fedora Release Engineering - 4.4.3.1-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild