* [gentoo-commits] repo/gentoo:master commit in: games-emulation/hatari/, games-emulation/hatari/files/
@ 2018-08-12 17:18 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2018-08-12 17:18 UTC (permalink / raw
To: gentoo-commits
commit: ec46ba80a028ff94d528be8c6c61294b75015287
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Sat Aug 11 23:03:32 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Aug 12 17:18:03 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec46ba80
games-emulation/hatari: fixes build with new caps
Using dev-libs/spsdeclib instead games-emulation/caps, minor fixes in
ebuild.
Closes: https://github.com/gentoo/gentoo/pull/9370
Package-Manager: Portage-2.3.40, Repoman-2.3.9
.../hatari/files/hatari-2.1.0_caps5_files.patch | 147 +++++++++++++++++++++
games-emulation/hatari/hatari-2.1.0-r1.ebuild | 79 +++++++++++
2 files changed, 226 insertions(+)
diff --git a/games-emulation/hatari/files/hatari-2.1.0_caps5_files.patch b/games-emulation/hatari/files/hatari-2.1.0_caps5_files.patch
new file mode 100644
index 00000000000..cac630f66f4
--- /dev/null
+++ b/games-emulation/hatari/files/hatari-2.1.0_caps5_files.patch
@@ -0,0 +1,147 @@
+diff -Nuar hatari-2.1.0-orig/cmake/FindCapsImage.cmake hatari-2.1.0/cmake/FindCapsImage.cmake
+--- hatari-2.1.0-orig/cmake/FindCapsImage.cmake 2018-07-28 20:32:59.164780571 +0300
++++ hatari-2.1.0/cmake/FindCapsImage.cmake 2018-07-28 20:33:16.130781607 +0300
+@@ -1,22 +1,18 @@
+-
+ IF (CAPSIMAGE_INCLUDE_DIR)
+- # Already in cache, be silent
+- SET(CAPSIMAGE_FIND_QUIETLY TRUE)
++ # Already in cache, be silent
++ SET(CAPSIMAGE_FIND_QUIETLY TRUE)
+ ENDIF (CAPSIMAGE_INCLUDE_DIR)
+
+-
+-# Choose the library version to use : 4 or 5
+-SET(CAPSIMAGE_VERSION 5)
+-
+-
+-if(CAPSIMAGE_VERSION STREQUAL 4)
+- SET(CAPSIMAGE_DIR caps)
+- FIND_PATH(CAPSIMAGE_INCLUDE_DIR ${CAPSIMAGE_DIR}/capsimage.h)
++if(ENABLE_CAPSIMAGE5)
++ SET(CAPSIMAGE_VERSION 5)
++ FIND_PATH(CAPSIMAGE_INCLUDE_DIR NAMES CapsAPI.h PATH_SUFFIXES caps5)
+ else()
+- SET(CAPSIMAGE_DIR caps5)
+- FIND_PATH(CAPSIMAGE_INCLUDE_DIR ${CAPSIMAGE_DIR}/CapsAPI.h)
++ SET(CAPSIMAGE_VERSION 4)
++ FIND_PATH(CAPSIMAGE_INCLUDE_DIR NAMES capsimage.h PATH_SUFFIXES caps)
+ endif()
+
++message(${CAPSIMAGE_INCLUDE_DIR})
++
+ if(WIN32)
+ FIND_LIBRARY(CAPSIMAGE_LIBRARY NAMES capsimg PATH_SUFFIXES ${CAPSIMAGE_DIR} )
+ else()
+diff -Nuar hatari-2.1.0-orig/src/CMakeLists.txt hatari-2.1.0/src/CMakeLists.txt
+--- hatari-2.1.0-orig/src/CMakeLists.txt 2018-07-28 20:32:59.152780571 +0300
++++ hatari-2.1.0/src/CMakeLists.txt 2018-07-28 20:33:16.131781607 +0300
+@@ -55,6 +55,10 @@
+ include_directories(${PNG_INCLUDE_DIR})
+ endif(PNG_FOUND)
+
++if(CAPSIMAGE_FOUND)
++ include_directories(${CAPSIMAGE_INCLUDE_DIR})
++endif(CAPSIMAGE_FOUND)
++
+ if(X11_FOUND)
+ include_directories(${X11_INCLUDE_DIR})
+ endif(X11_FOUND)
+diff -Nuar hatari-2.1.0-orig/src/floppy_ipf.c hatari-2.1.0/src/floppy_ipf.c
+--- hatari-2.1.0-orig/src/floppy_ipf.c 2018-07-28 20:32:59.152780571 +0300
++++ hatari-2.1.0/src/floppy_ipf.c 2018-07-28 20:34:32.782786288 +0300
+@@ -30,9 +30,9 @@
+
+ #ifdef HAVE_CAPSIMAGE
+ #if CAPSIMAGE_VERSION == 5
+-#include <caps5/CapsLibAll.h>
++#include <CapsLibAll.h>
+ #else
+-#include <caps/fdc.h>
++#include <fdc.h>
+ #define CAPS_LIB_RELEASE 4
+ #define CAPS_LIB_REVISION 2
+ #endif
+@@ -61,8 +61,8 @@
+
+ struct CapsFdc Fdc; /* Fdc state */
+ struct CapsDrive Drive[ MAX_FLOPPYDRIVES ]; /* Physical drives */
+- CapsLong CapsImage[ MAX_FLOPPYDRIVES ]; /* Image Id or -1 if drive empty */
+- CapsLong CapsImageType[ MAX_FLOPPYDRIVES ]; /* ImageType or -1 if not known */
++ Sint32 CapsImage[ MAX_FLOPPYDRIVES ]; /* Image Id or -1 if drive empty */
++ Sint32 CapsImageType[ MAX_FLOPPYDRIVES ]; /* ImageType or -1 if not known */
+
+ int Rev_Track[ MAX_FLOPPYDRIVES ]; /* Needed to handle CAPSSetRevolution for type II/III commands */
+ int Rev_Side[ MAX_FLOPPYDRIVES ];
+@@ -83,9 +83,9 @@
+ static char *IPF_FilenameFindTrackSide (char *FileName);
+ static bool IPF_Insert_RawStreamImage ( int Drive );
+
+-static void IPF_CallBack_Trk ( struct CapsFdc *pc , CapsULong State );
+-static void IPF_CallBack_Irq ( struct CapsFdc *pc , CapsULong State );
+-static void IPF_CallBack_Drq ( struct CapsFdc *pc , CapsULong State );
++static void IPF_CallBack_Trk ( struct CapsFdc *pc , Uint32 State );
++static void IPF_CallBack_Irq ( struct CapsFdc *pc , Uint32 State );
++static void IPF_CallBack_Drq ( struct CapsFdc *pc , Uint32 State );
+ static void IPF_Drive_Update_Enable_Side ( void );
+ static void IPF_FDC_LogCommand ( Uint8 Command );
+ #endif
+@@ -419,8 +419,8 @@
+ return false;
+
+ #else
+- CapsLong ImageId;
+- CapsLong ImageType;
++ Sint32 ImageId;
++ Sint32 ImageType;
+
+ ImageId = CAPSAddImage();
+ if ( ImageId < 0 )
+@@ -470,7 +470,7 @@
+ ImageType = -1;
+ #endif
+
+- if ( CAPSLockImageMemory ( ImageId , pImageBuffer , (CapsULong)ImageSize , DI_LOCK_MEMREF ) == imgeOk )
++ if ( CAPSLockImageMemory ( ImageId , pImageBuffer , (Uint32)ImageSize , DI_LOCK_MEMREF ) == imgeOk )
+ {
+ struct CapsImageInfo cii;
+ int i;
+@@ -703,7 +703,7 @@
+ * We need to update the track data by calling CAPSLockTrack
+ */
+ #ifdef HAVE_CAPSIMAGE
+-static void IPF_CallBack_Trk ( struct CapsFdc *pc , CapsULong State )
++static void IPF_CallBack_Trk ( struct CapsFdc *pc , Uint32 State )
+ {
+ int Drive = State; /* State is the drive number in that case */
+ struct CapsDrive *pd = pc->drive+Drive; /* Current drive where the track change occurred */
+@@ -732,7 +732,7 @@
+ * Callback function used when the FDC change the IRQ signal
+ */
+ #ifdef HAVE_CAPSIMAGE
+-static void IPF_CallBack_Irq ( struct CapsFdc *pc , CapsULong State )
++static void IPF_CallBack_Irq ( struct CapsFdc *pc , Uint32 State )
+ {
+ LOG_TRACE(TRACE_FDC, "fdc ipf callback irq state=0x%x VBL=%d HBL=%d\n" , (int)State , nVBLs , nHBL );
+
+@@ -751,7 +751,7 @@
+ * -> copy the byte to/from the DMA's FIFO if it's a read or a write to the disk
+ */
+ #ifdef HAVE_CAPSIMAGE
+-static void IPF_CallBack_Drq ( struct CapsFdc *pc , CapsULong State )
++static void IPF_CallBack_Drq ( struct CapsFdc *pc , Uint32 State )
+ {
+ Uint8 Byte;
+
+diff -Nuar hatari-2.1.0-orig/src/uae-cpu/newcpu.c hatari-2.1.0/src/uae-cpu/newcpu.c
+--- hatari-2.1.0-orig/src/uae-cpu/newcpu.c 2018-07-28 20:32:59.158780571 +0300
++++ hatari-2.1.0/src/uae-cpu/newcpu.c 2018-07-28 20:33:16.132781607 +0300
+@@ -167,7 +167,7 @@
+
+ #ifdef HAVE_CAPSIMAGE
+ #if CAPSIMAGE_VERSION == 5
+-#include <caps5/CapsLibAll.h>
++#include <CapsLibAll.h>
+ #endif
+ #endif
+
diff --git a/games-emulation/hatari/hatari-2.1.0-r1.ebuild b/games-emulation/hatari/hatari-2.1.0-r1.ebuild
new file mode 100644
index 00000000000..7bb3815e13a
--- /dev/null
+++ b/games-emulation/hatari/hatari-2.1.0-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+inherit cmake-utils python-single-r1 readme.gentoo-r1
+
+DESCRIPTION="Atari ST emulator"
+HOMEPAGE="http://hatari.tuxfamily.org/"
+SRC_URI="http://download.tuxfamily.org/hatari/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+sdl2"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ >=dev-libs/spsdeclib-5.1-r1
+ sdl2? ( media-libs/libsdl2[X,sound,video] )
+ !sdl2? ( media-libs/libsdl[X,sound,video] )
+ media-libs/portaudio
+ media-libs/portmidi
+ sys-libs/readline:0=
+ media-libs/libpng:0=
+ sys-libs/zlib:0="
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+PDEPEND="dev-python/pygtk[${PYTHON_USEDEP}]
+ >=games-emulation/emutos-0.9.9.1"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+You need a TOS ROM to run hatari. EmuTOS, a free TOS implementation,
+has been installed in /usr/lib*/hatari with a .img extension (there
+are several from which to choose).
+Another option is to go to http://www.atari.st/ and get a real TOS:
+http://www.atari.st/
+The first time you run hatari, you should configure it to find the
+TOS you prefer to use. Be sure to save your settings.
+"
+
+PATCHES=( "${FILESDIR}/${P}_caps5_files.patch" )
+DOCS="readme.txt doc/*.txt"
+HTML_DOCS="doc/"
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ sed -i -e '/Encoding/d' ./python-ui/hatariui.desktop || die
+ sed -i -e "s/python/${EPYTHON}/" tools/atari-hd-image.sh || die
+ sed -i -e "s#@DOCDIR@#/usr/share/doc/${PF}/html/#" python-ui/uihelpers.py || die
+}
+
+src_configure() {
+ mycmakeargs=(
+ "-DDOCDIR=/usr/share/doc/${PF}"
+ "-DENABLE_SDL2=$(usex sdl2)"
+ "-DENABLE_CAPSIMAGE5=ON"
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ python_fix_shebang "${ED%/}"/usr/share/hatari/{hatariui,hconsole}/
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/hatari/, games-emulation/hatari/files/
@ 2019-11-10 21:39 James Le Cuirot
0 siblings, 0 replies; 3+ messages in thread
From: James Le Cuirot @ 2019-11-10 21:39 UTC (permalink / raw
To: gentoo-commits
commit: 8add614a08e03d61a6daba760475a689d22708af
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 10 21:38:02 2019 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Nov 10 21:39:31 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8add614a
games-emulation/hatari: Drop old 2.1.0
Package-Manager: Portage-2.3.79, Repoman-2.3.17
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
games-emulation/hatari/Manifest | 1 -
.../hatari/files/hatari-2.1.0_caps5_files.patch | 147 ---------------------
games-emulation/hatari/hatari-2.1.0-r1.ebuild | 79 -----------
3 files changed, 227 deletions(-)
diff --git a/games-emulation/hatari/Manifest b/games-emulation/hatari/Manifest
index 2d2d4017ca7..ed73c9b263e 100644
--- a/games-emulation/hatari/Manifest
+++ b/games-emulation/hatari/Manifest
@@ -1,2 +1 @@
-DIST hatari-2.1.0.tar.bz2 4072778 BLAKE2B 934ab28e799d0d13c26c291005513511367eb2ddbeda0f9756c19f10fa9e6bb8e10451057fa7e0b49a30e3f562eb5f327057d324b2a92e09b1115f63132dca97 SHA512 d1fbf6e60e2df2c43d070bee6a9c1dc93c36a8ea7f75bbf2a67790840952661cee136ebccd6b2ed523ef9b7b56391e058384f2e3f46acb609bb362cac05b9753
DIST hatari-2.2.1.tar.bz2 4162798 BLAKE2B 51938a649957779652b0debf7f867b2abe2d54fd3bb31086542f9f5970d01a120455e4381a9cb173724fbc7c45359d4009377bfe99038b338142fa5b82723533 SHA512 0e4c148a355a53c9cf79bdd28e5d7bb5f3389c780576017c6ebe2b69465d67522f373945f0e51681120ece24f5f08442265515486d2d7df7a02d9cd94cc44f1e
diff --git a/games-emulation/hatari/files/hatari-2.1.0_caps5_files.patch b/games-emulation/hatari/files/hatari-2.1.0_caps5_files.patch
deleted file mode 100644
index cac630f66f4..00000000000
--- a/games-emulation/hatari/files/hatari-2.1.0_caps5_files.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-diff -Nuar hatari-2.1.0-orig/cmake/FindCapsImage.cmake hatari-2.1.0/cmake/FindCapsImage.cmake
---- hatari-2.1.0-orig/cmake/FindCapsImage.cmake 2018-07-28 20:32:59.164780571 +0300
-+++ hatari-2.1.0/cmake/FindCapsImage.cmake 2018-07-28 20:33:16.130781607 +0300
-@@ -1,22 +1,18 @@
--
- IF (CAPSIMAGE_INCLUDE_DIR)
-- # Already in cache, be silent
-- SET(CAPSIMAGE_FIND_QUIETLY TRUE)
-+ # Already in cache, be silent
-+ SET(CAPSIMAGE_FIND_QUIETLY TRUE)
- ENDIF (CAPSIMAGE_INCLUDE_DIR)
-
--
--# Choose the library version to use : 4 or 5
--SET(CAPSIMAGE_VERSION 5)
--
--
--if(CAPSIMAGE_VERSION STREQUAL 4)
-- SET(CAPSIMAGE_DIR caps)
-- FIND_PATH(CAPSIMAGE_INCLUDE_DIR ${CAPSIMAGE_DIR}/capsimage.h)
-+if(ENABLE_CAPSIMAGE5)
-+ SET(CAPSIMAGE_VERSION 5)
-+ FIND_PATH(CAPSIMAGE_INCLUDE_DIR NAMES CapsAPI.h PATH_SUFFIXES caps5)
- else()
-- SET(CAPSIMAGE_DIR caps5)
-- FIND_PATH(CAPSIMAGE_INCLUDE_DIR ${CAPSIMAGE_DIR}/CapsAPI.h)
-+ SET(CAPSIMAGE_VERSION 4)
-+ FIND_PATH(CAPSIMAGE_INCLUDE_DIR NAMES capsimage.h PATH_SUFFIXES caps)
- endif()
-
-+message(${CAPSIMAGE_INCLUDE_DIR})
-+
- if(WIN32)
- FIND_LIBRARY(CAPSIMAGE_LIBRARY NAMES capsimg PATH_SUFFIXES ${CAPSIMAGE_DIR} )
- else()
-diff -Nuar hatari-2.1.0-orig/src/CMakeLists.txt hatari-2.1.0/src/CMakeLists.txt
---- hatari-2.1.0-orig/src/CMakeLists.txt 2018-07-28 20:32:59.152780571 +0300
-+++ hatari-2.1.0/src/CMakeLists.txt 2018-07-28 20:33:16.131781607 +0300
-@@ -55,6 +55,10 @@
- include_directories(${PNG_INCLUDE_DIR})
- endif(PNG_FOUND)
-
-+if(CAPSIMAGE_FOUND)
-+ include_directories(${CAPSIMAGE_INCLUDE_DIR})
-+endif(CAPSIMAGE_FOUND)
-+
- if(X11_FOUND)
- include_directories(${X11_INCLUDE_DIR})
- endif(X11_FOUND)
-diff -Nuar hatari-2.1.0-orig/src/floppy_ipf.c hatari-2.1.0/src/floppy_ipf.c
---- hatari-2.1.0-orig/src/floppy_ipf.c 2018-07-28 20:32:59.152780571 +0300
-+++ hatari-2.1.0/src/floppy_ipf.c 2018-07-28 20:34:32.782786288 +0300
-@@ -30,9 +30,9 @@
-
- #ifdef HAVE_CAPSIMAGE
- #if CAPSIMAGE_VERSION == 5
--#include <caps5/CapsLibAll.h>
-+#include <CapsLibAll.h>
- #else
--#include <caps/fdc.h>
-+#include <fdc.h>
- #define CAPS_LIB_RELEASE 4
- #define CAPS_LIB_REVISION 2
- #endif
-@@ -61,8 +61,8 @@
-
- struct CapsFdc Fdc; /* Fdc state */
- struct CapsDrive Drive[ MAX_FLOPPYDRIVES ]; /* Physical drives */
-- CapsLong CapsImage[ MAX_FLOPPYDRIVES ]; /* Image Id or -1 if drive empty */
-- CapsLong CapsImageType[ MAX_FLOPPYDRIVES ]; /* ImageType or -1 if not known */
-+ Sint32 CapsImage[ MAX_FLOPPYDRIVES ]; /* Image Id or -1 if drive empty */
-+ Sint32 CapsImageType[ MAX_FLOPPYDRIVES ]; /* ImageType or -1 if not known */
-
- int Rev_Track[ MAX_FLOPPYDRIVES ]; /* Needed to handle CAPSSetRevolution for type II/III commands */
- int Rev_Side[ MAX_FLOPPYDRIVES ];
-@@ -83,9 +83,9 @@
- static char *IPF_FilenameFindTrackSide (char *FileName);
- static bool IPF_Insert_RawStreamImage ( int Drive );
-
--static void IPF_CallBack_Trk ( struct CapsFdc *pc , CapsULong State );
--static void IPF_CallBack_Irq ( struct CapsFdc *pc , CapsULong State );
--static void IPF_CallBack_Drq ( struct CapsFdc *pc , CapsULong State );
-+static void IPF_CallBack_Trk ( struct CapsFdc *pc , Uint32 State );
-+static void IPF_CallBack_Irq ( struct CapsFdc *pc , Uint32 State );
-+static void IPF_CallBack_Drq ( struct CapsFdc *pc , Uint32 State );
- static void IPF_Drive_Update_Enable_Side ( void );
- static void IPF_FDC_LogCommand ( Uint8 Command );
- #endif
-@@ -419,8 +419,8 @@
- return false;
-
- #else
-- CapsLong ImageId;
-- CapsLong ImageType;
-+ Sint32 ImageId;
-+ Sint32 ImageType;
-
- ImageId = CAPSAddImage();
- if ( ImageId < 0 )
-@@ -470,7 +470,7 @@
- ImageType = -1;
- #endif
-
-- if ( CAPSLockImageMemory ( ImageId , pImageBuffer , (CapsULong)ImageSize , DI_LOCK_MEMREF ) == imgeOk )
-+ if ( CAPSLockImageMemory ( ImageId , pImageBuffer , (Uint32)ImageSize , DI_LOCK_MEMREF ) == imgeOk )
- {
- struct CapsImageInfo cii;
- int i;
-@@ -703,7 +703,7 @@
- * We need to update the track data by calling CAPSLockTrack
- */
- #ifdef HAVE_CAPSIMAGE
--static void IPF_CallBack_Trk ( struct CapsFdc *pc , CapsULong State )
-+static void IPF_CallBack_Trk ( struct CapsFdc *pc , Uint32 State )
- {
- int Drive = State; /* State is the drive number in that case */
- struct CapsDrive *pd = pc->drive+Drive; /* Current drive where the track change occurred */
-@@ -732,7 +732,7 @@
- * Callback function used when the FDC change the IRQ signal
- */
- #ifdef HAVE_CAPSIMAGE
--static void IPF_CallBack_Irq ( struct CapsFdc *pc , CapsULong State )
-+static void IPF_CallBack_Irq ( struct CapsFdc *pc , Uint32 State )
- {
- LOG_TRACE(TRACE_FDC, "fdc ipf callback irq state=0x%x VBL=%d HBL=%d\n" , (int)State , nVBLs , nHBL );
-
-@@ -751,7 +751,7 @@
- * -> copy the byte to/from the DMA's FIFO if it's a read or a write to the disk
- */
- #ifdef HAVE_CAPSIMAGE
--static void IPF_CallBack_Drq ( struct CapsFdc *pc , CapsULong State )
-+static void IPF_CallBack_Drq ( struct CapsFdc *pc , Uint32 State )
- {
- Uint8 Byte;
-
-diff -Nuar hatari-2.1.0-orig/src/uae-cpu/newcpu.c hatari-2.1.0/src/uae-cpu/newcpu.c
---- hatari-2.1.0-orig/src/uae-cpu/newcpu.c 2018-07-28 20:32:59.158780571 +0300
-+++ hatari-2.1.0/src/uae-cpu/newcpu.c 2018-07-28 20:33:16.132781607 +0300
-@@ -167,7 +167,7 @@
-
- #ifdef HAVE_CAPSIMAGE
- #if CAPSIMAGE_VERSION == 5
--#include <caps5/CapsLibAll.h>
-+#include <CapsLibAll.h>
- #endif
- #endif
-
diff --git a/games-emulation/hatari/hatari-2.1.0-r1.ebuild b/games-emulation/hatari/hatari-2.1.0-r1.ebuild
deleted file mode 100644
index 7bb3815e13a..00000000000
--- a/games-emulation/hatari/hatari-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit cmake-utils python-single-r1 readme.gentoo-r1
-
-DESCRIPTION="Atari ST emulator"
-HOMEPAGE="http://hatari.tuxfamily.org/"
-SRC_URI="http://download.tuxfamily.org/hatari/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+sdl2"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- >=dev-libs/spsdeclib-5.1-r1
- sdl2? ( media-libs/libsdl2[X,sound,video] )
- !sdl2? ( media-libs/libsdl[X,sound,video] )
- media-libs/portaudio
- media-libs/portmidi
- sys-libs/readline:0=
- media-libs/libpng:0=
- sys-libs/zlib:0="
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-PDEPEND="dev-python/pygtk[${PYTHON_USEDEP}]
- >=games-emulation/emutos-0.9.9.1"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-You need a TOS ROM to run hatari. EmuTOS, a free TOS implementation,
-has been installed in /usr/lib*/hatari with a .img extension (there
-are several from which to choose).
-Another option is to go to http://www.atari.st/ and get a real TOS:
-http://www.atari.st/
-The first time you run hatari, you should configure it to find the
-TOS you prefer to use. Be sure to save your settings.
-"
-
-PATCHES=( "${FILESDIR}/${P}_caps5_files.patch" )
-DOCS="readme.txt doc/*.txt"
-HTML_DOCS="doc/"
-
-src_prepare() {
- cmake-utils_src_prepare
-
- sed -i -e '/Encoding/d' ./python-ui/hatariui.desktop || die
- sed -i -e "s/python/${EPYTHON}/" tools/atari-hd-image.sh || die
- sed -i -e "s#@DOCDIR@#/usr/share/doc/${PF}/html/#" python-ui/uihelpers.py || die
-}
-
-src_configure() {
- mycmakeargs=(
- "-DDOCDIR=/usr/share/doc/${PF}"
- "-DENABLE_SDL2=$(usex sdl2)"
- "-DENABLE_CAPSIMAGE5=ON"
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
- python_fix_shebang "${ED%/}"/usr/share/hatari/{hatariui,hconsole}/
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- readme.gentoo_print_elog
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/hatari/, games-emulation/hatari/files/
@ 2024-05-12 20:25 Ionen Wolkens
0 siblings, 0 replies; 3+ messages in thread
From: Ionen Wolkens @ 2024-05-12 20:25 UTC (permalink / raw
To: gentoo-commits
commit: 0442dee2daec557fae32a592c86909f6e5686a10
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun May 12 20:01:23 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun May 12 20:01:23 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0442dee2
games-emulation/hatari: drop 2.4.1-r1
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
games-emulation/hatari/Manifest | 1 -
.../adccd68b16eff815590c1ec993354ef8e752ecfd.patch | 36 --------
.../hatari-2.3.1-cmake-include-checksym.patch | 12 ---
games-emulation/hatari/hatari-2.4.1-r1.ebuild | 100 ---------------------
4 files changed, 149 deletions(-)
diff --git a/games-emulation/hatari/Manifest b/games-emulation/hatari/Manifest
index 7a08070ac4dd..052aedb706f3 100644
--- a/games-emulation/hatari/Manifest
+++ b/games-emulation/hatari/Manifest
@@ -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
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
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-05-12 20:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-11-10 21:39 [gentoo-commits] repo/gentoo:master commit in: games-emulation/hatari/, games-emulation/hatari/files/ James Le Cuirot
-- strict thread matches above, loose matches on Subject: below --
2024-05-12 20:25 Ionen Wolkens
2018-08-12 17:18 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox