gentoo auto-resync : 13:08:2023 - 12:10:18

4 files changed, 35 insertions, 1 deletions

diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index 702767f7c4de..22016277827e 100644
--- a/games-util/Manifest.gz
+++ b/games-util/Manifest.gz
diff --git a/games-util/grfcodec/Manifest b/games-util/grfcodec/Manifest
index fac1c79e70e5..4772288c3f31 100644
--- a/games-util/grfcodec/Manifest
+++ b/games-util/grfcodec/Manifest
@@ -1,8 +1,9 @@
 AUX 6.0.6_p20210310/0001-Remove-brittle-apWrapper-code.patch 3501 BLAKE2B 2132586124cfe2232c655f5041a2ef28b46cac8e72acecd2cb9004bece074c915c0f9609455e73f2ce8d95b28c5d1ac7d4739c4264e90e1a570f33d136bd4f9d SHA512 68a7a2329dfeee4ad28562b088948ddd6457e0f6b14a63e6be376041897070c5acc756b14e158dc4631a4fb1e0197f523d8bb76272d7d39c093e49259efa700f
 AUX 6.0.6_p20210310/0002-Fix-ODR-violations.patch 1722 BLAKE2B 941c2c95b7876b8b2be39e623cbff969b0609e50a3c798acd34052f0c13bf048971fe2b07885bcdc2921e66a928ce6d11c2bee71e26602116f104725acf3d04c SHA512 e73f4ee685230128489d47f3d10f296456debd3e6a85b6ccdbecb6ceb550a59cb95cbd37b2a222883b058b15aa319221e9040c4bdda4511e74c05e26a778ea50
+AUX grfcodec-6.0.6_p20230811-action-5.patch 1114 BLAKE2B c71b3e752623872b82e6a3c52df35e8ffc92400389ec1b35fa7af0e1288c5f5607600761be0bf89515248a1e9c976228a2c964bcb570d2f6afe24e87666916e6 SHA512 ac67e720c2ed37bd0db8323c7ac93315aaea03ebe528d52eba67aaaedfae2a6c53d35628da6ca1771dc50598338ac25875c380df819b072f42e6f64c7aecdabf
 AUX grfcodec-6.0.6_p20230811-no-fortify-source.patch 585 BLAKE2B 62b2ec66f6cfffd26bc69c1489d10b9bc568b5343d186300728e641ab1b2a54b13658045f8dc45a331792a204a71d5e6dbf5fbc84f3e1e1cec53ee165a2525b9 SHA512 1155b81eefe3e299907bdfc19d170b17e28c44b67554e71b21a501b6e84d4e889c354f3ab0b3e29ebb1210edede41d6b73c9a24e8b241dd6af419547b22bd298
 DIST grfcodec-6.0.6_p20210310.tar.gz 205795 BLAKE2B 24d803e208b2fc465ae71611c0c0fb2737bfa8c5a28375bc08a6220581d7b07bb2f2a390e2ddb7f4beb8a80951862473919d41bce83364af70b6dc646f0f3f8e SHA512 10f4ec28c69d87e397f0fb5b497dbefce8fcd826731d3a0a864cbbd333b7df188ab0087445644ad245aeff65a8b6563dfdfa657ac1a2248e56e296c01f7d58a8
 DIST grfcodec-6.0.6_p20230811.tar.gz 205324 BLAKE2B 00d36b6785d00edec061cc0f0a695225a78c487bc66c4521f0f3da1050304bc382ed78d1df8dff8602b35b167505388ad993c46f01ac39960c131a6f5c7264eb SHA512 95a883636720ad1fdd0a2e17cba60b6cde15b5fe0337cfe2330db75d60e9a2bdb1dea3c06bb8f8acace8989b6abaf6d1845b30c5bc5f6c76f34e5aa76f36ddd4
 EBUILD grfcodec-6.0.6_p20210310-r1.ebuild 993 BLAKE2B 1cb3e7064e2f72b373c4b0dd83d8c3f16a017dddd7a3351328e8ffdddb84f70e3aba7937eb49b47230d74684240cd91873f1434b1bc18bb7c24d08dbaabcb464 SHA512 c69963730921fe1260bb24a90ea78b9b2ea6db788f057586d12eae09f6943144ae6dca2cfec5318ea13fd45b0c83984549f941224af5b0ea23fda8ddd051ff26
-EBUILD grfcodec-6.0.6_p20230811.ebuild 1032 BLAKE2B 0852d527c7957930e1d41cdbaaf997f0728a56b6823455a00b2de872d7d7f817b9c1a9aa59a65533b87d4bb155339ba023dbe7c3bbb17e2152b6e57cb7bf840f SHA512 2e162f970d2f0961b9ab59583b4adbe461db2b8e94c6c11b4c66678fc387ef307698a4f94c1127a0d2b7de85a790735fee8e5e5c521bb4b5cf98c626a79fc187
+EBUILD grfcodec-6.0.6_p20230811-r1.ebuild 1083 BLAKE2B 37eb930403c15423cb87ac926825b4a7deb7731d35e6c340c13c57045b0ace5e5baba21030320435776bdc8c4923bdc076783fbc60e2216a094c5e6803feab47 SHA512 2ef328d4219b951d06cde84ee03f313a3aa8955f30bd6e01d59872141ace5b1207132d063d6fe3628caf53e46ab61dcc638353b7a26c660932b4832db218ca88
 MISC metadata.xml 335 BLAKE2B 32e45cd9e4b4e6a0ae59d41d18ef90ca9a39389016247b71b6b1b7069a6fd1b73c92bc331d10059942aa57693a2405d90915249393e2ee9b515027f97b5fadf4 SHA512 36a58b8b3e9b793b7cc62def166dc87f24c3df029916c3226fe66f5213dcf156038a31707e81c52defbacd0a7e40fc3c5df476c93d9f1380556ac02140ef0fc2
diff --git a/games-util/grfcodec/files/grfcodec-6.0.6_p20230811-action-5.patch b/games-util/grfcodec/files/grfcodec-6.0.6_p20230811-action-5.patch
new file mode 100644
index 000000000000..333c9f5ed2e9
--- /dev/null
+++ b/games-util/grfcodec/files/grfcodec-6.0.6_p20230811-action-5.patch
@@ -0,0 +1,30 @@
+Bug: https://bugs.gentoo.org/912189
+Upstream: https://github.com/OpenTTD/grfcodec/pull/23
+
+From de32367a6896c9f310fa48929e29643beaa08af4 Mon Sep 17 00:00:00 2001
+From: Matthew Smith <matthew@gentoo.org>
+Date: Sun, 13 Aug 2023 09:30:01 +0100
+Subject: [PATCH] data: Fix Action5 table
+
+The alternative sprite counts were added into the action 5 table, but
+the counts were not updated. This caused all of the types defined after
+type 0x09 to be mis-read.
+
+Fixes: d5a7b850bcef30c0bfd17ceeb4a18c431770f468
+--- a/src/data.cpp
++++ b/src/data.cpp
+@@ -170,9 +170,9 @@ NDF_HEADER(0x04, 17),
+ /*06*/ OFFSET,          OPTIONS(2), 0x4A, 0x5A,
+ /*07*/                  OPTIONS(1), 0x5D,
+ /*08*/ OFFSET,          OPTIONS(1), 0x41,
+-/*09*/ OFFSET,          OPTIONS(1), 0x06, 0x12,
++/*09*/ OFFSET,          OPTIONS(2), 0x06, 0x12,
+ /*0A*/ OFFSET | RECOLOUR | WORD, OPTIONS(1), W(0x100),
+-/*0B*/ OFFSET,          OPTIONS(1), 0x71, 0x77,
++/*0B*/ OFFSET,          OPTIONS(2), 0x71, 0x77,
+ /*0C*/                  OPTIONS(1), 0x85,
+ /*0D*/                  OPTIONS(2), 0x10, 0x12,
+ /*0E*/ MIXED,           OPTIONS(1), 0x00,
+-- 
+2.41.0
+
diff --git a/games-util/grfcodec/grfcodec-6.0.6_p20230811.ebuild b/games-util/grfcodec/grfcodec-6.0.6_p20230811-r1.ebuild
index 9effc99b535d..600aa5d3e4a8 100644
--- a/games-util/grfcodec/grfcodec-6.0.6_p20230811.ebuild
+++ b/games-util/grfcodec/grfcodec-6.0.6_p20230811-r1.ebuild
@@ -22,6 +22,9 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	# Bug #894648
 	"${FILESDIR}"/${P}-no-fortify-source.patch
+
+	# Bug #912189
+	"${FILESDIR}"/${P}-action-5.patch
 )
 
 src_configure() {