Date: Mon, 4 Feb 2019 06:45:36 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r492099 - in head/games/ags: . files Message-ID: <201902040645.x146jatF018624@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Mon Feb 4 06:45:36 2019 New Revision: 492099 URL: https://svnweb.freebsd.org/changeset/ports/492099 Log: games/ags: Backport some patches to fix build with Allegro 4.4.3 PR: 235477 Added: head/games/ags/files/patch-allegro-4.4.3 (contents, props changed) Modified: head/games/ags/Makefile Modified: head/games/ags/Makefile ============================================================================== --- head/games/ags/Makefile Mon Feb 4 06:10:03 2019 (r492098) +++ head/games/ags/Makefile Mon Feb 4 06:45:36 2019 (r492099) @@ -2,6 +2,7 @@ PORTNAME= ags DISTVERSION= 3.4.1.15 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= https://github.com/adventuregamestudio/ags/releases/download/v.${DISTVERSION}/ DISTNAME= ags_linux_v.${DISTVERSION} Added: head/games/ags/files/patch-allegro-4.4.3 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/ags/files/patch-allegro-4.4.3 Mon Feb 4 06:45:36 2019 (r492099) @@ -0,0 +1,80 @@ +Fix build with Allegro 4.4.3 which remove the f* function aliases + +https://github.com/adventuregamestudio/ags/commit/44d954493bb5f3e95a11a4eddbb62bd6110b1b63.patch +https://github.com/adventuregamestudio/ags/commit/575db9426239d37e3e6692c7e1848554cb9902f9.patch + +--- Common/gfx/allegrobitmap.h.orig 2018-09-10 19:17:48 UTC ++++ Common/gfx/allegrobitmap.h +@@ -20,6 +20,7 @@ + //============================================================================= + #ifndef __AGS_CN_GFX__ALLEGROBITMAP_H + #define __AGS_CN_GFX__ALLEGROBITMAP_H ++#define ALLEGRO_NO_FIX_ALIASES + + #include <allegro.h> + #include "core/types.h" +--- Common/libsrc/aastr-0.1.1/AAROT.c.orig 2018-09-10 19:17:48 UTC ++++ Common/libsrc/aastr-0.1.1/AAROT.c +@@ -71,8 +71,8 @@ _aa_rotate_bitmap (BITMAP *_src, BITMAP *_dst, int _x, + /* Width and height of source and destination. */ + sw = _src->w; + sh = _src->h; +- fdw = fmul (ABS (_scalex), itofix (sw)); +- fdh = fmul (ABS (_scaley), itofix (sh)); ++ fdw = fixmul (ABS (_scalex), itofix (sw)); ++ fdh = fixmul (ABS (_scaley), itofix (sh)); + dw = fixtoi (fdw); + dh = fixtoi (fdh); + if ((dw <= 0) || (dh <= 0)) +@@ -85,14 +85,14 @@ _aa_rotate_bitmap (BITMAP *_src, BITMAP *_dst, int _x, + fx0 = itofix (_x); + fy0 = itofix (_y); + +- fsinangle = fsin (_angle); +- fcosangle = fcos (_angle); ++ fsinangle = fixsin (_angle); ++ fcosangle = fixcos (_angle); + + /* Map source (half) edges onto destination. */ +- fux = fmul (fdw, fcosangle); +- fuy = fmul (fdw, fsinangle); +- fvx = -fmul (fdh, fsinangle); +- fvy = fmul (fdh, fcosangle); ++ fux = fixmul (fdw, fcosangle); ++ fuy = fixmul (fdw, fsinangle); ++ fvx = -fixmul (fdh, fsinangle); ++ fvy = fixmul (fdh, fcosangle); + + /* Coordinates of corners in destination. */ + point[0].dx = fixtoi (fx0 - fux - fvx); +--- Common/util/wgt2allg.h.orig 2018-09-10 19:17:48 UTC ++++ Common/util/wgt2allg.h +@@ -26,6 +26,7 @@ + #ifdef USE_ALLEGRO3 + #include <allegro3.h> + #else ++#define ALLEGRO_NO_FIX_ALIASES + #include "allegro.h" + #endif + +--- Engine/ac/route_finder.cpp.orig 2018-09-10 19:17:48 UTC ++++ Engine/ac/route_finder.cpp +@@ -683,15 +683,15 @@ void calculate_move_stage(MoveList * mlsp, int aaa) + } + } + +- fixed angl = fatan(fdiv(ydist, xdist)); ++ fixed angl = fixatan(fixdiv(ydist, xdist)); + + // now, since new opp=hyp*sin, work out the Y step size + //fixed newymove = useMoveSpeed * fsin(angl); +- fixed newymove = fixmul(useMoveSpeed, fsin(angl)); ++ fixed newymove = fixmul(useMoveSpeed, fixsin(angl)); + + // since adj=hyp*cos, work out X step size + //fixed newxmove = useMoveSpeed * fcos(angl); +- fixed newxmove = fixmul(useMoveSpeed, fcos(angl)); ++ fixed newxmove = fixmul(useMoveSpeed, fixcos(angl)); + + if (destx < ourx) + newxmove = -newxmove;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902040645.x146jatF018624>