From 450f38b7e906906c2f2405feb968daa487a8d900 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Feb 18 2019 08:55:37 +0000 Subject: New upstream release 4.4.3 --- 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