Fix and update hatari.

config/blocklist

@@ -1,5 +1,4 @@
 np2kai # Last major commit before hiatus is broken
 vicesa # Doesn't support updating with the script.
-hatari # Broken include - need to fix
 duckstationsa # Latest commits break device patching. Need to research.
 ewolf

packages/games/libretro/hatari/package.mk

@@ -20,13 +20,13 @@
 ################################################################################
 
 PKG_NAME="hatari"
-PKG_VERSION="e5e36a5262cfeadc3d1c7b411b7a70719c4f293c"
-PKG_SHA256="e1cc4f96d5ddedc70dcf59a73f05a6c6da476bbe7b2a9672fa3f8d09f4743925"
+PKG_VERSION="1ebf0a0488580ef95c0b28f02223b31813c867c5"
+PKG_SHA256="520b3666a8cf795a89f8bf322dc77749cf8b1994a1f613f098cd6d4ed5382011"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/hatari"
-PKG_URL="$PKG_SITE/archive/$PKG_VERSION.tar.gz"
+PKG_URL="${PKG_SITE}/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain capsimg"
 PKG_PRIORITY="optional"
 PKG_SECTION="libretro"
@@ -43,17 +43,12 @@ configure_target() {
 }
 
 make_target() {
-  if [ "$ARCH" == "arm" ]; then
-    CFLAGS="$CFLAGS -DNO_ASM -DARM -D__arm__ -DARM_ASM -DNOSSE -DARM_HARDFP"
-  fi
-  CFLAGS="$CFLAGS -I$(get_build_dir capsimg)/Core -I$(get_build_dir capsimg)/.install_pkg/usr/local/include -L$(get_build_dir capsimg)/.install_pkg/usr/lib -lcapsimage -DHAVE_CAPSIMAGE=1 -DCAPSIMAGE_VERSION=5"
-  LDFLAGS="$LDFLAGS -I$(get_build_dir capsimg)/LibIPF -DHAVE_CAPSIMAGE=1"
   make -C .. -f Makefile.libretro
 }
 
 makeinstall_target() {
-  mkdir -p $INSTALL/usr/lib/libretro
-  mkdir -p $INSTALL/usr/config/game/configs/hatari
-  cp ../hatari_libretro.so $INSTALL/usr/lib/libretro/
-  cp -rf ${PKG_DIR}/config/* $INSTALL/usr/config/game/configs/hatari/
+  mkdir -p ${INSTALL}/usr/lib/libretro
+  mkdir -p ${INSTALL}/usr/config/game/configs/hatari
+  cp ../hatari_libretro.so ${INSTALL}/usr/lib/libretro/
+  cp -rf ${PKG_DIR}/config/* ${INSTALL}/usr/config/game/configs/hatari/
 }

packages/games/libretro/hatari/patches/findcapsimage.patch

@@ -1,48 +0,0 @@
-diff --git a/cmake/FindCapsImage.cmake b/cmake/FindCapsImage.cmake
-index 982e5285..94ada2fe 100644
---- a/cmake/FindCapsImage.cmake
-+++ b/cmake/FindCapsImage.cmake
-@@ -6,7 +6,7 @@ ENDIF (CAPSIMAGE_INCLUDE_DIR)
- 
- 
- # Choose the library version to use : 4 or 5
--SET(CAPSIMAGE_VERSION 4)
-+SET(CAPSIMAGE_VERSION 5)
- 
- 
- if(CAPSIMAGE_VERSION STREQUAL 4)
-diff --git a/src/floppy_ipf.c b/src/floppy_ipf.c
-index c615b755..8e52b712 100644
---- a/src/floppy_ipf.c
-+++ b/src/floppy_ipf.c
-@@ -24,10 +24,16 @@ const char floppy_ipf_fileid[] = "Hatari floppy_ipf.c : " __DATE__ " " __TIME__;
- #include "screen.h"
- #include "video.h"
- #include "cycles.h"
-+#include <stdint.h>
- 
- #ifdef HAVE_CAPSIMAGE
-+#ifndef __cdecl
-+#define __cdecl  /* CAPS headers need this, but do not define it on their own */
-+#endif
- #if CAPSIMAGE_VERSION == 5
- #include <caps5/CapsLibAll.h>
-+#define CapsLong SDWORD
-+#define CapsULong UDWORD
- #else
- #include <caps/fdc.h>
- #define CAPS_LIB_RELEASE	4
-diff --git a/src/uae-cpu/newcpu.c b/src/uae-cpu/newcpu.c
-index e752e83d..91cf41cf 100644
---- a/src/uae-cpu/newcpu.c
-+++ b/src/uae-cpu/newcpu.c
-@@ -162,6 +162,9 @@ const char NewCpu_fileid[] = "Hatari newcpu.c : " __DATE__ " " __TIME__;
- #include "68kDisass.h"
- 
- #ifdef HAVE_CAPSIMAGE
-+#ifndef __cdecl
-+#define __cdecl  /* CAPS headers need this, but do not define it on their own */
-+#endif
- #if CAPSIMAGE_VERSION == 5
- #include <caps5/CapsLibAll.h>
- #endif