Revision: 27147
http://sourceforge.net/p/gar/code/27147
Author: jake_goerzen
Date: 2025-01-18 20:41:04 +0000 (Sat, 18 Jan 2025)
Log Message:
-----------
hatari/trunk: update to version 2.3.1
Modified Paths:
--------------
csw/mgar/pkg/hatari/trunk/Makefile
csw/mgar/pkg/hatari/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/hatari/trunk/files/0001-implememnt-local-strnlen-function.patch
Modified: csw/mgar/pkg/hatari/trunk/Makefile
===================================================================
--- csw/mgar/pkg/hatari/trunk/Makefile 2025-01-16 20:43:03 UTC (rev 27146)
+++ csw/mgar/pkg/hatari/trunk/Makefile 2025-01-18 20:41:04 UTC (rev 27147)
@@ -1,5 +1,5 @@
NAME = hatari
-VERSION = 1.9.0
+VERSION = 2.3.1
GARTYPE = v2
DESCRIPTION = Atari ST emulator
@@ -8,18 +8,23 @@
endef
MASTER_SITES = http://download.tuxfamily.org/hatari/$(VERSION)/
-DISTFILES = $(NAME)-$(VERSION).tar.bz2
+MASTER_SITES = https://git.tuxfamily.org/hatari/hatari.git/snapshot/
+DISTFILES = $(NAME)-$(VERSION).tar.gz
PACKAGES = CSWhatari
+GARCOMPILER = GNU
+
RUNTIME_DEP_PKGS_CSWhatari += CSWlibz1
RUNTIME_DEP_PKGS_CSWhatari += CSWlibpng16-16
-RUNTIME_DEP_PKGS_CSWhatari += CSWlibsdl1-2-0
-RUNTIME_DEP_PKGS_CSWhatari += CSWlibreadline6
+RUNTIME_DEP_PKGS_CSWhatari += CSWlibsdl2-2-0-0
+RUNTIME_DEP_PKGS_CSWhatari += CSWlibreadline7
UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
LICENSE = gpl.txt
+PATCHFILES = 0001-implememnt-local-strnlen-function.patch
+
CONFIGURE_SCRIPTS = custom
BUILD_SCRIPTS = custom
INSTALL_SCRIPTS = custom
@@ -28,12 +33,12 @@
# override no-direct-binding until we can figure out how to enable -Bdirect in
cmake (see below)
CHECKPKG_OVERRIDES_CSWhatari +=
no-direct-binding|/opt/csw/bin/hatari|is|not|directly|bound|to|soname|libICE.so.6
-CHECKPKG_OVERRIDES_CSWhatari +=
no-direct-binding|/opt/csw/bin/hatari|is|not|directly|bound|to|soname|libSDL-1.2.so.0
+CHECKPKG_OVERRIDES_CSWhatari +=
no-direct-binding|/opt/csw/bin/hatari|is|not|directly|bound|to|soname|libSDL2-2.0.so.0
CHECKPKG_OVERRIDES_CSWhatari +=
no-direct-binding|/opt/csw/bin/hatari|is|not|directly|bound|to|soname|libSM.so.6
CHECKPKG_OVERRIDES_CSWhatari +=
no-direct-binding|/opt/csw/bin/hatari|is|not|directly|bound|to|soname|libX11.so.4
CHECKPKG_OVERRIDES_CSWhatari +=
no-direct-binding|/opt/csw/bin/hatari|is|not|directly|bound|to|soname|libXext.so.0
CHECKPKG_OVERRIDES_CSWhatari +=
no-direct-binding|/opt/csw/bin/hatari|is|not|directly|bound|to|soname|libpng16.so.16
-CHECKPKG_OVERRIDES_CSWhatari +=
no-direct-binding|/opt/csw/bin/hatari|is|not|directly|bound|to|soname|libreadline.so.6
+CHECKPKG_OVERRIDES_CSWhatari +=
no-direct-binding|/opt/csw/bin/hatari|is|not|directly|bound|to|soname|libreadline.so.7
CHECKPKG_OVERRIDES_CSWhatari +=
no-direct-binding|/opt/csw/bin/hatari|is|not|directly|bound|to|soname|libz.so.1
CHECKPKG_OVERRIDES_CSWhatari +=
no-direct-binding|/opt/csw/bin/hmsa|is|not|directly|bound|to|soname|libz.so.1
@@ -44,6 +49,8 @@
configure-custom:
mkdir $(WORKSRC)/build
cd $(WORKSRC)/build && \
+ CFLAGS='$(CFLAGS)' \
+ LDFLAGS='$(LDFLAGS) $(LD_OPTIONS)' \
/opt/csw/bin/cmake \
-DCMAKE_INSTALL_PREFIX=/opt/csw \
-DCMAKE_INCLUDE_PATH=/opt/csw/include \
Modified: csw/mgar/pkg/hatari/trunk/checksums
===================================================================
--- csw/mgar/pkg/hatari/trunk/checksums 2025-01-16 20:43:03 UTC (rev 27146)
+++ csw/mgar/pkg/hatari/trunk/checksums 2025-01-18 20:41:04 UTC (rev 27147)
@@ -1 +1 @@
-24e54b19958943dbe5ac1b1f6f32b284 hatari-1.9.0.tar.bz2
+fb28e3f3b4461fe48376960291f4b7da hatari-2.3.1.tar.gz
Added:
csw/mgar/pkg/hatari/trunk/files/0001-implememnt-local-strnlen-function.patch
===================================================================
---
csw/mgar/pkg/hatari/trunk/files/0001-implememnt-local-strnlen-function.patch
(rev 0)
+++
csw/mgar/pkg/hatari/trunk/files/0001-implememnt-local-strnlen-function.patch
2025-01-18 20:41:04 UTC (rev 27147)
@@ -0,0 +1,29 @@
+From 7795be5289b41216446ed483e3bb4fa354132d3d Mon Sep 17 00:00:00 2001
+From: Jake Goerzen <jgoer...@opencsw.org>
+Date: Wed, 7 Jul 2021 03:43:59 +0200
+Subject: [PATCH] implememnt local strnlen function
+
+---
+ src/gemdos.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/gemdos.c b/src/gemdos.c
+index 02085ab..3a5c672 100644
+--- a/src/gemdos.c
++++ b/src/gemdos.c
+@@ -1567,6 +1567,12 @@ static bool GemDOS_Cconws(Uint32 Params)
+ }
+
+ pBuffer = (char *)STMemory_STAddrToPointer(Addr);
++ size_t
++ strnlen(const char *str, size_t n)
++ {
++ const char * stop = (char *)memchr(str, '\0', n);
++ return stop ? stop - str : n;
++ }
+ if (fwrite(pBuffer, strnlen(pBuffer, 80 * 25), 1, stdout) < 1)
+ Regs[REG_D0] = GEMDOS_ERROR;
+ else
+--
+2.4.0
+
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
