FreeBSD Bugzilla – Attachment 250257 Details for
Bug 278590
emulators/hatari: Update to 2.5.0
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
0001-emulators-hatari-Update-to-2.5.0.patch remove ENABLE_SDL2
0001-emulators-hatari-Update-to-2.5.0.patch (text/plain), 11.49 KB, created by
Laurent Chardon
on 2024-04-27 11:06:46 UTC
(
hide
)
Description:
0001-emulators-hatari-Update-to-2.5.0.patch remove ENABLE_SDL2
Filename:
MIME Type:
Creator:
Laurent Chardon
Created:
2024-04-27 11:06:46 UTC
Size:
11.49 KB
patch
obsolete
>From 0bd79bd2179be2598658a4d6ee9c4f668085e739 Mon Sep 17 00:00:00 2001 >From: Laurent Chardon <laurent.chardon@gmail.com> >Date: Fri, 26 Apr 2024 07:09:41 -0400 >Subject: [PATCH] emulators/hatari: Update to 2.5.0 > >Changes: > - Update 2.3.1 to 2.5.0 > Changelog http://www.hatari.tuxfamily.org/news.html > - Remove sld1 option because not supported by hatari > - Add test target > - Add submitter as maintainer > >QA: > - portlint: OK > - poudriere: OK >--- > emulators/hatari/Makefile | 25 ++++---- > emulators/hatari/distinfo | 6 +- > emulators/hatari/files/patch-CMakeLists.txt | 16 ----- > .../hatari/files/patch-share_CMakeLists.txt | 16 +++-- > .../files/patch-tools_atari-hd-image.sh | 14 ++--- > emulators/hatari/pkg-plist | 60 +++++++++---------- > 6 files changed, 57 insertions(+), 80 deletions(-) > delete mode 100644 emulators/hatari/files/patch-CMakeLists.txt > >diff --git a/emulators/hatari/Makefile b/emulators/hatari/Makefile >index 5be9728b9c28..74335e150ba7 100644 >--- a/emulators/hatari/Makefile >+++ b/emulators/hatari/Makefile >@@ -1,25 +1,27 @@ > PORTNAME= hatari >-PORTVERSION= 2.3.1 >-PORTREVISION= 3 >+PORTVERSION= 2.5.0 >+#PORTREVISION= none > CATEGORIES= emulators > MASTER_SITES= http://download.tuxfamily.org/hatari/${PORTVERSION}/ > >-MAINTAINER= ports@FreeBSD.org >+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 >+BROKEN_armv6= fails to configure: CMake Error: Generator: execution of make failed > > LIB_DEPENDS= libportaudio.so:audio/portaudio \ >- libpng.so:graphics/png >+ libpng.so:graphics/png \ >+ libudev.so:devel/libudev-devd > > USES= cmake desktop-file-utils gnome python readline \ >- sdl shared-mime-info shebangfix tar:bzip2 xorg >+ sdl shared-mime-info shebangfix tar:bzip2 xorg iconv > USE_GNOME= gtk30 > USE_XORG= sm ice x11 xext >+USE_SDL= sdl2 > > SHEBANG_FILES= python-ui/*.py tools/*.py \ > tools/debugger/*.py tools/hconsole/*.py >@@ -27,16 +29,11 @@ SHEBANG_FILES= python-ui/*.py tools/*.py \ > CMAKE_ARGS= -DETCDIR:PATH="${PREFIX}/etc" \ > -DREADLINE_FOUND:BOOL=ON > >-# -DMANDIR:PATH="share/man/man1" >-OPTIONS_DEFINE= DEBUG DOCS SDL2 WINUAE >+TEST_TARGET= test >+ >+OPTIONS_DEFINE= DEBUG DOCS WINUAE > > DEBUG_CFLAGS_OFF= -DNDEBUG >-SDL2_DESC= Use SDL2 libraries instead of SDL 1.2 >-SDL2_USES= iconv >-SDL2_USE= sdl=sdl2 >-SDL2_USE_OFF= sdl=sdl >-SDL2_CMAKE_BOOL= ENABLE_SDL2 >-SDL2_CFLAGS= -I${ICONV_INCLUDE_PATH} > WINUAE_DESC= Build with WinUAE CPU core > WINUAE_CMAKE_BOOL= ENABLE_WINUAE_CPU > >diff --git a/emulators/hatari/distinfo b/emulators/hatari/distinfo >index 535bcf7864db..5a3cac4e6c7d 100644 >--- a/emulators/hatari/distinfo >+++ b/emulators/hatari/distinfo >@@ -1,3 +1,3 @@ >-TIMESTAMP = 1645876638 >-SHA256 (hatari-2.3.1.tar.bz2) = 44a2f62ca995e38d9e0874806956f0b9c3cc84ea89e0169a63849b63cd3b64bd >-SIZE (hatari-2.3.1.tar.bz2) = 4334129 >+TIMESTAMP = 1714071173 >+SHA256 (hatari-2.5.0.tar.bz2) = d76c22fc3de69fb1bb4af3e8ba500b7e40f5a2a45d07783f24cb7101e53c3457 >+SIZE (hatari-2.5.0.tar.bz2) = 2820580 >diff --git a/emulators/hatari/files/patch-CMakeLists.txt b/emulators/hatari/files/patch-CMakeLists.txt >deleted file mode 100644 >index d7d7c63a51cb..000000000000 >--- a/emulators/hatari/files/patch-CMakeLists.txt >+++ /dev/null >@@ -1,16 +0,0 @@ >---- 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) >diff --git a/emulators/hatari/files/patch-share_CMakeLists.txt b/emulators/hatari/files/patch-share_CMakeLists.txt >index 5a8031d36044..a8294702cd55 100644 >--- a/emulators/hatari/files/patch-share_CMakeLists.txt >+++ b/emulators/hatari/files/patch-share_CMakeLists.txt >@@ -1,25 +1,23 @@ >---- share/CMakeLists.txt.orig 2018-02-07 18:33:55 UTC >+--- share/CMakeLists.txt.orig 2024-04-26 10:53:02 UTC > +++ share/CMakeLists.txt >-@@ -5,9 +5,8 @@ foreach(size 32x32 48x48 64x64 128x128 2 >- install(FILES icons/hicolor/${size}/mimetypes/application-x-st-disk-image.png >+@@ -6,8 +6,8 @@ foreach(size 32x32 48x48 64x64 128x128 256x256) > DESTINATION ${ICONDIR}/${size}/mimetypes) > foreach(type vnd.msa vnd.fastcopy x-stx) >-- install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink >+ 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) >-+ install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink application-x-st-disk-image.png 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() >-@@ -17,9 +16,8 @@ install(FILES icons/hicolor/scalable/app >- install(FILES icons/hicolor/scalable/mimetypes/application-x-st-disk-image.svg >+@@ -18,8 +18,8 @@ foreach(type vnd.msa vnd.fastcopy x-stx) > DESTINATION ${ICONDIR}/scalable/mimetypes) > foreach(type vnd.msa vnd.fastcopy x-stx) >-- install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink >+ 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) >-+ install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink application-x-st-disk-image.svg 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() >diff --git a/emulators/hatari/files/patch-tools_atari-hd-image.sh b/emulators/hatari/files/patch-tools_atari-hd-image.sh >index 0d26d83f5fb3..9b92f43e239b 100644 >--- a/emulators/hatari/files/patch-tools_atari-hd-image.sh >+++ b/emulators/hatari/files/patch-tools_atari-hd-image.sh >@@ -1,13 +1,13 @@ >---- tools/atari-hd-image.sh.orig 2022-02-26 12:11:11 UTC >+--- tools/atari-hd-image.sh.orig 2024-04-26 10:23:56 UTC > +++ tools/atari-hd-image.sh >-@@ -33,8 +33,8 @@ PATH=/sbin:$PATH >+@@ -33,8 +33,8 @@ export PATH > export PATH > > # check tools >--if [ -z "$(which mkdosfs)" ] || [ -z "$(which python)" ]; then >-- echo "ERROR: either mkdosfs or python tool missing!" >+-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%% tool missing!" >++ echo "ERROR: either mkdosfs or %%PYTHON_VERSION%% missing!" > exit 1 > fi > >@@ -15,10 +15,10 @@ > # - http://en.wikipedia.org/wiki/File_Allocation_Table#Boot_Sector > # For DOS MBR, the values are little endian. > # ----------- >--python << EOF >+-python3 << EOF > -#!/usr/bin/env python3 > +%%PYTHON_VERSION%% << EOF >-+#!/usr/bin/env %%PYTHON_VERSION%%3 >++#!/usr/bin/env %%PYTHON_VERSION%% > mbr = bytearray(512) > > def set_long(idx, value): >diff --git a/emulators/hatari/pkg-plist b/emulators/hatari/pkg-plist >index 03175af65fc3..a361b67e67d3 100644 >--- a/emulators/hatari/pkg-plist >+++ b/emulators/hatari/pkg-plist >@@ -4,40 +4,9 @@ bin/gst2ascii > bin/hatari > bin/hatari-prg-args > 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 >-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%%/authors.txt > %%PORTDOCS%%%%DOCSDIR%%/bugs.txt >@@ -46,6 +15,8 @@ share/applications/hatariui.desktop > %%PORTDOCS%%%%DOCSDIR%%/compatibility.html > %%PORTDOCS%%%%DOCSDIR%%/debugger.html > %%PORTDOCS%%%%DOCSDIR%%/emutos.txt >+%%PORTDOCS%%%%DOCSDIR%%/hatari-ui.html >+%%PORTDOCS%%%%DOCSDIR%%/hconsole/%%CMAKE_BUILD_TYPE%%-notes.txt > %%PORTDOCS%%%%DOCSDIR%%/images/callgraph.png > %%PORTDOCS%%%%DOCSDIR%%/images/callgraph.svg > %%PORTDOCS%%%%DOCSDIR%%/images/cpu.png >@@ -54,6 +25,17 @@ share/applications/hatariui.desktop > %%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 >@@ -79,6 +61,12 @@ share/applications/hatariui.desktop > %%PORTDOCS%%%%DOCSDIR%%/toc.js > %%PORTDOCS%%%%DOCSDIR%%/todo.txt > %%PORTDOCS%%%%DOCSDIR%%/video-recording.txt >+%%DATADIR%%/hatari-icon.bmp >+%%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 >@@ -109,4 +97,14 @@ share/icons/hicolor/scalable/mimetypes/application-vnd.fastcopy-disk-image.svg > 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 >-- >2.43.2 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 278590
:
250238
|
250257
|
250291
|
250319
|
250320
|
250323