diff options
Diffstat (limited to 'games-engines')
| -rw-r--r-- | games-engines/Manifest.gz | bin | 3710 -> 3713 bytes | |||
| -rw-r--r-- | games-engines/scummvm/Manifest | 3 | ||||
| -rw-r--r-- | games-engines/scummvm/files/scummvm-2.8.1-freetype-2.13.3.patch | 59 | ||||
| -rw-r--r-- | games-engines/scummvm/scummvm-2.8.1-r1.ebuild | 4 |
4 files changed, 65 insertions, 1 deletions
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz Binary files differindex 09b4d96e98a5..1e72251ed6c7 100644 --- a/games-engines/Manifest.gz +++ b/games-engines/Manifest.gz diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest index 418050859735..fb7f719986e1 100644 --- a/games-engines/scummvm/Manifest +++ b/games-engines/scummvm/Manifest @@ -1,6 +1,7 @@ +AUX scummvm-2.8.1-freetype-2.13.3.patch 2206 BLAKE2B 37b72d1c12dd39fb6b8df294db3000ff677c9c367e059ffa312a31ddf54ade7eccce2bf81ee3aec4460cd9a6640c52eb054da1d78a5ca78cee50da09d11108a7 SHA512 f1945f818f18f2b78451cddfa0f4c0117c4be1b7ceeb4f4955d66dbd96766294794abc8ac6b4ae64c5262744c47d9da50ac471b66e21867a3588f246b06f4066 DIST scummvm-2.8.0.tar.xz 207362400 BLAKE2B 2e0354189bfa50b5af87c9019400c114c7fd3072afeb6cee50c230d27171ae109552c855b07f027769c10f6f325dafd77c56fa17b1c5a61b11ece3c1f54efe53 SHA512 e4e728a668fe3c1b161b56ff788011673766e7429bc27bafb2b4a7f724093b719f7fd47f0995f1db5dad42ecf3ee260fe51d549f85eb2a68862b799962c34632 DIST scummvm-2.8.1.tar.xz 207711376 BLAKE2B 716503fbbd736e522918203400ccf777bc24a8e43c8c030c0e86d9c4f3c3da3f0c580269781fe030901e06854d43e2ed2f6ec9bc4e269c4d4dde8d3e08f494f2 SHA512 aef6c7b83f087cf0742dcd1f896f5706e2408e54c4c902e75f03e69f4c5475b1d33a2149246646afb96c02aa2e85ba93995dff732b3aa84338b7bc96c62b802c EBUILD scummvm-2.8.0-r1.ebuild 3216 BLAKE2B b8c5e62c9e658a3be02d7aa5ebdf7608b5e894a7ae38e830d180c27c99bdf4a6ccda106b4485f5da2a2253d872e7cad38c29a2952d33357642ddba38ada01acb SHA512 2d1ac02a7a7dff08bba47ef29f1ea86895ae28631217fc0a0fe5542f4b85afb351974ff86d414833518fe9832840c81ab4b3b6bc86de31827fdf359b551d7d22 -EBUILD scummvm-2.8.1-r1.ebuild 3216 BLAKE2B f9e7b5224ef26fbfe336b4ca4d7a234a0c8c0246d6c4b21ae2cecd7c99b876c94d1d644c67c099657b0be1ae4e393335091434ea32ebf8ac75036ad6bff622d3 SHA512 1f110d14f71728315428ebdd1693c122332de7809c23591f81428b910e22af7b001bffa963d5b50e0f941cebfda5d5093cfb021680221920c5e220bca2ebd0a4 +EBUILD scummvm-2.8.1-r1.ebuild 3271 BLAKE2B 45015b16784c174d874ee6a325f39a473285cf0ffbe7ea61e700b0e5aec4a2b9258ff298563b88fa881af83e81f81b64ad630875fa36f42aee2b1b534ecfdaee SHA512 8e22b221a5b0efc48ae3d50f41c1d4cf30c6743e67760aef8a3fd9078251cc3106a86abb1b47749993d5db326ccbe5d3f941d664bad69e4e8f9e001bbad2e1f5 EBUILD scummvm-9999.ebuild 3216 BLAKE2B 88679a0b85c6e056267df0c7d8c3ba3a5eefdf33af24dbd05a358e605282034dfed6a41bf15051abbb1684834caf04c88b7db5a9468bb5d4d0e2010b102c5225 SHA512 e2bdbfa0f9b7b600386283d1ea0fdaac9f9a13d3c3da2c34d24156ad47cc27e0e7a293e179d4385eba9c869dbaccdfa45e22d8bfe88d2526a96387cf6672b5a8 MISC metadata.xml 988 BLAKE2B 66ced0459606e6037ec74c63fd71605461b8910e9c9376969bf3487e8fdde8b3c7f85cdf3c054f32abd5f72bfe53de028db8d81a3c4c3da220b306f4e2a6eb27 SHA512 2b523111571ecc650a2723c3bbdd2877a33d9380cd7e67e37c556ac1e0cc26aef07ad2c04fab69f012e59c3fab6dd7d7385125e13e200683c4abd85ec1899e92 diff --git a/games-engines/scummvm/files/scummvm-2.8.1-freetype-2.13.3.patch b/games-engines/scummvm/files/scummvm-2.8.1-freetype-2.13.3.patch new file mode 100644 index 000000000000..3498c17857e0 --- /dev/null +++ b/games-engines/scummvm/files/scummvm-2.8.1-freetype-2.13.3.patch @@ -0,0 +1,59 @@ +https://bugs.gentoo.org/938014 +https://github.com/scummvm/scummvm/pull/6046 + +From 391aa847c20bae4827fd8e868267a0cf4fc72df4 Mon Sep 17 00:00:00 2001 +From: antoniou79 <a.antoniou79@gmail.com> +Date: Wed, 14 Aug 2024 22:50:32 +0300 +Subject: [PATCH] AGS: Support for FreeType 2.13.3 changes to FT_Outline struct + +FreeType 2.13.3 changed a few types of the struct members for FT_Outline struct to unsigned + +This is the relevant commit from the FreeType source (github): +https://github.com/freetype/freetype/commit/2a7bb4596f566a34fd53932af0ef53b956459d25 +--- a/engines/ags/lib/freetype-2.1.3/autohint/ahglyph.cpp ++++ b/engines/ags/lib/freetype-2.1.3/autohint/ahglyph.cpp +@@ -296,7 +296,11 @@ void ah_outline_save(AH_Outline outline, AH_Loader gloader) { + 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 outline, FT_Face face) { + + /* 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 outline, FT_Face face) { + { + 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; + } + } + + diff --git a/games-engines/scummvm/scummvm-2.8.1-r1.ebuild b/games-engines/scummvm/scummvm-2.8.1-r1.ebuild index 062895592e49..2d7c8e7c8b65 100644 --- a/games-engines/scummvm/scummvm-2.8.1-r1.ebuild +++ b/games-engines/scummvm/scummvm-2.8.1-r1.ebuild @@ -71,6 +71,10 @@ BDEPEND=" x86? ( dev-lang/nasm ) " +PATCHES=( + "${FILESDIR}"/${P}-freetype-2.13.3.patch +) + src_prepare() { default |