diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-03-14 12:47:11 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-03-14 12:47:11 +0000 |
| commit | 6e8f309a3caea95ab3e7947a011139cf9aba8b25 (patch) | |
| tree | 839c2fa8c26145c103aa56fce03834174359caba /games-emulation/hatari | |
| parent | 404b23b9395fafe5c40a1fd4d859c6cd17b4a646 (diff) | |
gentoo auto-resync : 14:03:2024 - 12:47:11
Diffstat (limited to 'games-emulation/hatari')
| -rw-r--r-- | games-emulation/hatari/Manifest | 3 | ||||
| -rw-r--r-- | games-emulation/hatari/files/adccd68b16eff815590c1ec993354ef8e752ecfd.patch | 36 | ||||
| -rw-r--r-- | games-emulation/hatari/hatari-2.4.1-r1.ebuild (renamed from games-emulation/hatari/hatari-2.4.1.ebuild) | 4 |
3 files changed, 41 insertions, 2 deletions
diff --git a/games-emulation/hatari/Manifest b/games-emulation/hatari/Manifest index 1ea628f776c0..b33d0cbcd844 100644 --- a/games-emulation/hatari/Manifest +++ b/games-emulation/hatari/Manifest @@ -1,5 +1,6 @@ +AUX adccd68b16eff815590c1ec993354ef8e752ecfd.patch 1247 BLAKE2B cf4f29010a08c7bf0ffb6e87b0b2a56ad24d06c70d646a05fc7073e0ab308e119d531bc8a94bf4f52995c91b70fea3f3e9ed29cc5de12a0f86bbf7b89ae7fcad SHA512 9d1d7c63860d04307bd178748ccb0138ffca658927eecc613b2ef4aaeb0013d9485ee003914b3824d74bab7b71c954558bb0b3f7399e84d7812edd6971f496d4 AUX hatari-2.3.1-caps5-include-path.patch 500 BLAKE2B 9462c680cf22368e06f37d313d0d0917b5904977ab0001fc3427bb8532d611481e0414c7a9c76a83f8c3a00691dd702c22a4c27eb3d1ef0a8bfbd5d48d636895 SHA512 53230cfbfc1904fba1af3d9a7554425d76e75f4a4fa51906ebfe12c9f178633bc63334036f3192643dfa2a3d51e5729c7932a58ca009902585a1653b44c28457 AUX hatari-2.3.1-cmake-include-checksym.patch 388 BLAKE2B 45bc03fc6be8feae6d16083ea6fd5c2fbe1f63103c8a274e9e2104d39cb4050dd5cb0ac51e679fbb65c17d0e2df080245e0e5800f14578e956cbff2dd6c3e9f5 SHA512 b9afa6022e7be9dfe9ab47b791d5e7a64e835ae2098f5b04737b2ffc952598bc0e90a181609629d03f9568c8dcd4e5772cb96bd1416531ccba6c66a1d33c439e DIST hatari-2.4.1.tar.bz2 4446656 BLAKE2B 0844f14f2161de931ba098d290655152ecde354a80cc9c18b460fda77149759386cf7ed46d0ce1dd36dc303f1f3cfe421f37f169e06d46a06589cef1d601dbc6 SHA512 90c555150b0fa86b88e4ba3360384edf6afa05d45b82b3260853178b77fd542da6f31bd2e80c8307380fff9c61f0230545ec987e6e74b8c3d708bc5ef5ca8f42 -EBUILD hatari-2.4.1.ebuild 2450 BLAKE2B ae06273c0ebba4609ba94879c8a904f0cd09f7cd249feced774d5488f6938eb3f6a9042dd5e7d96d16674945a1ccf52a5962349ba10fe8baeff47718700e7b10 SHA512 13965e67a118ba6b6b2028b69493b53de0b6065bc9afa9144df510b210b1f63d753631f23c10fe1b434e4f13184843a9c956cdd77a228ae2c284c4fd38c69195 +EBUILD hatari-2.4.1-r1.ebuild 2569 BLAKE2B efa7564e98fc1dc6ab781568486797078608e27f676c6fa9605887d8ae63ba6bccff7f0c32897b1704991dbe8b1d0363e5e242782509b69173760d2f1b14fc44 SHA512 875e7d64e4fd81bced35e37fd9305e931aa9eedd483985e08a79493fee45ab2da4e8a055472f9f7841fc3f10e77dda0cb14295f153df00095c121cf7eee6fba7 MISC metadata.xml 551 BLAKE2B 345a7f3e8e1b73d6b6b95e951ee6eab25c2f681ce68020261b3d4ccad07215905b4c726707bcc16db0624d8d04ebe58c31de7ae502999661ce007fd8041ccd63 SHA512 e516f8d601cb654527b4590b865a621df0a661dce8bb40c31a43233995f28188efd1a9babe9b616ee394b7f7eef1fd667d3bb425382017e2f79c870979e1d7d7 diff --git a/games-emulation/hatari/files/adccd68b16eff815590c1ec993354ef8e752ecfd.patch b/games-emulation/hatari/files/adccd68b16eff815590c1ec993354ef8e752ecfd.patch new file mode 100644 index 000000000000..d8623cb4d66b --- /dev/null +++ b/games-emulation/hatari/files/adccd68b16eff815590c1ec993354ef8e752ecfd.patch @@ -0,0 +1,36 @@ +From adccd68b16eff815590c1ec993354ef8e752ecfd Mon Sep 17 00:00:00 2001 +From: Thomas Huth <huth@tuxfamily.org> +Date: Thu, 21 Dec 2023 14:33:19 +0100 +Subject: [PATCH] Fix compiler warning that occurs with link-time optimization + +With LTO enable, the build fails with: + + [100%] Linking C executable hatari + .../src/cpu/savestate.h:281:14: error: type of 'savestate_fname' does not + match original declaration [-Werror=lto-type-mismatch] + 281 | extern TCHAR savestate_fname[MAX_DPATH]; + | ^ + .../src/cpu/custom.c:40:8: note: + 'savestate_fname' was previously declared here + 40 | TCHAR *savestate_fname; + | ^ + lto1: all warnings being treated as errors + +Declare the array according to the definition in the header file to fix it. +--- + src/cpu/custom.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/cpu/custom.c b/src/cpu/custom.c +index 15971ceff..aff0c0253 100644 +--- a/src/cpu/custom.c ++++ b/src/cpu/custom.c +@@ -37,7 +37,7 @@ extern struct regstruct mmu_backup_regs; + evt_t currcycle; + /* declared in savestate.h */ + int savestate_state = 0; +-TCHAR *savestate_fname; ++TCHAR savestate_fname[MAX_DPATH]; + /* declared in custom.h */ + uae_u32 hsync_counter = 0, vsync_counter = 0; + #endif diff --git a/games-emulation/hatari/hatari-2.4.1.ebuild b/games-emulation/hatari/hatari-2.4.1-r1.ebuild index 34e97a9d20bf..c2bc4be39b99 100644 --- a/games-emulation/hatari/hatari-2.4.1.ebuild +++ b/games-emulation/hatari/hatari-2.4.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -43,6 +43,8 @@ BDEPEND="${PYTHON_DEPS}" PATCHES=( "${FILESDIR}"/${PN}-2.3.1-caps5-include-path.patch "${FILESDIR}"/${PN}-2.3.1-cmake-include-checksym.patch + # backport upstream patch for -Werror=lto-type-mismatch + "${FILESDIR}"/adccd68b16eff815590c1ec993354ef8e752ecfd.patch ) DOCS=( |