CVS commit: pkgsrc/games/scummvm

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Aug 19 20:54:07 UTC 2024

Modified Files:
        pkgsrc/games/scummvm: distinfo
Added Files:
        pkgsrc/games/scummvm/patches:
            patch-engines_ags_lib_freetype-2.1.3_autohint_ahglyph.cpp

Log Message:
scummvm: fix build with latest freetype2


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 pkgsrc/games/scummvm/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/games/scummvm/patches/patch-engines_ags_lib_freetype-2.1.3_autohint_ahglyph.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/games/scummvm/distinfo
diff -u pkgsrc/games/scummvm/distinfo:1.62 pkgsrc/games/scummvm/distinfo:1.63
--- pkgsrc/games/scummvm/distinfo:1.62  Wed Apr 10 17:40:41 2024
+++ pkgsrc/games/scummvm/distinfo       Mon Aug 19 20:54:07 2024
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.62 2024/04/10 17:40:41 adam Exp $
+$NetBSD: distinfo,v 1.63 2024/08/19 20:54:07 wiz Exp $
 
 BLAKE2s (scummvm-2.8.1.tar.xz) = 01cba7189851c6291420344ba7308baf81970ee6eddd8da1289ad4fcbfa056b1
 SHA512 (scummvm-2.8.1.tar.xz) = aef6c7b83f087cf0742dcd1f896f5706e2408e54c4c902e75f03e69f4c5475b1d33a2149246646afb96c02aa2e85ba93995dff732b3aa84338b7bc96c62b802c
 Size (scummvm-2.8.1.tar.xz) = 207711376 bytes
 SHA1 (patch-Makefile) = 20566aad703a3ed4e2b65acdb921d0df3dc7f891
+SHA1 (patch-engines_ags_lib_freetype-2.1.3_autohint_ahglyph.cpp) = 036a8904ca8ebc4b99832607585047a984b87a40

Added files:

Index: pkgsrc/games/scummvm/patches/patch-engines_ags_lib_freetype-2.1.3_autohint_ahglyph.cpp
diff -u /dev/null pkgsrc/games/scummvm/patches/patch-engines_ags_lib_freetype-2.1.3_autohint_ahglyph.cpp:1.1
--- /dev/null   Mon Aug 19 20:54:07 2024
+++ pkgsrc/games/scummvm/patches/patch-engines_ags_lib_freetype-2.1.3_autohint_ahglyph.cpp      Mon Aug 19 20:54:07 2024
@@ -0,0 +1,52 @@
+$NetBSD: patch-engines_ags_lib_freetype-2.1.3_autohint_ahglyph.cpp,v 1.1 2024/08/19 20:54:07 wiz Exp $
+
+AGS: Support for FreeType 2.13.3 changes to FT_Outline struct
+
+https://github.com/scummvm/scummvm/commit/65977961b20ba97b1213b5267da0cb1efb49063b
+
+--- engines/ags/lib/freetype-2.1.3/autohint/ahglyph.cpp.orig   2024-03-15 22:57:03.000000000 +0000
++++ engines/ags/lib/freetype-2.1.3/autohint/ahglyph.cpp
+@@ -296,7 +296,11 @@ void ah_outline_save(AH_Outline outline,
+       AH_Point point = outline->points;
+       AH_Point point_limit = point + outline->num_points;
+       FT_Vector *vec = gloader->current.outline.points;
++#if (FREETYPE_MAJOR * 1000 + FREETYPE_MINOR) * 1000 + FREETYPE_PATCH < 2013003
+       char *tag = gloader->current.outline.tags;
++#else
++      unsigned char *tag = gloader->current.outline.tags;
++#endif
+ 
+       /* we assume that the glyph loader has already been checked for storage */
+       for (; point < point_limit; point++, vec++, tag++) {
+@@ -408,8 +412,11 @@ FT_Error ah_outline_load(AH_Outline outl
+ 
+               /* compute Bezier flags */
+               {
++#if (FREETYPE_MAJOR * 1000 + FREETYPE_MINOR) * 1000 + FREETYPE_PATCH < 2013003
+                       char *tag = source->tags;
+-
++#else
++                      unsigned char *tag = source->tags;
++#endif
+                       for (point = points; point < point_limit; point++, tag++) {
+                               switch (FT_CURVE_TAG(*tag)) {
+                               case FT_CURVE_TAG_CONIC:
+@@ -457,12 +464,17 @@ FT_Error ah_outline_load(AH_Outline outl
+               {
+                       AH_Point *contour = outline->contours;
+                       AH_Point *contour_limit = contour + outline->num_contours;
++#if (FREETYPE_MAJOR * 1000 + FREETYPE_MINOR) * 1000 + FREETYPE_PATCH < 2013003
+                       short *end = source->contours;
+                       short idx = 0;
++#else
++                      unsigned short *end = source->contours;
++                      unsigned short idx = 0;
++#endif
+ 
+                       for (; contour < contour_limit; contour++, end++) {
+                               contour[0] = points + idx;
+-                              idx = (short)(end[0] + 1);
++                              idx = end[0] + 1;
+                       }
+               }
+