Hi ports@,
Here is a diff to update emulators/hatari to 2.0.0.
Notable changes:
- Build switched to SDL2 as this is now upstream default
- We do not build the Python UI anymore as from this release it doesn't
start anymore and I have no interest in fixing this as I dont use it
(the built in user interface is better). That also allows droping
dependency on py-gtk2
- Regenerated and commented all patches, and updated DESCR to match
updated upstream description
Comments? OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/emulators/hatari/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile 22 Sep 2016 12:57:18 -0000 1.2
+++ Makefile 13 Nov 2016 13:30:11 -0000
@@ -2,9 +2,8 @@
COMMENT = Atari ST/STE/TT/Falcon emulator
-V = 1.9.0
+V = 2.0.0
DISTNAME = hatari-${V}
-REVISION = 0
EXTRACT_SUFX = .tar.bz2
CATEGORIES = emulators
@@ -16,24 +15,22 @@ MAINTAINER = Frederic Cambus <fcambus@op
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB += ICE SDL SM X11 Xext c m png pthread readline termcap z
+WANTLIB += ICE SDL2 SM X11 Xext c m png pthread readline termcap z
MASTER_SITES = http://download.tuxfamily.org/hatari/$V/
RUN_DEPENDS = devel/desktop-file-utils \
misc/shared-mime-info \
sysutils/mtools \
- x11/gtk+3,-guic \
- x11/py-gtk2
+ x11/gtk+3,-guic
-LIB_DEPENDS = devel/sdl \
+LIB_DEPENDS = devel/sdl2 \
graphics/png
MODULES = devel/cmake \
lang/python
-MODPY_ADJ_FILES = python-ui/*.py \
- tools/debugger/*.py \
+MODPY_ADJ_FILES = tools/debugger/*.py \
tools/hconsole/*.py \
tools/*.py
@@ -47,7 +44,6 @@ pre-configure:
post-install:
${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
- ${PREFIX}/share/hatari/hatariui/*.py \
${PREFIX}/share/hatari/hconsole/*.py
gunzip ${PREFIX}/man/man1/*.1.gz
Index: distinfo
===================================================================
RCS file: /cvs/ports/emulators/hatari/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 31 Jul 2016 23:53:35 -0000 1.1.1.1
+++ distinfo 13 Nov 2016 13:30:11 -0000
@@ -1,2 +1,2 @@
-SHA256 (hatari-1.9.0.tar.bz2) = srVubL5/h2ml6LHZZZnzktk1G0TKz5WdppBdoG0w6ZI=
-SIZE (hatari-1.9.0.tar.bz2) = 2379016
+SHA256 (hatari-2.0.0.tar.bz2) = UqRHpZtpedVdFSXzxKIewBPkNxNU1mg+3nFUbF5tpXc=
+SIZE (hatari-2.0.0.tar.bz2) = 3899087
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/emulators/hatari/patches/patch-CMakeLists_txt,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 31 Jul 2016 23:53:35 -0000 1.1.1.1
+++ patches/patch-CMakeLists_txt 13 Nov 2016 13:30:11 -0000
@@ -1,18 +1,24 @@
$OpenBSD: patch-CMakeLists_txt,v 1.1.1.1 2016/07/31 23:53:35 awolk Exp $
---- CMakeLists.txt.orig Thu Sep 10 23:16:02 2015
-+++ CMakeLists.txt Wed Jun 22 14:18:20 2016
-@@ -32,6 +32,10 @@ endif(NOT CMAKE_BUILD_TYPE)
-
- set(ENABLE_SDL2 0
- CACHE BOOL "Enable building with libSDL2 instead of v1.2")
+
+Make PortAudio and CAPSImage detection conditional and disabled by default,
+and disable building the Python GTK+2 user interface.
+
+--- CMakeLists.txt.orig Thu Nov 3 22:25:43 2016
++++ CMakeLists.txt Sat Nov 12 17:20:14 2016
+@@ -40,6 +40,12 @@ set(ENABLE_SMALL_MEM 0
+ CACHE BOOL "Enable to use less memory - at the expense of emulation
speed")
+ set(ENABLE_WINUAE_CPU 1
+ CACHE BOOL "Enable WinUAE CPU core")
+set(ENABLE_PORTAUDIO 0
-+ CACHE BOOL "Enable building with portaudio to enable microphone input in
Falcon mode")
++ CACHE BOOL "Enable building with PortAudio to enable microphone input in
Falcon mode")
+set(ENABLE_CAPSIMAGE 0
-+ CACHE BOOL "Enable building with capsimage for using .IPF, .RAW and .CTR
disk images")
- set(ENABLE_DSP_EMU 1
- CACHE BOOL "Enable DSP 56k emulator for Falcon mode")
- set(ENABLE_TRACING 1
-@@ -125,15 +129,19 @@ if (NOT ENABLE_OSX_BUNDLE)
++ CACHE BOOL "Enable building with CAPSImage for using .IPF, .RAW and .CTR
disk images")
++set(ENABLE_UI 0
++ CACHE BOOL "Enable building the Python GTK+2 user interface, requires
GTK+2 bindings")
+
+ # Run-time checks with GCC "mudflap" etc features:
+ # - stack protection
+@@ -127,15 +133,19 @@ if (NOT ENABLE_OSX_BUNDLE)
endif(X11_FOUND)
endif()
@@ -38,9 +44,26 @@ $OpenBSD: patch-CMakeLists_txt,v 1.1.1.1
+ endif(CAPSIMAGE_FOUND)
+endif(ENABLE_CAPSIMAGE)
- # ################
- # CPP Definitions:
-@@ -344,17 +352,20 @@ else()
+ find_package(Udev)
+ if(UDEV_FOUND)
+@@ -302,10 +312,12 @@ add_subdirectory(src)
+ add_subdirectory(doc)
+ add_subdirectory(tools)
+
+-include(FindPythonInterp)
+-if(PYTHONINTERP_FOUND)
+- add_subdirectory(python-ui)
+-endif(PYTHONINTERP_FOUND)
++if(ENABLE_UI)
++ include(FindPythonInterp)
++ if(PYTHONINTERP_FOUND)
++ add_subdirectory(python-ui)
++ endif(PYTHONINTERP_FOUND)
++endif(ENABLE_UI)
+
+ if(UNIX AND NOT ENABLE_OSX_BUNDLE)
+ add_subdirectory(share)
+@@ -352,17 +364,20 @@ else()
message( " - png :\tnot found, install it to compress screenshot/avi files
using png" )
endif(PNG_FOUND)
@@ -69,5 +92,5 @@ $OpenBSD: patch-CMakeLists_txt,v 1.1.1.1
+ endif(CAPSIMAGE_FOUND)
+endif(ENABLE_CAPSIMAGE)
- message( "" )
-
+ if(UDEV_FOUND)
+ message( " - udev :\tfound, required for media change detection in
NatFeats SCSI" )
Index: patches/patch-share_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/emulators/hatari/patches/patch-share_CMakeLists_txt,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-share_CMakeLists_txt
--- patches/patch-share_CMakeLists_txt 31 Jul 2016 23:53:35 -0000 1.1.1.1
+++ patches/patch-share_CMakeLists_txt 13 Nov 2016 13:30:11 -0000
@@ -1,4 +1,7 @@
$OpenBSD: patch-share_CMakeLists_txt,v 1.1.1.1 2016/07/31 23:53:35 awolk Exp $
+
+Prevent installing files outside of every prefix.
+
--- share/CMakeLists.txt.orig Thu Jun 23 01:55:13 2016
+++ share/CMakeLists.txt Thu Jun 23 02:03:44 2016
@@ -5,8 +5,8 @@ foreach(size 32x32 48x48 64x64 128x128 256x256)
Index: patches/patch-src_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/emulators/hatari/patches/patch-src_CMakeLists_txt,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-src_CMakeLists_txt
--- patches/patch-src_CMakeLists_txt 31 Jul 2016 23:53:35 -0000 1.1.1.1
+++ patches/patch-src_CMakeLists_txt 13 Nov 2016 13:30:11 -0000
@@ -1,7 +1,10 @@
$OpenBSD: patch-src_CMakeLists_txt,v 1.1.1.1 2016/07/31 23:53:35 awolk Exp $
---- src/CMakeLists.txt.orig Fri Jun 3 01:15:03 2016
-+++ src/CMakeLists.txt Fri Jun 3 01:15:35 2016
-@@ -41,8 +41,8 @@ else()
+
+Prevent libzip's zip.h header to be picked up instead of src/includes/zip.h
+
+--- src/CMakeLists.txt.orig Thu Nov 3 22:25:43 2016
++++ src/CMakeLists.txt Fri Nov 4 20:38:26 2016
+@@ -43,8 +43,8 @@ else()
set(CPUDIR uae-cpu)
endif(ENABLE_WINUAE_CPU)
Index: patches/patch-tools_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/emulators/hatari/patches/patch-tools_CMakeLists_txt,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-tools_CMakeLists_txt
--- patches/patch-tools_CMakeLists_txt 31 Jul 2016 23:53:35 -0000 1.1.1.1
+++ patches/patch-tools_CMakeLists_txt 13 Nov 2016 13:30:11 -0000
@@ -1,6 +1,11 @@
$OpenBSD: patch-tools_CMakeLists_txt,v 1.1.1.1 2016/07/31 23:53:35 awolk Exp $
---- tools/CMakeLists.txt.orig Thu Sep 10 23:16:03 2015
-+++ tools/CMakeLists.txt Thu Jun 23 21:49:16 2016
+
+Bundled tool atari-hd-image.sh is unusable on OpenBSD because it requires
+'mkdosfs' and cannot be patched to use 'newfs_msdos' as a needed option is
+missing.
+
+--- tools/CMakeLists.txt.orig Thu Nov 3 22:25:43 2016
++++ tools/CMakeLists.txt Fri Nov 4 20:38:26 2016
@@ -8,7 +8,6 @@ if(PYTHONINTERP_FOUND)
endif(PYTHONINTERP_FOUND)
@@ -8,8 +13,8 @@ $OpenBSD: patch-tools_CMakeLists_txt,v 1
-install(PROGRAMS atari-hd-image.sh DESTINATION ${BINDIR} RENAME
atari-hd-image)
install(PROGRAMS zip2st.sh DESTINATION ${BINDIR} RENAME zip2st)
- # if(UNIX)
-@@ -17,12 +16,6 @@ install(PROGRAMS zip2st.sh DESTINATION ${BINDIR} RENAM
+ if(NOT WIN32)
+@@ -17,12 +16,6 @@ if(NOT WIN32)
COMMAND gzip -c -9
${CMAKE_CURRENT_SOURCE_DIR}/atari-convert-dir.1 >
${CMAKE_CURRENT_BINARY_DIR}/atari-convert-dir.1.gz
DEPENDS atari-convert-dir.1)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/atari-convert-dir.1.gz
DESTINATION ${MANDIR})
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/emulators/hatari/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- pkg/DESCR 31 Jul 2016 23:53:35 -0000 1.1.1.1
+++ pkg/DESCR 13 Nov 2016 13:30:11 -0000
@@ -1,7 +1,8 @@
-Hatari is an Atari ST/STE/TT/Falcon emulator for Linux, FreeBSD, NetBSD,
-BeOS, Mac-OSX and other Systems which are supported by the SDL library.
-Unlike most other open source ST emulators which try to give you a good
+Hatari is an Atari ST/STE/TT/Falcon emulator.
+
+Hatari supports the emulation of most of the ST and STE hardware, including
+some special tricks like raster interrupts, border effects and PSG sample
+sound. Unlike many other Atari ST emulators which try to give you a good
environment for running GEM applications, Hatari tries to emulate the
-hardware as close as possible so that it is able to run most of the old
-Atari games and demos. Because of this, it may be somewhat slower than
-less accurate emulators.
+hardware of a ST as close as possible so that it is able to run most of
+the old ST games and demos.
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/emulators/hatari/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 31 Jul 2016 23:53:35 -0000 1.1.1.1
+++ pkg/PLIST 13 Nov 2016 13:30:11 -0000
@@ -3,19 +3,16 @@ bin/atari-convert-dir
@bin bin/gst2ascii
@bin bin/hatari
bin/hatari_profile.py
-bin/hatariui
@bin bin/hmsa
bin/zip2st
@man man/man1/atari-convert-dir.1
@man man/man1/gst2ascii.1
@man man/man1/hatari.1
@man man/man1/hatari_profile.1
-@man man/man1/hatariui.1
@man man/man1/hconsole.1
@man man/man1/hmsa.1
@man man/man1/zip2st.1
share/applications/hatari.desktop
-share/applications/hatariui.desktop
share/doc/hatari/
share/doc/hatari/authors.txt
share/doc/hatari/compatibility.html
@@ -23,6 +20,7 @@ share/doc/hatari/emutos.txt
share/doc/hatari/images/
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
@@ -46,26 +44,6 @@ share/doc/hatari/release-notes.txt
share/doc/hatari/todo.txt
share/hatari/
share/hatari/hatari-icon.bmp
-share/hatari/hatariui/
-share/hatari/hatariui/README
-share/hatari/hatariui/TODO
-share/hatari/hatariui/config.py
-share/hatari/hatariui/config.pyc
-share/hatari/hatariui/conftypes.py
-share/hatari/hatariui/conftypes.pyc
-share/hatari/hatariui/debugui.py
-share/hatari/hatariui/debugui.pyc
-share/hatari/hatariui/dialogs.py
-share/hatari/hatariui/dialogs.pyc
-share/hatari/hatariui/hatari-icon.png
-share/hatari/hatariui/hatari-logo.png
-share/hatari/hatariui/hatari.py
-share/hatari/hatariui/hatari.pyc
-share/hatari/hatariui/hatariui.py
-share/hatari/hatariui/hatariui.pyc
-share/hatari/hatariui/release-notes.txt
-share/hatari/hatariui/uihelpers.py
-share/hatari/hatariui/uihelpers.pyc
share/hatari/hconsole/
share/hatari/hconsole/example-commands
share/hatari/hconsole/example-debugger
