summaryrefslogtreecommitdiff
path: root/games-emulation/hatari
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-05-13 00:01:18 +0100
committerV3n3RiX <venerix@koprulu.sector>2024-05-13 00:01:18 +0100
commita25cc082a26782e5d39ded4559c91ff11bc3c299 (patch)
tree6cd0802dd248058d540f1f5f472c5df98216f154 /games-emulation/hatari
parentd72a987a342949e200b5e9decbd71f246da53788 (diff)
gentoo auto-resync : 13:05:2024 - 00:01:18
Diffstat (limited to 'games-emulation/hatari')
-rw-r--r--games-emulation/hatari/Manifest4
-rw-r--r--games-emulation/hatari/files/adccd68b16eff815590c1ec993354ef8e752ecfd.patch36
-rw-r--r--games-emulation/hatari/files/hatari-2.3.1-cmake-include-checksym.patch12
-rw-r--r--games-emulation/hatari/hatari-2.4.1-r1.ebuild100
4 files changed, 0 insertions, 152 deletions
diff --git a/games-emulation/hatari/Manifest b/games-emulation/hatari/Manifest
index 4d0687cbc3c5..274bb0533ecd 100644
--- a/games-emulation/hatari/Manifest
+++ b/games-emulation/hatari/Manifest
@@ -1,8 +1,4 @@
-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
DIST hatari-2.5.0.tar.bz2 2820580 BLAKE2B 42d955db9a219632d39697041667c2f9ddbd2cc06472c7ca508a097a3dcd5681a73a1069a3a6e788eca79a9aae2ff1ce00288a09556c8bedd697bcd77256f653 SHA512 53c5d5164ccaba8abea2babfbca971995fe6bd4f796d418f01243d3d40ac43371ba04c20600c5117b3e7b7b9a36d092e15cd209cc08324d17a05a7ca8e93cd84
-EBUILD hatari-2.4.1-r1.ebuild 2569 BLAKE2B efa7564e98fc1dc6ab781568486797078608e27f676c6fa9605887d8ae63ba6bccff7f0c32897b1704991dbe8b1d0363e5e242782509b69173760d2f1b14fc44 SHA512 875e7d64e4fd81bced35e37fd9305e931aa9eedd483985e08a79493fee45ab2da4e8a055472f9f7841fc3f10e77dda0cb14295f153df00095c121cf7eee6fba7
EBUILD hatari-2.5.0.ebuild 2475 BLAKE2B fb5109ee85f92738f5693b55e132c3b6aac3c4aa302ad969b799fba35dd299a3192ce28c0d8f87d5465b58d626073fe8bbd9e8fb4287b0ed246ad6641df516a6 SHA512 69e3458b5132f1893085e6c2d2dcd940a13cb9d0337447a3a50f43cb74b00734205f3e05abd159e208dbd9ea0f0011c1c0f318e1d8b36c283b9209125262f3ec
MISC metadata.xml 654 BLAKE2B 72517d404da9efed9281d4078ab99158626321e7404be8cb05e30c96f2a479aee6a1fb082e83113ac841604eec5fbc93fd191e47bc95772381fb4b74097f8b0f SHA512 d232a0bc529fb5b46dd44322b3913a5a6dd7da2b77b4177284484c07bdb3956b04a930185214aee07efc9ccebec74f034dc43597c5eafa87f2087a06e1bc84af
diff --git a/games-emulation/hatari/files/adccd68b16eff815590c1ec993354ef8e752ecfd.patch b/games-emulation/hatari/files/adccd68b16eff815590c1ec993354ef8e752ecfd.patch
deleted file mode 100644
index d8623cb4d66b..000000000000
--- a/games-emulation/hatari/files/adccd68b16eff815590c1ec993354ef8e752ecfd.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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/files/hatari-2.3.1-cmake-include-checksym.patch b/games-emulation/hatari/files/hatari-2.3.1-cmake-include-checksym.patch
deleted file mode 100644
index 39da11ea307d..000000000000
--- a/games-emulation/hatari/files/hatari-2.3.1-cmake-include-checksym.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Fix edge case build failure triggered by passing every
-DISABLE_FIND_PACKAGE, including disabling the normally
-always-enabled readline.
-
-CMake Error at CMakeLists.txt:229 (check_symbol_exists):
- Unknown CMake command "check_symbol_exists".
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -12,2 +12,3 @@
- include(CheckStructHasMember)
-+include(CheckSymbolExists)
- include(CheckCCompilerFlag)
diff --git a/games-emulation/hatari/hatari-2.4.1-r1.ebuild b/games-emulation/hatari/hatari-2.4.1-r1.ebuild
deleted file mode 100644
index c2bc4be39b99..000000000000
--- a/games-emulation/hatari/hatari-2.4.1-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake python-single-r1 xdg
-
-DESCRIPTION="Atari ST emulator"
-HOMEPAGE="https://hatari.tuxfamily.org/"
-SRC_URI="https://download.tuxfamily.org/hatari/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X capsimage gui png portmidi readline udev zlib"
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- png? ( zlib )"
-
-COMMON_DEPEND="
- media-libs/libsdl2[X?,joystick,sound,video]
- X? ( x11-libs/libX11 )
- capsimage? ( >=dev-libs/spsdeclib-5.1-r1 )
- png? ( media-libs/libpng:= )
- portmidi? ( media-libs/portmidi )
- readline? ( sys-libs/readline:= )
- udev? ( virtual/udev )
- zlib? ( sys-libs/zlib:= )"
-RDEPEND="
- ${PYTHON_DEPS}
- ${COMMON_DEPEND}
- gui? (
- $(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
- x11-libs/gtk+:3[introspection]
- )
- >=games-emulation/emutos-1.1.1"
-DEPEND="
- ${COMMON_DEPEND}
- X? ( x11-base/xorg-proto )"
-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=(
- readme.txt
- doc/{bugs,changelog,scsi-driver,thanks,video-recording}.txt
-)
-
-src_prepare() {
- cmake_src_prepare
-
- sed -i "s/\.1\.gz\b/.1/;T;s/gzip[^\$]*/cat /" {*/,}*/CMakeLists.txt || die
- sed -i "s:doc/${PN}:doc/${PF}/html:" python-ui/uihelpers.py || die
- sed -e "s/python3/${EPYTHON}/" \
- -e 's/mkdosfs/mkfs.fat/' \
- -i tools/atari-hd-image.sh || die
-
- # use emutos package rather than bundled ROM
- rm src/tos.img || die
- cat <<-EOF > hatari.cfg || die
- [ROM]
- szTosImageFileName = ${EPREFIX}/usr/share/emutos/etos1024k.img
- EOF
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_SHARED_LIBS=OFF
- -DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html
- -DETCDIR="${EPREFIX}"/etc
- $(cmake_use_find_package X X11)
- $(cmake_use_find_package capsimage CapsImage)
- $(cmake_use_find_package png PNG)
- $(cmake_use_find_package portmidi PortMidi)
- $(cmake_use_find_package readline Readline)
- $(cmake_use_find_package udev Udev)
- $(cmake_use_find_package zlib ZLIB)
- $(usev !gui -DPYTHON_EXECUTABLE=false) # only disables python-ui/
- )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- insinto /etc
- doins hatari.cfg
-
- mv "${ED}"/usr/share/doc/${PF}/{html/*.txt,} || die
-
- python_fix_shebang "${ED}"/usr/bin
- use gui && python_fix_shebang "${ED}"/usr/share/${PN}/${PN}ui
-}