From nobody Sat Feb 26 13:44:55 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id CC3F119D31DB; Sat, 26 Feb 2022 13:44:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K5SYz5JFzz4rdt; Sat, 26 Feb 2022 13:44:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645883095; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qZoLncxFFK5If1aR+Z7MEWxHhtLIeJtAfoKQOwTFCDk=; b=bHnU8fCW8VrCXfyOoiQioGoxufDGEN/1J/cC0pAO6JlV40ogzfNpjhh1V/51llGoImall3 sR9XsvOeHnweYww3Npk1iFOwHcR6gUoh/TnngMZPYPE+6rwQJfN3Pu3Tl0hcVlpM7tNaaA ew03uQ8q9qysq6K68CmFV+4HxswtXwr0cyw+ro1SUoWgHrVN3qGaLFvJT9HWbU6NQ5v805 jWBSUSnhqAgriZ22TngFoexJJxmgR01rYbNQnujrLB7m1ZidUabtveNcmudmeQmauWYJ6N IIiyrxoZWg9ao5tadoArZ7/YEPl4pZKtB61hWCqWg0dGPEMBywtyamtSxUSW0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 90BE214D88; Sat, 26 Feb 2022 13:44:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21QDitqB061838; Sat, 26 Feb 2022 13:44:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21QDitsj061837; Sat, 26 Feb 2022 13:44:55 GMT (envelope-from git) Date: Sat, 26 Feb 2022 13:44:55 GMT Message-Id: <202202261344.21QDitsj061837@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Vin=C3=ADcius Zavam?= Subject: git: 6cacfe141ff1 - main - emulators/hatari: update 2.2.1 to 2.3.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: egypcio X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6cacfe141ff16b041da0f4112e5e03bd726ca122 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645883095; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qZoLncxFFK5If1aR+Z7MEWxHhtLIeJtAfoKQOwTFCDk=; b=b2H14nFeO9uGctjg1coUOm92SWjaRx6hHoUwgJKLTSCKC1Cgen3c0r/1U/hdAfUQ4qgnvL 89G6Yj74qUFGS1UBoj8m9cPO4cnA0U6HwjqOh+KNBmN4R4UH/Jxh5PYMDK8hthoOXqqIui 9o8GYMaN6G7HfWy02s9kUJxPZFOaBtk4Hgd3kEtOD2IWN5oXryIKqBhRpU/b9A/TjKARwx f9tKcgmEK2v9cEkiWNFt9LVEWXi4Yu/mRgw5ChqfrkaSz37ZaIxIgH9feDJ2ebSaPJF1DL gyaEYX/Xk+1Xe/G4WaeFO+RbmCWMNxrss1WAcxRf/yWYqX9u2PmXAsrz4maNQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645883095; a=rsa-sha256; cv=none; b=hf80FkdnKCF3r97793Huxzo0P9AlzUGjd21OezcVnUs4jaDcZ1yh/1KguI/W5MYBMzElGM dPuvxQHHH9p6svqA7vAvQpllOLo7+xGCQjiUGiwIn6wtrxqbjjBTfpXkRmz+h2U6mawT0e 1a7dK2Kv0gw3Dso/skYyp4e0sLGT+scNwNkg6jR8Cf/ODC5neZwDarD3YAUsQfsVoR1aQD p8QSiLggdBy2+htaVK5qbSCZs/3ut+oNngDubokfLIgkwc8gnQ6S9BaVxaRokhjCu5MIM+ wszzXXp4oDc3P+FRlmDVU8aqrj8A3Kv+s+kT9JsC56WkPu9vgWj1nbr0aU5z4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by egypcio: URL: https://cgit.FreeBSD.org/ports/commit/?id=6cacfe141ff16b041da0f4112e5e03bd726ca122 commit 6cacfe141ff16b041da0f4112e5e03bd726ca122 Author: Vinícius Zavam AuthorDate: 2022-02-26 13:34:26 +0000 Commit: Vinícius Zavam CommitDate: 2022-02-26 13:43:23 +0000 emulators/hatari: update 2.2.1 to 2.3.1 while here: pet portlint. * https://git.tuxfamily.org/hatari/hatari.git/tree/doc/release-notes.txt?id=v2.3.1 Main changes since Hatari 2.3.0: Hatari could crash when switching to Falcon mode and no IDE drive was used Fix unneeded extra prefetch for movem in 68020/30 CPU Fix master clock use for crossbar/DSP Handshake mode Fix hostport PORTB interrupt handling for DSP FPU setting did not work in macOS version for french language Fix Hatari window disappearing in the python UI when changing resolution Major highlights since Hatari 2.2.1: Emulate more hardware register (DIP switches, DD/HD mode, more RTC, ...) Update CPU core to match latest WinUAE 4.4.0 beta Add a better filter for downsampling the internal 250 kHz signal, ... should give better results when the YM2149 outputs high frequency sounds Improved video timing emulation Add support for the TT's 2nd MFP (not all signals are emulated yet) Large rewrite of the blitter's core, improving accuracy Rewrote / improved parts of the GEMDOS HD emulation Improved zooming function of the window Fixed demos: Pacemaker STE demo (end part), when it's run from GEMDOS HD Fullscreen part in Hard As Ice STE demo by I.C.E. (screen with no vertical DE signal) Fullast Vinner by Troed/Sync (improved vblank position, partial fix for now) Electric Night Falcon demo by Dune (MFP DMA sound interrupt on timer A using AER) Oompa by No Extra (after greetings part) E.K.O System (music should now play in the racing scene) Fixed programs: MS Write (crash), when it's run from GEMDOS HD Akaisex program reading AKAI S1000 HD floppies converted to STX EmuTos drawing vertical lines with blitter and leaving some trails ... (blitter in non HOG mode using TAS instruction to restart) Cecile v2.22, now also works if no IDE drive has been configured Trans D-Bug Express by PHF (lock when running in megaSTE mode at 16 MHz) --- emulators/hatari/Makefile | 3 +- emulators/hatari/distinfo | 6 +- .../hatari/files/patch-tools_atari-hd-image.sh | 14 ++-- emulators/hatari/pkg-plist | 96 +++++++++++----------- 4 files changed, 59 insertions(+), 60 deletions(-) diff --git a/emulators/hatari/Makefile b/emulators/hatari/Makefile index 008cd0cd7404..f5a2385efb33 100644 --- a/emulators/hatari/Makefile +++ b/emulators/hatari/Makefile @@ -1,7 +1,7 @@ # Created by: Michael Neumann PORTNAME= hatari -PORTVERSION= 2.2.1 +PORTVERSION= 2.3.1 CATEGORIES= emulators MASTER_SITES= http://download.tuxfamily.org/hatari/${PORTVERSION}/ @@ -20,7 +20,6 @@ USES= cmake desktop-file-utils gnome python:3.6+ readline \ sdl shared-mime-info shebangfix tar:bzip2 xorg USE_GNOME= gtk30 USE_XORG= sm ice x11 xext -USE_PYTHON= concurrent SHEBANG_FILES= python-ui/*.py tools/*.py \ tools/debugger/*.py tools/hconsole/*.py diff --git a/emulators/hatari/distinfo b/emulators/hatari/distinfo index f05fcc7204dc..535bcf7864db 100644 --- a/emulators/hatari/distinfo +++ b/emulators/hatari/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1551106244 -SHA256 (hatari-2.2.1.tar.bz2) = 11afef30a274be84696588583d5a1d65c8046934670f718c311c956ef7106f60 -SIZE (hatari-2.2.1.tar.bz2) = 4162798 +TIMESTAMP = 1645876638 +SHA256 (hatari-2.3.1.tar.bz2) = 44a2f62ca995e38d9e0874806956f0b9c3cc84ea89e0169a63849b63cd3b64bd +SIZE (hatari-2.3.1.tar.bz2) = 4334129 diff --git a/emulators/hatari/files/patch-tools_atari-hd-image.sh b/emulators/hatari/files/patch-tools_atari-hd-image.sh index 3aa918524042..0d26d83f5fb3 100644 --- a/emulators/hatari/files/patch-tools_atari-hd-image.sh +++ b/emulators/hatari/files/patch-tools_atari-hd-image.sh @@ -1,24 +1,24 @@ ---- tools/atari-hd-image.sh.orig 2018-02-20 07:08:43 UTC +--- tools/atari-hd-image.sh.orig 2022-02-26 12:11:11 UTC +++ tools/atari-hd-image.sh @@ -33,8 +33,8 @@ PATH=/sbin:$PATH export PATH # check tools --if [ -z $(which mkdosfs) ] || [ -z $(which python) ]; then +-if [ -z "$(which mkdosfs)" ] || [ -z "$(which python)" ]; then - echo "ERROR: either mkdosfs or python tool missing!" -+if [ -z $(which mkdosfs) ] || [ -z $(which %%PYTHON_VERSION%%) ]; then ++if [ -z "$(which mkdosfs)" ] || [ -z "$(which %%PYTHON_VERSION%%)" ]; then + echo "ERROR: either mkdosfs or %%PYTHON_VERSION%% tool missing!" exit 1 fi -@@ -147,8 +147,8 @@ echo "$step) Create DOS Master Boot Reco +@@ -147,8 +147,8 @@ echo "$step) Create DOS Master Boot Record / partition # - http://en.wikipedia.org/wiki/File_Allocation_Table#Boot_Sector # For DOS MBR, the values are little endian. # ----------- -python << EOF --#!/usr/bin/env python -+%%PYTHON_CMD%% << EOF -+#!%%PYTHON_CMD%% +-#!/usr/bin/env python3 ++%%PYTHON_VERSION%% << EOF ++#!/usr/bin/env %%PYTHON_VERSION%%3 mbr = bytearray(512) def set_long(idx, value): diff --git a/emulators/hatari/pkg-plist b/emulators/hatari/pkg-plist index 376ced66b8d8..65cb802df457 100644 --- a/emulators/hatari/pkg-plist +++ b/emulators/hatari/pkg-plist @@ -7,6 +7,25 @@ bin/hatari_profile bin/hatariui bin/hmsa bin/zip2st +%%DATADIR%%/hatari-icon.bmp +%%DATADIR%%/hatariui/README +%%DATADIR%%/hatariui/TODO +%%DATADIR%%/hatariui/config.py +%%DATADIR%%/hatariui/conftypes.py +%%DATADIR%%/hatariui/debugui.py +%%DATADIR%%/hatariui/dialogs.py +%%DATADIR%%/hatariui/hatari-icon.png +%%DATADIR%%/hatariui/hatari-logo.png +%%DATADIR%%/hatariui/hatari.py +%%DATADIR%%/hatariui/hatariui.py +%%DATADIR%%/hatariui/%%CMAKE_BUILD_TYPE%%-notes.txt +%%DATADIR%%/hatariui/uihelpers.py +%%DATADIR%%/hconsole/example-commands +%%DATADIR%%/hconsole/example-debugger +%%DATADIR%%/hconsole/example.py +%%DATADIR%%/hconsole/hconsole.py +%%DATADIR%%/hconsole/%%CMAKE_BUILD_TYPE%%-notes.txt +%%DATADIR%%/tos.img man/man1/atari-convert-dir.1.gz man/man1/atari-hd-image.1.gz man/man1/gst2ascii.1.gz @@ -19,66 +38,47 @@ man/man1/hmsa.1.gz man/man1/zip2st.1.gz share/applications/hatari.desktop share/applications/hatariui.desktop -share/doc/hatari/authors.txt -share/doc/hatari/compatibility.html -share/doc/hatari/emutos.txt -share/doc/hatari/images/callgraph.png -share/doc/hatari/images/callgraph.svg -share/doc/hatari/images/cpu.png -share/doc/hatari/images/devices.png -share/doc/hatari/images/fileselector.png -share/doc/hatari/images/floppydisks.png -share/doc/hatari/images/harddisks.png -share/doc/hatari/images/joystick.png -share/doc/hatari/images/kcachegrind.png -share/doc/hatari/images/keyboard.png -share/doc/hatari/images/main.png -share/doc/hatari/images/memory.png -share/doc/hatari/images/monitor.png -share/doc/hatari/images/newfloppy.png -share/doc/hatari/images/screen.png -share/doc/hatari/images/sound.png -share/doc/hatari/images/system.png -share/doc/hatari/images/tos.png -share/doc/hatari/keymap-sample.txt -share/doc/hatari/manual.html -share/doc/hatari/memory-usage.txt -share/doc/hatari/midi-linux.txt -share/doc/hatari/release-notes.txt -share/doc/hatari/todo.txt %%PORTDOCS%%%%DOCSDIR%%/CMakeLists.txt %%PORTDOCS%%%%DOCSDIR%%/authors.txt +%%PORTDOCS%%%%DOCSDIR%%/bugs.txt %%PORTDOCS%%%%DOCSDIR%%/changelog.txt %%PORTDOCS%%%%DOCSDIR%%/coding.txt +%%PORTDOCS%%%%DOCSDIR%%/compatibility.html +%%PORTDOCS%%%%DOCSDIR%%/debugger.html %%PORTDOCS%%%%DOCSDIR%%/emutos.txt +%%PORTDOCS%%%%DOCSDIR%%/images/callgraph.png +%%PORTDOCS%%%%DOCSDIR%%/images/callgraph.svg +%%PORTDOCS%%%%DOCSDIR%%/images/cpu.png +%%PORTDOCS%%%%DOCSDIR%%/images/devices-portmidi.png +%%PORTDOCS%%%%DOCSDIR%%/images/devices.png +%%PORTDOCS%%%%DOCSDIR%%/images/fileselector.png +%%PORTDOCS%%%%DOCSDIR%%/images/floppydisks.png +%%PORTDOCS%%%%DOCSDIR%%/images/harddisks.png +%%PORTDOCS%%%%DOCSDIR%%/images/joystick.png +%%PORTDOCS%%%%DOCSDIR%%/images/kcachegrind.png +%%PORTDOCS%%%%DOCSDIR%%/images/keyboard.png +%%PORTDOCS%%%%DOCSDIR%%/images/main.png +%%PORTDOCS%%%%DOCSDIR%%/images/memory.png +%%PORTDOCS%%%%DOCSDIR%%/images/monitor.png +%%PORTDOCS%%%%DOCSDIR%%/images/newfloppy.png +%%PORTDOCS%%%%DOCSDIR%%/images/screen.png +%%PORTDOCS%%%%DOCSDIR%%/images/sound.png +%%PORTDOCS%%%%DOCSDIR%%/images/system.png +%%PORTDOCS%%%%DOCSDIR%%/images/tos.png %%PORTDOCS%%%%DOCSDIR%%/keymap-sample.txt +%%PORTDOCS%%%%DOCSDIR%%/m68k-linux.txt +%%PORTDOCS%%%%DOCSDIR%%/m68k-netbsd.txt +%%PORTDOCS%%%%DOCSDIR%%/manual.css +%%PORTDOCS%%%%DOCSDIR%%/manual.html %%PORTDOCS%%%%DOCSDIR%%/memory-usage.txt %%PORTDOCS%%%%DOCSDIR%%/midi-linux.txt -%%PORTDOCS%%%%DOCSDIR%%/release-checklist.txt -%%PORTDOCS%%%%DOCSDIR%%/release-notes.txt +%%PORTDOCS%%%%DOCSDIR%%/%%CMAKE_BUILD_TYPE%%-checklist.txt +%%PORTDOCS%%%%DOCSDIR%%/%%CMAKE_BUILD_TYPE%%-notes.txt %%PORTDOCS%%%%DOCSDIR%%/scsi-driver.txt %%PORTDOCS%%%%DOCSDIR%%/thanks.txt +%%PORTDOCS%%%%DOCSDIR%%/toc.js %%PORTDOCS%%%%DOCSDIR%%/todo.txt %%PORTDOCS%%%%DOCSDIR%%/video-recording.txt -share/hatari/hatari-icon.bmp -share/hatari/hatariui/README -share/hatari/hatariui/TODO -share/hatari/hatariui/config.py -share/hatari/hatariui/conftypes.py -share/hatari/hatariui/debugui.py -share/hatari/hatariui/dialogs.py -share/hatari/hatariui/hatari-icon.png -share/hatari/hatariui/hatari-logo.png -share/hatari/hatariui/hatari.py -share/hatari/hatariui/hatariui.py -share/hatari/hatariui/release-notes.txt -share/hatari/hatariui/uihelpers.py -share/hatari/hconsole/example-commands -share/hatari/hconsole/example-debugger -share/hatari/hconsole/example.py -share/hatari/hconsole/hconsole.py -share/hatari/hconsole/release-notes.txt -share/hatari/tos.img share/icons/hicolor/128x128/apps/hatari.png share/icons/hicolor/128x128/mimetypes/application-vnd.fastcopy-disk-image.png share/icons/hicolor/128x128/mimetypes/application-vnd.msa-disk-image.png