mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
games-emulation/hatari: drop 2.4.1-r1
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
This commit is contained in:
@@ -1,2 +1 @@
|
||||
DIST hatari-2.4.1.tar.bz2 4446656 BLAKE2B 0844f14f2161de931ba098d290655152ecde354a80cc9c18b460fda77149759386cf7ed46d0ce1dd36dc303f1f3cfe421f37f169e06d46a06589cef1d601dbc6 SHA512 90c555150b0fa86b88e4ba3360384edf6afa05d45b82b3260853178b77fd542da6f31bd2e80c8307380fff9c61f0230545ec987e6e74b8c3d708bc5ef5ca8f42
|
||||
DIST hatari-2.5.0.tar.bz2 2820580 BLAKE2B 42d955db9a219632d39697041667c2f9ddbd2cc06472c7ca508a097a3dcd5681a73a1069a3a6e788eca79a9aae2ff1ce00288a09556c8bedd697bcd77256f653 SHA512 53c5d5164ccaba8abea2babfbca971995fe6bd4f796d418f01243d3d40ac43371ba04c20600c5117b3e7b7b9a36d092e15cd209cc08324d17a05a7ca8e93cd84
|
||||
|
||||
@@ -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
|
||||
@@ -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)
|
||||
@@ -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
|
||||
}
|
||||
Reference in New Issue
Block a user