diff --git a/app-emulation/zesarux/patches/zesarux-9.2.patchset b/app-emulation/zesarux/patches/zesarux-10.1.patchset similarity index 70% rename from app-emulation/zesarux/patches/zesarux-9.2.patchset rename to app-emulation/zesarux/patches/zesarux-10.1.patchset index facae97d4..44751ede6 100644 --- a/app-emulation/zesarux/patches/zesarux-9.2.patchset +++ b/app-emulation/zesarux/patches/zesarux-10.1.patchset @@ -1,27 +1,27 @@ -From 341ce1b8721392081848b08594ab1408915ea3cf Mon Sep 17 00:00:00 2001 +From 06ab6ce44d1248abc7b30394d89cfebbb9be0600 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Mon, 6 Sep 2021 21:58:38 +1000 +Date: Sat, 14 May 2022 21:40:16 +1000 Subject: Fixes for Haiku diff --git a/src/configure b/src/configure -index 924d161..444b9d3 100755 +index fc9e4a0..e6b4f59 100755 --- a/src/configure +++ b/src/configure -@@ -1643,7 +1643,7 @@ clean: - rm -f ZEsarUX-\$(EMULATOR_VERSION)-windows.zip - rm -f ZEsarUX-\$(EMULATOR_VERSION)-extras.zip +@@ -1691,7 +1691,7 @@ clean: + rm -f ZEsarUX_windows-\$(EMULATOR_VERSION).zip + rm -f ZEsarUX_extras-\$(EMULATOR_VERSION).zip --COMMONFILES=ACKNOWLEDGEMENTS LICENSE LICENSES_info licenses Changelog TODO* README HISTORY FEATURES EXCLUSIVEFEATURES INSTALL INSTALLWINDOWS ALTERNATEROMS INCLUDEDTAPES DONATE FAQ *.odt mantransfev3.bin *.rom zxuno.flash tbblue.mmc speech_filters my_soft zesarux.mp3 zesarux.xcf editionnamegame.tap editionnamegame.tap.config bin_sprite_to_c.sh keyboard_*.bmp salamanquesa.bmp -+COMMONFILES=ACKNOWLEDGEMENTS LICENSE LICENSES_info licenses Changelog TODO* README HISTORY FEATURES EXCLUSIVEFEATURES INSTALL INSTALLWINDOWS ALTERNATEROMS INCLUDEDTAPES DONATE FAQ *.odt mantransfev3.bin *.rom zxuno.flash tbblue.mmc speech_filters my_soft zesarux.mp3 zesarux.xcf editionnamegame.tap editionnamegame.tap.config bin_sprite_to_c.sh keyboard_*.bmp salamanquesa.bmp cursor.bmp +-COMMONFILES=ACKNOWLEDGEMENTS LICENSE LICENSES_info licenses Changelog TODO* README HISTORY FEATURES FEATURES_es EXCLUSIVEFEATURES INSTALL INSTALLWINDOWS ALTERNATEROMS INCLUDEDTAPES DONATE FAQ *.odt mantransfev3.bin *.rom zxuno.flash tbblue.mmc speech_filters my_soft docs zesarux.mp3 zesarux.xcf editionnamegame.* bin_sprite_to_c.sh keyboard_*.bmp zesarux.pdf ++COMMONFILES=ACKNOWLEDGEMENTS LICENSE LICENSES_info licenses Changelog TODO* README HISTORY FEATURES FEATURES_es EXCLUSIVEFEATURES INSTALL INSTALLWINDOWS ALTERNATEROMS INCLUDEDTAPES DONATE FAQ *.odt mantransfev3.bin *.rom zxuno.flash tbblue.mmc speech_filters my_soft docs zesarux.mp3 zesarux.xcf editionnamegame.* bin_sprite_to_c.sh keyboard_*.bmp cursor.bmp zesarux.pdf ONLYSOURCEFILES=macos *.c *.m *.h *.tpl DEVELOPMENT CHECKLIST configure generate_install_sh.sh join_tzx.sh testsound.sh txt_to_basic_lines.sh automatic_tests.sh zxuno_roms_bin_a_flash.sh *.asm benchmark_*.txt current_checklist.txt patches prism_change_boot.txt diff --git a/src/cpu.c b/src/cpu.c -index 2ab0c4b..b2a0ae6 100644 +index 7f20066..9f1b6fc 100644 --- a/src/cpu.c +++ b/src/cpu.c -@@ -261,8 +261,13 @@ driver_struct audio_driver_array[MAX_SCR_INIT]; +@@ -272,8 +272,13 @@ driver_struct audio_driver_array[MAX_SCR_INIT]; int num_audio_driver_array=0; //Los inicializamos a cadena vacia... No poner NULL, dado que hay varios strcmp que se comparan contra esto @@ -35,18 +35,11 @@ index 2ab0c4b..b2a0ae6 100644 //porcentaje de velocidad de la cpu -@@ -9047,4 +9052,4 @@ void end_emulator_saveornot_config(int saveconfig) - void end_emulator(void) - { - end_emulator_saveornot_config(1); --} -\ No newline at end of file -+} diff --git a/src/cpu.h b/src/cpu.h -index a41f5aa..e123893 100644 +index e81d144..b40fa83 100644 --- a/src/cpu.h +++ b/src/cpu.h -@@ -183,7 +183,7 @@ extern z80_bit core_end_frame_check_zrcp_zeng_snap; +@@ -187,7 +187,7 @@ extern z80_int get_im2_interrupt_vector(void); //Para haiku @@ -73,18 +66,18 @@ literal 0 HcmV?d00001 diff --git a/src/generate_install_sh.sh b/src/generate_install_sh.sh -index 4483009..54662b9 100755 +index 6270201..a1fb15b 100755 --- a/src/generate_install_sh.sh +++ b/src/generate_install_sh.sh -@@ -13,7 +13,7 @@ mkdir -p $INSTALLPREFIX +@@ -14,7 +14,7 @@ mkdir -p $INSTALLPREFIX mkdir -p $INSTALLPREFIX/bin mkdir -p $INSTALLPREFIX/share/zesarux/ --COMMONFILES="ACKNOWLEDGEMENTS LICENSE LICENSES_info licenses Changelog TODO* README HISTORY FEATURES EXCLUSIVEFEATURES INSTALL INSTALLWINDOWS ALTERNATEROMS INCLUDEDTAPES DONATE FAQ *.odt mantransfev3.bin *.rom zxuno.flash tbblue.mmc speech_filters my_soft zesarux.mp3 zesarux.xcf editionnamegame.tap editionnamegame.tap.config bin_sprite_to_c.sh keyboard_*.bmp salamanquesa.bmp" -+COMMONFILES="ACKNOWLEDGEMENTS LICENSE LICENSES_info licenses Changelog TODO* README HISTORY FEATURES EXCLUSIVEFEATURES INSTALL INSTALLWINDOWS ALTERNATEROMS INCLUDEDTAPES DONATE FAQ *.odt mantransfev3.bin *.rom zxuno.flash tbblue.mmc speech_filters my_soft zesarux.mp3 zesarux.xcf editionnamegame.tap editionnamegame.tap.config bin_sprite_to_c.sh keyboard_*.bmp salamanquesa.bmp cursor.bmp" +-COMMONFILES="ACKNOWLEDGEMENTS LICENSE LICENSES_info licenses Changelog TODO* README HISTORY FEATURES FEATURES_es EXCLUSIVEFEATURES INSTALL INSTALLWINDOWS ALTERNATEROMS INCLUDEDTAPES DONATE FAQ *.odt mantransfev3.bin *.rom zxuno.flash tbblue.mmc speech_filters my_soft docs zesarux.mp3 zesarux.xcf $EDITION_NAME_GAME $EDITION_NAME_GAME.config bin_sprite_to_c.sh keyboard_*.bmp zesarux.pdf" ++COMMONFILES="ACKNOWLEDGEMENTS LICENSE LICENSES_info licenses Changelog TODO* README HISTORY FEATURES FEATURES_es EXCLUSIVEFEATURES INSTALL INSTALLWINDOWS ALTERNATEROMS INCLUDEDTAPES DONATE FAQ *.odt mantransfev3.bin *.rom zxuno.flash tbblue.mmc speech_filters my_soft docs zesarux.mp3 zesarux.xcf $EDITION_NAME_GAME $EDITION_NAME_GAME.config bin_sprite_to_c.sh keyboard_*.bmp cursor.bmp zesarux.pdf" - - cp -a \$COMMONFILES $INSTALLPREFIX/share/zesarux/ + # -f to force overwrite already existing share files which are set to 444 + cp -f -a \$COMMONFILES $INSTALLPREFIX/share/zesarux/ diff --git a/src/m68kcpu.h b/src/m68kcpu.h index 4a6e9a7..70d92a9 100644 --- a/src/m68kcpu.h @@ -98,27 +91,11 @@ index 4a6e9a7..70d92a9 100644 typedef unsigned int uint; #else -diff --git a/src/menu.c b/src/menu.c -index b98a0e0..df86709 100644 ---- a/src/menu.c -+++ b/src/menu.c -@@ -1438,7 +1438,11 @@ void menu_chdir_sharedfiles(void) - zvfs_chdir("../Resources"); - - char installshare[PATH_MAX]; -+#ifdef __HAIKU__ -+ sprintf (installshare,"%s/%s",INSTALL_PREFIX,"/data/"); -+#else - sprintf (installshare,"%s/%s",INSTALL_PREFIX,"/share/zesarux/"); -+#endif - debug_printf(VERBOSE_INFO,"Trying %s",installshare); - zvfs_chdir(installshare); - diff --git a/src/scrsdl2.c b/src/scrsdl2.c -index 172bab5..c53b981 100644 +index 020f950..4de4a7b 100644 --- a/src/scrsdl2.c +++ b/src/scrsdl2.c -@@ -65,10 +65,14 @@ int scrsdl_debe_redimensionar=0; +@@ -66,10 +66,14 @@ int scrsdl_debe_redimensionar=0; unsigned char *scrsdl_pixeles; SDL_Texture *scrsdl_texture; @@ -134,7 +111,7 @@ index 172bab5..c53b981 100644 //#define screen_get_window_size_width_zoom_border_en() screen_get_window_size_width_zoom_border_en() #define SDL_ALTO_VENTANA screen_get_window_size_height_zoom_border_en() -@@ -84,7 +88,7 @@ int scrsdl_crea_ventana(void) +@@ -85,7 +89,7 @@ int scrsdl_crea_ventana(void) flags=SDL_WINDOW_RESIZABLE; if (ventana_fullscreen) { @@ -143,7 +120,7 @@ index 172bab5..c53b981 100644 } -@@ -112,6 +116,7 @@ int scrsdl_crea_ventana(void) +@@ -113,6 +117,7 @@ int scrsdl_crea_ventana(void) SDL_SetWindowTitle(window,"ZEsarUX "EMULATOR_VERSION); @@ -151,7 +128,7 @@ index 172bab5..c53b981 100644 scrsdl_texture = SDL_CreateTexture(renderer, SDL_PIXELFORMAT_ARGB8888, SDL_TEXTUREACCESS_STATIC, ancho, SDL_ALTO_VENTANA); //Uint32 *pixels = new Uint32[screen_get_window_size_width_zoom_border_en() * SDL_ALTO_VENTANA]; -@@ -122,7 +127,7 @@ int scrsdl_crea_ventana(void) +@@ -123,7 +128,7 @@ int scrsdl_crea_ventana(void) scr_reallocate_layers_menu(ancho,alto); @@ -160,7 +137,7 @@ index 172bab5..c53b981 100644 modificado_border.v=1; -@@ -130,7 +135,15 @@ int scrsdl_crea_ventana(void) +@@ -131,7 +136,15 @@ int scrsdl_crea_ventana(void) menu_init_footer(); @@ -177,7 +154,7 @@ index 172bab5..c53b981 100644 return 0; -@@ -283,13 +296,39 @@ void scrsdl_refresca_border(void) +@@ -284,13 +297,39 @@ void scrsdl_refresca_border(void) void scrsdl_refresca_pantalla_solo_driver(void) { @@ -218,7 +195,7 @@ index 172bab5..c53b981 100644 SDL_RenderPresent(renderer); } -@@ -1443,23 +1482,11 @@ See the SDL documentation. Scancodes represent the physical position of the keys +@@ -1447,23 +1486,11 @@ See the SDL documentation. Scancodes represent the physical position of the keys } @@ -245,28 +222,28 @@ index 172bab5..c53b981 100644 kempston_mouse_x=mouse_x/zoom_x; kempston_mouse_y=255-mouse_y/zoom_y; -@@ -1471,7 +1498,7 @@ See the SDL documentation. Scancodes represent the physical position of the keys +@@ -1475,7 +1502,7 @@ See the SDL documentation. Scancodes represent the physical position of the keys //mouse button if (event.type==SDL_MOUSEBUTTONDOWN) { - + mouse_timer = SDL_GetTicks(); - debug_printf (VERBOSE_DEBUG,"Mouse Button Press. x=%d y=%d", event.button.x, event.button.y); + debug_printf (VERBOSE_PARANOID,"Mouse Button Press. x=%d y=%d", event.button.x, event.button.y); if ( event.button.button == SDL_BUTTON_LEFT ) { -@@ -1496,6 +1523,7 @@ See the SDL documentation. Scancodes represent the physical position of the keys +@@ -1500,6 +1527,7 @@ See the SDL documentation. Scancodes represent the physical position of the keys } if (event.type==SDL_MOUSEBUTTONUP) { + mouse_timer = SDL_GetTicks(); - debug_printf (VERBOSE_DEBUG,"Mouse Button release. x=%d y=%d", event.button.x, event.button.y); + debug_printf (VERBOSE_PARANOID,"Mouse Button release. x=%d y=%d", event.button.x, event.button.y); if ( event.button.button == SDL_BUTTON_LEFT ) { //mouse_left=0; diff --git a/src/utils.c b/src/utils.c -index 2c04911..d0f5144 100644 +index 6a8d427..25a2d80 100644 --- a/src/utils.c +++ b/src/utils.c -@@ -1197,7 +1197,11 @@ void old_open_sharedfile(char *archivo,FILE **f) +@@ -1187,7 +1187,11 @@ void old_open_sharedfile(char *archivo,FILE **f) //sino, en INSTALLPREFIX/share/zesarux if (!(*f)) { @@ -278,7 +255,7 @@ index 2c04911..d0f5144 100644 debug_printf(VERBOSE_INFO,"Looking for file %s",buffer_nombre); *f=fopen(buffer_nombre,"rb"); } -@@ -1232,7 +1236,11 @@ int find_sharedfile(char *archivo,char *ruta_final) +@@ -1222,7 +1226,11 @@ int find_sharedfile(char *archivo,char *ruta_final) //sino, en INSTALLPREFIX/share/zesarux if (!existe) { @@ -290,7 +267,7 @@ index 2c04911..d0f5144 100644 debug_printf(VERBOSE_INFO,"Looking for file %s",buffer_nombre); existe=si_existe_archivo(buffer_nombre); } -@@ -1303,7 +1311,11 @@ void open_sharedfile_write(char *archivo,FILE **f) +@@ -1293,7 +1301,11 @@ void open_sharedfile_write(char *archivo,FILE **f) //sino, en INSTALLPREFIX/share/zesarux if (!(*f)) { @@ -303,7 +280,7 @@ index 2c04911..d0f5144 100644 open_sharedfile_write_open(buffer_nombre,f); } diff --git a/src/utils.h b/src/utils.h -index b35b224..6c8d6d7 100644 +index 2f51e6e..94e47eb 100644 --- a/src/utils.h +++ b/src/utils.h @@ -22,7 +22,7 @@ @@ -315,9 +292,9 @@ index b35b224..6c8d6d7 100644 #include #endif -@@ -612,7 +612,11 @@ extern void convert_numeros_letras_puerto_teclado_continue(z80_byte tecla,int pr +@@ -624,7 +624,11 @@ extern void convert_numeros_letras_puerto_teclado_continue(z80_byte tecla,int pr - extern int util_tape_tap_get_info(z80_byte *tape,char *texto); + extern int util_tape_tap_get_info(z80_byte *tape,char *texto,int origin_tap); +#ifdef __HAIKU__ +#define DEFAULT_ZESARUX_CONFIG_FILE "config/settings/zesaruxrc" diff --git a/app-emulation/zesarux/zesarux-9.2.recipe b/app-emulation/zesarux/zesarux-10.1.recipe similarity index 91% rename from app-emulation/zesarux/zesarux-9.2.recipe rename to app-emulation/zesarux/zesarux-10.1.recipe index ed37d2e3e..499244fc1 100644 --- a/app-emulation/zesarux/zesarux-9.2.recipe +++ b/app-emulation/zesarux/zesarux-10.1.recipe @@ -29,9 +29,9 @@ HOMEPAGE="https://github.com/chernandezba/zesarux" COPYRIGHT="Cesar Hernandez Bano" LICENSE="GNU GPL v2" REVISION="1" -SOURCE_URI="https://github.com/chernandezba/zesarux/archive/$portVersion.tar.gz" -CHECKSUM_SHA256="75f1e38ab9a462dfcf5bafe84fee3c2a4130416658c438fb1d6272d995e48533" -SOURCE_DIR="zesarux-$portVersion" +SOURCE_URI="https://github.com/chernandezba/zesarux/archive/refs/tags/ZEsarUX-$portVersion.tar.gz" +CHECKSUM_SHA256="445425396ff52d597bc07c395cd0322a4612b4e923863fc6ad6991b0dea764ba" +SOURCE_DIR="zesarux-ZEsarUX-$portVersion" PATCHES="zesarux-$portVersion.patchset" ADDITIONAL_FILES="zesarux.rdef.in"