Attachment #250323 for bug #278590




PORTNAME=	hatari
PORTVERSION=	2.5.0
#PORTREVISION=	none
CATEGORIES=	emulators
MASTER_SITES=	http://download.tuxfamily.org/hatari/${PORTVERSION}/

MAINTAINER=	laurent.chardon@gmail.com
COMMENT=	Atari ST emulator
WWW=		https://hatari.tuxfamily.org/

LICENSE=	GPLv2+
LICENSE_FILE=	${WRKSRC}/gpl.txt

BROKEN_armv6=	fails to configure: CMake Error: Generator: execution of make failed

LIB_DEPENDS=	libpng.so:graphics/png \
		libudev.so:devel/libudev-devd \
		libreadline.so:devel/readline \
		libcapstone.so:devel/capstone

USES=		cmake desktop-file-utils gnome python readline \
		sdl shared-mime-info shebangfix tar:bzip2 xorg iconv
USE_GNOME=	gtk30 pygobject3
USE_XORG=	sm ice x11 xext
USE_SDL=	sdl2

SHEBANG_FILES=	python-ui/*.py tools/*.py \
		tools/debugger/*.py tools/hconsole/*.py

CMAKE_ARGS=	-DETCDIR:PATH="${PREFIX}/etc"

OPTIONS_DEFINE=		DEBUG DOCS DSP TRACE SMALL
OPTIONS_DEFAULT=	DOCS DSP TRACE

DEBUG_DESC=		Build with debug information
DOCS_DESC=		Install extra documentation
DSP_DESC=		DSP 56k emulator for Falcon mode
TRACE_DESC=		Tracing messages for debugging
SMALL_DESC=		Use less memory at the expense of emulation speed

#DEBUG_CMAKE_ON=		-DCMAKE_BUILD_TYPE="Debug"
#DEBUG_CMAKE_OFF=	-DCMAKE_BUILD_TYPE="Release"
#DEBUG_INSTALL_TARGET=	install
DSP_CMAKE_BOOL=		ENABLE_DSP_EMU
TRACE_CMAKE_BOOL=	ENABLE_TRACING
SMALL_CMAKE_BOOL=	ENABLE_SMALL_MEM

TEST_TARGET=	test

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MDEBUG}
CMAKE_BUILD_TYPE=Debug
INSTALL_TARGET=install
.else
CMAKE_BUILD_TYPE=Release
.endif

post-patch:
.for i in doc/*.1 python-ui/*.1 tools/*.1 tools/debugger/*.1 tools/hconsole/*.1 tools/hmsa/*.1

Lines 1-3 Link Here

(-)b/emulators/hatari/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1645876638	1	TIMESTAMP = 1714071173
2	SHA256 (hatari-2.3.1.tar.bz2) = 44a2f62ca995e38d9e0874806956f0b9c3cc84ea89e0169a63849b63cd3b64bd	2	SHA256 (hatari-2.5.0.tar.bz2) = d76c22fc3de69fb1bb4af3e8ba500b7e40f5a2a45d07783f24cb7101e53c3457
3	SIZE (hatari-2.3.1.tar.bz2) = 4334129	3	SIZE (hatari-2.5.0.tar.bz2) = 2820580




--- CMakeLists.txt.orig	2018-03-20 22:30:14 UTC
+++ CMakeLists.txt
@@ -187,7 +187,12 @@
 check_include_files(termios.h HAVE_TERMIOS_H)
 check_include_files(strings.h HAVE_STRINGS_H)
 check_include_files(malloc.h HAVE_MALLOC_H)
-check_include_files(${SDL_INCLUDE_DIR}/SDL_config.h HAVE_SDL_CONFIG_H)
+foreach(_sid ${SDL_INCLUDE_DIR})
+  check_include_files(${_sid}/SDL_config.h HAVE_SDL_CONFIG_H)
+  if(HAVE_SDL_CONFIG_H)
+    break()
+  endif()
+endforeach()
 check_include_files(sys/time.h HAVE_SYS_TIME_H)
 check_include_files(sys/times.h HAVE_SYS_TIMES_H)
 check_include_files(utime.h HAVE_UTIME_H)




--- cmake/FindReadline.cmake.orig	2024-04-30 09:37:41 UTC
+++ cmake/FindReadline.cmake
@@ -19,9 +19,11 @@ if(Readline_FOUND)
 if(Readline_FOUND)
 	set(CMAKE_REQUIRED_LIBRARIES ${READLINE_LIBRARY})
 	set(CMAKE_REQUIRED_INCLUDES ${READLINE_INCLUDE_DIR})
-	check_symbol_exists(rl_filename_completion_function
-			    "stdio.h;readline.h"
-			    HAVE_RL_COMPLETION_FUNCTION)
+	# check_symbol_exists faile for readline on FreeBSD. Bypassing
+	set(HAVE_RL_COMPLETION_FUNCTION TRUE)
+	#check_symbol_exists(rl_filename_completion_function
+	#		    "stdio.h;readline.h"
+	#		    HAVE_RL_COMPLETION_FUNCTION)
 	# If linking did not work, we might have to link
 	# explicitly against libtermcap or libncurses
 	if(NOT HAVE_RL_COMPLETION_FUNCTION)




--- share/CMakeLists.txt.orig	2024-04-26 10:53:02 UTC
+++ share/CMakeLists.txt
@@ -6,8 +6,8 @@ foreach(size 32x32 48x48 64x64 128x128 256x256)
 	install(FILES icons/hicolor/${size}/mimetypes/application-x-st-disk-image.png
 		DESTINATION ${ICONDIR}/${size}/mimetypes)
 	foreach(type vnd.msa vnd.fastcopy x-stx)
 		install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink
-				application-x-st-disk-image.png
-				\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${ICONDIR}/${size}/mimetypes/application-${type}-disk-image.png)
+				application-x-st-disk-image.png application-${type}-disk-image.png
+				WORKING_DIRECTORY \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${ICONDIR}/${size}/mimetypes)
 				")
 	endforeach()
 endforeach()
@@ -18,8 +18,8 @@ foreach(type vnd.msa vnd.fastcopy x-stx)
 install(FILES icons/hicolor/scalable/mimetypes/application-x-st-disk-image.svg
 	DESTINATION ${ICONDIR}/scalable/mimetypes)
 foreach(type vnd.msa vnd.fastcopy x-stx)
 	install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink
-			application-x-st-disk-image.svg
-			\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${ICONDIR}/scalable/mimetypes/application-${type}-disk-image.svg)
+			application-x-st-disk-image.svg application-${type}-disk-image.svg 
+			WORKING_DIRECTORY \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${ICONDIR}/scalable/mimetypes)
 			")
 endforeach()




--- tools/atari-hd-image.sh.orig	2024-04-26 10:23:56 UTC
+++ tools/atari-hd-image.sh
@@ -33,8 +33,8 @@ export PATH
 export PATH
 
 # check tools
-if [ -z "$(which mkdosfs)" ] || [ -z "$(which python3)" ]; then
-	echo "ERROR: either mkdosfs or python3 missing!"
+if [ -z "$(which mkdosfs)" ] || [ -z "$(which %%PYTHON_VERSION%%)" ]; then
+	echo "ERROR: either mkdosfs or %%PYTHON_VERSION%% missing!"
 	exit 1
 fi
 

 # - http://en.wikipedia.org/wiki/File_Allocation_Table#Boot_Sector
 # For DOS MBR, the values are little endian.
 # -----------
-python3 << EOF
-#!/usr/bin/env python3
+%%PYTHON_VERSION%% << EOF
+#!/usr/bin/env %%PYTHON_VERSION%%
 mbr = bytearray(512)
 
 def set_long(idx, value):




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
share/man/man1/atari-convert-dir.1.gz
share/man/man1/atari-hd-image.1.gz
share/man/man1/gst2ascii.1.gz
share/man/man1/hatari-prg-args.1.gz
share/man/man1/hatari.1.gz
share/man/man1/hatari_profile.1.gz
share/man/man1/hatariui.1.gz
share/man/man1/hconsole.1.gz
share/man/man1/hmsa.1.gz
share/man/man1/zip2st.1.gz
share/applications/hatari.desktop
share/applications/hatariui.desktop
%%PORTDOCS%%%%DOCSDIR%%/CMakeLists.txt

%%PORTDOCS%%%%DOCSDIR%%/compatibility.html
%%PORTDOCS%%%%DOCSDIR%%/debugger.html
%%PORTDOCS%%%%DOCSDIR%%/emutos.txt
%%PORTDOCS%%%%DOCSDIR%%/hatari-ui.html
%%PORTDOCS%%%%DOCSDIR%%/hatariui/README
%%PORTDOCS%%%%DOCSDIR%%/hatariui/TODO
%%PORTDOCS%%%%DOCSDIR%%/hatariui/release-notes.txt
%%PORTDOCS%%%%DOCSDIR%%/hconsole/release-notes.txt
%%PORTDOCS%%%%DOCSDIR%%/images/callgraph.png
%%PORTDOCS%%%%DOCSDIR%%/images/callgraph.svg
%%PORTDOCS%%%%DOCSDIR%%/images/cpu.png

%%PORTDOCS%%%%DOCSDIR%%/images/fileselector.png
%%PORTDOCS%%%%DOCSDIR%%/images/floppydisks.png
%%PORTDOCS%%%%DOCSDIR%%/images/harddisks.png
%%PORTDOCS%%%%DOCSDIR%%/images/hatari-ui-0.7.png
%%PORTDOCS%%%%DOCSDIR%%/images/hatari-ui-0.9.png
%%PORTDOCS%%%%DOCSDIR%%/images/hatari-ui-debug.png
%%PORTDOCS%%%%DOCSDIR%%/images/hatari-ui-input.png
%%PORTDOCS%%%%DOCSDIR%%/images/hatari-ui-noembed.png
%%PORTDOCS%%%%DOCSDIR%%/images/hatari-ui-peripherals.png
%%PORTDOCS%%%%DOCSDIR%%/images/hatari-ui-quit.png
%%PORTDOCS%%%%DOCSDIR%%/images/hatari-ui-setup-edit.png
%%PORTDOCS%%%%DOCSDIR%%/images/hatari-ui-setup.png
%%PORTDOCS%%%%DOCSDIR%%/images/hatari-ui-speed.png
%%PORTDOCS%%%%DOCSDIR%%/images/hatari-ui-trace.png
%%PORTDOCS%%%%DOCSDIR%%/images/joystick.png
%%PORTDOCS%%%%DOCSDIR%%/images/kcachegrind.png
%%PORTDOCS%%%%DOCSDIR%%/images/keyboard.png

%%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%%/scsi-driver.txt
%%PORTDOCS%%%%DOCSDIR%%/thanks.txt
%%PORTDOCS%%%%DOCSDIR%%/toc.js
%%PORTDOCS%%%%DOCSDIR%%/todo.txt
%%PORTDOCS%%%%DOCSDIR%%/video-recording.txt
%%DATADIR%%/hatari-icon.bmp
%%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/uihelpers.py
%%DATADIR%%/hconsole/example-commands
%%DATADIR%%/hconsole/example-debugger
%%DATADIR%%/hconsole/example.py
%%DATADIR%%/hconsole/hconsole.py
%%DATADIR%%/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

share/icons/hicolor/scalable/mimetypes/application-vnd.msa-disk-image.svg
share/icons/hicolor/scalable/mimetypes/application-x-st-disk-image.svg
share/icons/hicolor/scalable/mimetypes/application-x-stx-disk-image.svg
share/man/man1/atari-convert-dir.1.gz
share/man/man1/atari-hd-image.1.gz
share/man/man1/gst2ascii.1.gz
share/man/man1/hatari-prg-args.1.gz
share/man/man1/hatari.1.gz
share/man/man1/hatari_profile.1.gz
share/man/man1/hatariui.1.gz
share/man/man1/hconsole.1.gz
share/man/man1/hmsa.1.gz
share/man/man1/zip2st.1.gz
share/mime/packages/hatari.xml

Return to bug 278590

Lines 1-44 Link Here

(-)b/emulators/hatari/Makefile (-23 / +39 lines)
1	PORTNAME= hatari	1	PORTNAME= hatari
2	PORTVERSION= 2.3.1	2	PORTVERSION= 2.5.0
3	PORTREVISION= 3	3	#PORTREVISION= none
4	CATEGORIES= emulators	4	CATEGORIES= emulators
5	MASTER_SITES= http://download.tuxfamily.org/hatari/${PORTVERSION}/	5	MASTER_SITES= http://download.tuxfamily.org/hatari/${PORTVERSION}/
6		6
7	MAINTAINER= ports@FreeBSD.org	7	MAINTAINER= laurent.chardon@gmail.com
8	COMMENT= Atari ST emulator	8	COMMENT= Atari ST emulator
9	WWW= https://hatari.tuxfamily.org/	9	WWW= https://hatari.tuxfamily.org/
10		10
11	LICENSE= GPLv2+	11	LICENSE= GPLv2+
12	LICENSE_FILE= ${WRKSRC}/gpl.txt	12	LICENSE_FILE= ${WRKSRC}/gpl.txt
13		13
14	BROKEN_armv6= fails to configure: CMake Error: Generator: execution of make failed	14	BROKEN_armv6= fails to configure: CMake Error: Generator: execution of make failed
15		15
16	LIB_DEPENDS= libportaudio.so:audio/portaudio \	16	LIB_DEPENDS= libpng.so:graphics/png \
17	libpng.so:graphics/png	17	libudev.so:devel/libudev-devd \
		18	libreadline.so:devel/readline \
		19	libcapstone.so:devel/capstone
18		20
19	USES= cmake desktop-file-utils gnome python readline \	21	USES= cmake desktop-file-utils gnome python readline \
20	sdl shared-mime-info shebangfix tar:bzip2 xorg	22	sdl shared-mime-info shebangfix tar:bzip2 xorg iconv
21	USE_GNOME= gtk30	23	USE_GNOME= gtk30 pygobject3
22	USE_XORG= sm ice x11 xext	24	USE_XORG= sm ice x11 xext
		25	USE_SDL= sdl2
23		26
24	SHEBANG_FILES= python-ui/.py tools/.py \	27	SHEBANG_FILES= python-ui/.py tools/.py \
25	tools/debugger/.py tools/hconsole/.py	28	tools/debugger/.py tools/hconsole/.py
26		29
27	CMAKE_ARGS= -DETCDIR:PATH="${PREFIX}/etc" \	30	CMAKE_ARGS= -DETCDIR:PATH="${PREFIX}/etc"
28	-DREADLINE_FOUND:BOOL=ON	31
29		32	OPTIONS_DEFINE= DEBUG DOCS DSP TRACE SMALL
30	# -DMANDIR:PATH="share/man/man1"	33	OPTIONS_DEFAULT= DOCS DSP TRACE
31	OPTIONS_DEFINE= DEBUG DOCS SDL2 WINUAE	34
32		35	DEBUG_DESC= Build with debug information
33	DEBUG_CFLAGS_OFF= -DNDEBUG	36	DOCS_DESC= Install extra documentation
34	SDL2_DESC= Use SDL2 libraries instead of SDL 1.2	37	DSP_DESC= DSP 56k emulator for Falcon mode
35	SDL2_USES= iconv	38	TRACE_DESC= Tracing messages for debugging
36	SDL2_USE= sdl=sdl2	39	SMALL_DESC= Use less memory at the expense of emulation speed
37	SDL2_USE_OFF= sdl=sdl	40
38	SDL2_CMAKE_BOOL= ENABLE_SDL2	41	#DEBUG_CMAKE_ON= -DCMAKE_BUILD_TYPE="Debug"
39	SDL2_CFLAGS= -I${ICONV_INCLUDE_PATH}	42	#DEBUG_CMAKE_OFF= -DCMAKE_BUILD_TYPE="Release"
40	WINUAE_DESC= Build with WinUAE CPU core	43	#DEBUG_INSTALL_TARGET= install
41	WINUAE_CMAKE_BOOL= ENABLE_WINUAE_CPU	44	DSP_CMAKE_BOOL= ENABLE_DSP_EMU
		45	TRACE_CMAKE_BOOL= ENABLE_TRACING
		46	SMALL_CMAKE_BOOL= ENABLE_SMALL_MEM
		47
		48	TEST_TARGET= test
		49
		50	.include <bsd.port.options.mk>
		51
		52	.if ${PORT_OPTIONS:MDEBUG}
		53	CMAKE_BUILD_TYPE=Debug
		54	INSTALL_TARGET=install
		55	.else
		56	CMAKE_BUILD_TYPE=Release
		57	.endif
42		58
43	post-patch:	59	post-patch:
44	.for i in doc/.1 python-ui/.1 tools/.1 tools/debugger/.1 tools/hconsole/.1 tools/hmsa/.1	60	.for i in doc/.1 python-ui/.1 tools/.1 tools/debugger/.1 tools/hconsole/.1 tools/hmsa/.1

Removed Link Here

(-)a/emulators/hatari/files/patch-CMakeLists.txt (-16 lines)
1	--- CMakeLists.txt.orig 2018-03-20 22:30:14 UTC
2	+++ CMakeLists.txt
3	@@ -187,7 +187,12 @@
4	check_include_files(termios.h HAVE_TERMIOS_H)
5	check_include_files(strings.h HAVE_STRINGS_H)
6	check_include_files(malloc.h HAVE_MALLOC_H)
7	-check_include_files(${SDL_INCLUDE_DIR}/SDL_config.h HAVE_SDL_CONFIG_H)
8	+foreach(_sid ${SDL_INCLUDE_DIR})
9	+ check_include_files(${_sid}/SDL_config.h HAVE_SDL_CONFIG_H)
10	+ if(HAVE_SDL_CONFIG_H)
11	+ break()
12	+ endif()
13	+endforeach()
14	check_include_files(sys/time.h HAVE_SYS_TIME_H)
15	check_include_files(sys/times.h HAVE_SYS_TIMES_H)
16	check_include_files(utime.h HAVE_UTIME_H)

Added Link Here

(-)b/emulators/hatari/files/patch-cmake_FindReadline.cmake (+17 lines)
1	--- cmake/FindReadline.cmake.orig 2024-04-30 09:37:41 UTC
2	+++ cmake/FindReadline.cmake
3	@@ -19,9 +19,11 @@ if(Readline_FOUND)
4	if(Readline_FOUND)
5	set(CMAKE_REQUIRED_LIBRARIES ${READLINE_LIBRARY})
6	set(CMAKE_REQUIRED_INCLUDES ${READLINE_INCLUDE_DIR})
7	- check_symbol_exists(rl_filename_completion_function
8	- "stdio.h;readline.h"
9	- HAVE_RL_COMPLETION_FUNCTION)
10	+ # check_symbol_exists faile for readline on FreeBSD. Bypassing
11	+ set(HAVE_RL_COMPLETION_FUNCTION TRUE)
12	+ #check_symbol_exists(rl_filename_completion_function
13	+ # "stdio.h;readline.h"
14	+ # HAVE_RL_COMPLETION_FUNCTION)
15	# If linking did not work, we might have to link
16	# explicitly against libtermcap or libncurses
17	if(NOT HAVE_RL_COMPLETION_FUNCTION)

Lines 1-25 Link Here

(-)b/emulators/hatari/files/patch-share_CMakeLists.txt (-9 / +7 lines)
1	--- share/CMakeLists.txt.orig 2018-02-07 18:33:55 UTC	1	--- share/CMakeLists.txt.orig 2024-04-26 10:53:02 UTC
2	+++ share/CMakeLists.txt	2	+++ share/CMakeLists.txt
3	@@ -5,9 +5,8 @@ foreach(size 32x32 48x48 64x64 128x128 2	3	@@ -6,8 +6,8 @@ foreach(size 32x32 48x48 64x64 128x128 256x256)
4	install(FILES icons/hicolor/${size}/mimetypes/application-x-st-disk-image.png
5	DESTINATION ${ICONDIR}/${size}/mimetypes)	4	DESTINATION ${ICONDIR}/${size}/mimetypes)
6	foreach(type vnd.msa vnd.fastcopy x-stx)	5	foreach(type vnd.msa vnd.fastcopy x-stx)
7	- install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink	6	install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink
8	- application-x-st-disk-image.png	7	- application-x-st-disk-image.png
9	- \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${ICONDIR}/${size}/mimetypes/application-${type}-disk-image.png)	8	- \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${ICONDIR}/${size}/mimetypes/application-${type}-disk-image.png)
10	+ install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink application-x-st-disk-image.png application-${type}-disk-image.png	9	+ application-x-st-disk-image.png application-${type}-disk-image.png
11	+ WORKING_DIRECTORY \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${ICONDIR}/${size}/mimetypes)	10	+ WORKING_DIRECTORY \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${ICONDIR}/${size}/mimetypes)
12	")	11	")
13	endforeach()	12	endforeach()
14	endforeach()	13	endforeach()
15	@@ -17,9 +16,8 @@ install(FILES icons/hicolor/scalable/app	14	@@ -18,8 +18,8 @@ foreach(type vnd.msa vnd.fastcopy x-stx)
16	install(FILES icons/hicolor/scalable/mimetypes/application-x-st-disk-image.svg
17	DESTINATION ${ICONDIR}/scalable/mimetypes)	15	DESTINATION ${ICONDIR}/scalable/mimetypes)
18	foreach(type vnd.msa vnd.fastcopy x-stx)	16	foreach(type vnd.msa vnd.fastcopy x-stx)
19	- install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink	17	install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink
20	- application-x-st-disk-image.svg	18	- application-x-st-disk-image.svg
21	- \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${ICONDIR}/scalable/mimetypes/application-${type}-disk-image.svg)	19	- \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${ICONDIR}/scalable/mimetypes/application-${type}-disk-image.svg)
22	+ install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink application-x-st-disk-image.svg application-${type}-disk-image.svg	20	+ application-x-st-disk-image.svg application-${type}-disk-image.svg
23	+ WORKING_DIRECTORY \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${ICONDIR}/scalable/mimetypes)	21	+ WORKING_DIRECTORY \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${ICONDIR}/scalable/mimetypes)
24	")	22	")
25	endforeach()	23	endforeach()

Lines 1-13 Link Here

(-)b/emulators/hatari/files/patch-tools_atari-hd-image.sh (-7 / +7 lines)
1	--- tools/atari-hd-image.sh.orig 2022-02-26 12:11:11 UTC	1	--- tools/atari-hd-image.sh.orig 2024-04-26 10:23:56 UTC
2	+++ tools/atari-hd-image.sh	2	+++ tools/atari-hd-image.sh
3	@@ -33,8 +33,8 @@ PATH=/sbin:$PATH	3	@@ -33,8 +33,8 @@ export PATH
4	export PATH	4	export PATH
5		5
6	# check tools	6	# check tools
7	-if [ -z "$(which mkdosfs)" ] \|\| [ -z "$(which python)" ]; then	7	-if [ -z "$(which mkdosfs)" ] \|\| [ -z "$(which python3)" ]; then
8	- echo "ERROR: either mkdosfs or python tool missing!"	8	- echo "ERROR: either mkdosfs or python3 missing!"
9	+if [ -z "$(which mkdosfs)" ] \|\| [ -z "$(which %%PYTHON_VERSION%%)" ]; then	9	+if [ -z "$(which mkdosfs)" ] \|\| [ -z "$(which %%PYTHON_VERSION%%)" ]; then
10	+ echo "ERROR: either mkdosfs or %%PYTHON_VERSION%% tool missing!"	10	+ echo "ERROR: either mkdosfs or %%PYTHON_VERSION%% missing!"
11	exit 1	11	exit 1
12	fi	12	fi
13		13
Lines 15-24 Link Here
15	# - http://en.wikipedia.org/wiki/File_Allocation_Table#Boot_Sector	15	# - http://en.wikipedia.org/wiki/File_Allocation_Table#Boot_Sector
16	# For DOS MBR, the values are little endian.	16	# For DOS MBR, the values are little endian.
17	# -----------	17	# -----------
18	-python << EOF	18	-python3 << EOF
19	-#!/usr/bin/env python3	19	-#!/usr/bin/env python3
20	+%%PYTHON_VERSION%% << EOF	20	+%%PYTHON_VERSION%% << EOF
21	+#!/usr/bin/env %%PYTHON_VERSION%%3	21	+#!/usr/bin/env %%PYTHON_VERSION%%
22	mbr = bytearray(512)	22	mbr = bytearray(512)
23		23
24	def set_long(idx, value):	24	def set_long(idx, value):

Lines 7-41 bin/hatari_profile Link Here

(-)b/emulators/hatari/pkg-plist (-31 / +43 lines)
7	bin/hatariui	7	bin/hatariui
8	bin/hmsa	8	bin/hmsa
9	bin/zip2st	9	bin/zip2st
10	%%DATADIR%%/hatari-icon.bmp
11	%%DATADIR%%/hatariui/README
12	%%DATADIR%%/hatariui/TODO
13	%%DATADIR%%/hatariui/config.py
14	%%DATADIR%%/hatariui/conftypes.py
15	%%DATADIR%%/hatariui/debugui.py
16	%%DATADIR%%/hatariui/dialogs.py
17	%%DATADIR%%/hatariui/hatari-icon.png
18	%%DATADIR%%/hatariui/hatari-logo.png
19	%%DATADIR%%/hatariui/hatari.py
20	%%DATADIR%%/hatariui/hatariui.py
21	%%DATADIR%%/hatariui/%%CMAKE_BUILD_TYPE%%-notes.txt
22	%%DATADIR%%/hatariui/uihelpers.py
23	%%DATADIR%%/hconsole/example-commands
24	%%DATADIR%%/hconsole/example-debugger
25	%%DATADIR%%/hconsole/example.py
26	%%DATADIR%%/hconsole/hconsole.py
27	%%DATADIR%%/hconsole/%%CMAKE_BUILD_TYPE%%-notes.txt
28	%%DATADIR%%/tos.img
29	share/man/man1/atari-convert-dir.1.gz
30	share/man/man1/atari-hd-image.1.gz
31	share/man/man1/gst2ascii.1.gz
32	share/man/man1/hatari-prg-args.1.gz
33	share/man/man1/hatari.1.gz
34	share/man/man1/hatari_profile.1.gz
35	share/man/man1/hatariui.1.gz
36	share/man/man1/hconsole.1.gz
37	share/man/man1/hmsa.1.gz
38	share/man/man1/zip2st.1.gz
39	share/applications/hatari.desktop	10	share/applications/hatari.desktop
40	share/applications/hatariui.desktop	11	share/applications/hatariui.desktop
41	%%PORTDOCS%%%%DOCSDIR%%/CMakeLists.txt	12	%%PORTDOCS%%%%DOCSDIR%%/CMakeLists.txt
Lines 46-51 share/applications/hatariui.desktop Link Here
46	%%PORTDOCS%%%%DOCSDIR%%/compatibility.html	17	%%PORTDOCS%%%%DOCSDIR%%/compatibility.html
47	%%PORTDOCS%%%%DOCSDIR%%/debugger.html	18	%%PORTDOCS%%%%DOCSDIR%%/debugger.html
48	%%PORTDOCS%%%%DOCSDIR%%/emutos.txt	19	%%PORTDOCS%%%%DOCSDIR%%/emutos.txt
		20	%%PORTDOCS%%%%DOCSDIR%%/hatari-ui.html
		21	%%PORTDOCS%%%%DOCSDIR%%/hatariui/README
		22	%%PORTDOCS%%%%DOCSDIR%%/hatariui/TODO
		23	%%PORTDOCS%%%%DOCSDIR%%/hatariui/release-notes.txt
		24	%%PORTDOCS%%%%DOCSDIR%%/hconsole/release-notes.txt
49	%%PORTDOCS%%%%DOCSDIR%%/images/callgraph.png	25	%%PORTDOCS%%%%DOCSDIR%%/images/callgraph.png
50	%%PORTDOCS%%%%DOCSDIR%%/images/callgraph.svg	26	%%PORTDOCS%%%%DOCSDIR%%/images/callgraph.svg
51	%%PORTDOCS%%%%DOCSDIR%%/images/cpu.png	27	%%PORTDOCS%%%%DOCSDIR%%/images/cpu.png
Lines 54-59 share/applications/hatariui.desktop Link Here
54	%%PORTDOCS%%%%DOCSDIR%%/images/fileselector.png	30	%%PORTDOCS%%%%DOCSDIR%%/images/fileselector.png
55	%%PORTDOCS%%%%DOCSDIR%%/images/floppydisks.png	31	%%PORTDOCS%%%%DOCSDIR%%/images/floppydisks.png
56	%%PORTDOCS%%%%DOCSDIR%%/images/harddisks.png	32	%%PORTDOCS%%%%DOCSDIR%%/images/harddisks.png
		33	%%PORTDOCS%%%%DOCSDIR%%/images/hatari-ui-0.7.png
		34	%%PORTDOCS%%%%DOCSDIR%%/images/hatari-ui-0.9.png
		35	%%PORTDOCS%%%%DOCSDIR%%/images/hatari-ui-debug.png
		36	%%PORTDOCS%%%%DOCSDIR%%/images/hatari-ui-input.png
		37	%%PORTDOCS%%%%DOCSDIR%%/images/hatari-ui-noembed.png
		38	%%PORTDOCS%%%%DOCSDIR%%/images/hatari-ui-peripherals.png
		39	%%PORTDOCS%%%%DOCSDIR%%/images/hatari-ui-quit.png
		40	%%PORTDOCS%%%%DOCSDIR%%/images/hatari-ui-setup-edit.png
		41	%%PORTDOCS%%%%DOCSDIR%%/images/hatari-ui-setup.png
		42	%%PORTDOCS%%%%DOCSDIR%%/images/hatari-ui-speed.png
		43	%%PORTDOCS%%%%DOCSDIR%%/images/hatari-ui-trace.png
57	%%PORTDOCS%%%%DOCSDIR%%/images/joystick.png	44	%%PORTDOCS%%%%DOCSDIR%%/images/joystick.png
58	%%PORTDOCS%%%%DOCSDIR%%/images/kcachegrind.png	45	%%PORTDOCS%%%%DOCSDIR%%/images/kcachegrind.png
59	%%PORTDOCS%%%%DOCSDIR%%/images/keyboard.png	46	%%PORTDOCS%%%%DOCSDIR%%/images/keyboard.png
Lines 72-84 share/applications/hatariui.desktop Link Here
72	%%PORTDOCS%%%%DOCSDIR%%/manual.html	59	%%PORTDOCS%%%%DOCSDIR%%/manual.html
73	%%PORTDOCS%%%%DOCSDIR%%/memory-usage.txt	60	%%PORTDOCS%%%%DOCSDIR%%/memory-usage.txt
74	%%PORTDOCS%%%%DOCSDIR%%/midi-linux.txt	61	%%PORTDOCS%%%%DOCSDIR%%/midi-linux.txt
75	%%PORTDOCS%%%%DOCSDIR%%/%%CMAKE_BUILD_TYPE%%-checklist.txt	62	%%PORTDOCS%%%%DOCSDIR%%/release-checklist.txt
76	%%PORTDOCS%%%%DOCSDIR%%/%%CMAKE_BUILD_TYPE%%-notes.txt	63	%%PORTDOCS%%%%DOCSDIR%%/release-notes.txt
77	%%PORTDOCS%%%%DOCSDIR%%/scsi-driver.txt	64	%%PORTDOCS%%%%DOCSDIR%%/scsi-driver.txt
78	%%PORTDOCS%%%%DOCSDIR%%/thanks.txt	65	%%PORTDOCS%%%%DOCSDIR%%/thanks.txt
79	%%PORTDOCS%%%%DOCSDIR%%/toc.js	66	%%PORTDOCS%%%%DOCSDIR%%/toc.js
80	%%PORTDOCS%%%%DOCSDIR%%/todo.txt	67	%%PORTDOCS%%%%DOCSDIR%%/todo.txt
81	%%PORTDOCS%%%%DOCSDIR%%/video-recording.txt	68	%%PORTDOCS%%%%DOCSDIR%%/video-recording.txt
		69	%%DATADIR%%/hatari-icon.bmp
		70	%%DATADIR%%/hatariui/config.py
		71	%%DATADIR%%/hatariui/conftypes.py
		72	%%DATADIR%%/hatariui/debugui.py
		73	%%DATADIR%%/hatariui/dialogs.py
		74	%%DATADIR%%/hatariui/hatari-icon.png
		75	%%DATADIR%%/hatariui/hatari-logo.png
		76	%%DATADIR%%/hatariui/hatari.py
		77	%%DATADIR%%/hatariui/hatariui.py
		78	%%DATADIR%%/hatariui/uihelpers.py
		79	%%DATADIR%%/hconsole/example-commands
		80	%%DATADIR%%/hconsole/example-debugger
		81	%%DATADIR%%/hconsole/example.py
		82	%%DATADIR%%/hconsole/hconsole.py
		83	%%DATADIR%%/tos.img
82	share/icons/hicolor/128x128/apps/hatari.png	84	share/icons/hicolor/128x128/apps/hatari.png
83	share/icons/hicolor/128x128/mimetypes/application-vnd.fastcopy-disk-image.png	85	share/icons/hicolor/128x128/mimetypes/application-vnd.fastcopy-disk-image.png
84	share/icons/hicolor/128x128/mimetypes/application-vnd.msa-disk-image.png	86	share/icons/hicolor/128x128/mimetypes/application-vnd.msa-disk-image.png
Lines 109-112 share/icons/hicolor/scalable/mimetypes/application-vnd.fastcopy-disk-image.svg Link Here
109	share/icons/hicolor/scalable/mimetypes/application-vnd.msa-disk-image.svg	111	share/icons/hicolor/scalable/mimetypes/application-vnd.msa-disk-image.svg
110	share/icons/hicolor/scalable/mimetypes/application-x-st-disk-image.svg	112	share/icons/hicolor/scalable/mimetypes/application-x-st-disk-image.svg
111	share/icons/hicolor/scalable/mimetypes/application-x-stx-disk-image.svg	113	share/icons/hicolor/scalable/mimetypes/application-x-stx-disk-image.svg
		114	share/man/man1/atari-convert-dir.1.gz
		115	share/man/man1/atari-hd-image.1.gz
		116	share/man/man1/gst2ascii.1.gz
		117	share/man/man1/hatari-prg-args.1.gz
		118	share/man/man1/hatari.1.gz
		119	share/man/man1/hatari_profile.1.gz
		120	share/man/man1/hatariui.1.gz
		121	share/man/man1/hconsole.1.gz
		122	share/man/man1/hmsa.1.gz
		123	share/man/man1/zip2st.1.gz
112	share/mime/packages/hatari.xml	124	share/mime/packages/hatari.xml