aboutsummaryrefslogtreecommitdiff
path: root/emulators/openmsx
diff options
context:
space:
mode:
Diffstat (limited to 'emulators/openmsx')
-rw-r--r--emulators/openmsx/Makefile9
-rw-r--r--emulators/openmsx/distinfo6
-rw-r--r--emulators/openmsx/files/patch-src_sound_BlipBuffer.cc11
-rw-r--r--emulators/openmsx/pkg-plist32
4 files changed, 39 insertions, 19 deletions
diff --git a/emulators/openmsx/Makefile b/emulators/openmsx/Makefile
index 207d7503499e..5afcb44cf4e7 100644
--- a/emulators/openmsx/Makefile
+++ b/emulators/openmsx/Makefile
@@ -1,7 +1,7 @@
PORTNAME= openmsx
-DISTVERSION= 19.1
+DISTVERSION= 20.0
CATEGORIES= emulators
-MASTER_SITES= https://github.com/openMSX/openMSX/releases/download/RELEASE_19_1/
+MASTER_SITES= https://github.com/openMSX/openMSX/releases/download/RELEASE_20_0/
MAINTAINER= dmenelkir@gmail.com
COMMENT= Open source MSX emulator
@@ -18,12 +18,13 @@ LIB_DEPENDS= libao.so:audio/libao \
libtheora.so:multimedia/libtheora \
libvorbis.so:audio/libvorbis
-USES= gl gmake pkgconfig python sdl tcl
-USE_GCC= yes
+USES= compiler:c++20-lang gl gmake pkgconfig python sdl tcl
USE_GL= gl glew
USE_SDL= sdl2 ttf2
+CXXFLAGS+= -I/usr/include/c++/v1 -std=c++20
+
MAKEFILE= GNUmakefile
MAKE_ARGS= CXXFLAGS="${CXXFLAGS}" \
INSTALL_BINARY_DIR=${PREFIX}/bin \
diff --git a/emulators/openmsx/distinfo b/emulators/openmsx/distinfo
index 573625887d0f..f05561638370 100644
--- a/emulators/openmsx/distinfo
+++ b/emulators/openmsx/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1724517832
-SHA256 (openmsx-19.1.tar.gz) = 979b1322215095d82d5ea4a455c5e089fcbc4916c0725d6362a15b7022c0e249
-SIZE (openmsx-19.1.tar.gz) = 4216833
+TIMESTAMP = 1757074825
+SHA256 (openmsx-20.0.tar.gz) = 4c645e5a063e00919fa04720d39f62fb8dcb6321276637b16b5788dea5cd1ebf
+SIZE (openmsx-20.0.tar.gz) = 5947913
diff --git a/emulators/openmsx/files/patch-src_sound_BlipBuffer.cc b/emulators/openmsx/files/patch-src_sound_BlipBuffer.cc
new file mode 100644
index 000000000000..5abe500f3751
--- /dev/null
+++ b/emulators/openmsx/files/patch-src_sound_BlipBuffer.cc
@@ -0,0 +1,11 @@
+--- src/sound/BlipBuffer.cc.orig 2025-09-10 16:08:17 UTC
++++ src/sound/BlipBuffer.cc
+@@ -19,7 +19,7 @@ static constexpr int BLIP_RES = 1 << BlipBuffer::BLIP_
+
+
+ // Precalculated impulse table.
+-static constexpr auto impulses = [] {
++static const auto impulses = [] {
+ constexpr int HALF_SIZE = BLIP_RES / 2 * (BLIP_IMPULSE_WIDTH - 1);
+ std::array<double, BLIP_RES + HALF_SIZE + BLIP_RES> fImpulse = {};
+ std::span<double, HALF_SIZE> out = subspan<HALF_SIZE>(fImpulse, BLIP_RES);
diff --git a/emulators/openmsx/pkg-plist b/emulators/openmsx/pkg-plist
index 8888c3bed417..7674894c24eb 100644
--- a/emulators/openmsx/pkg-plist
+++ b/emulators/openmsx/pkg-plist
@@ -4,22 +4,28 @@ bin/openmsx
%%PORTDOCS%%%%DOCSDIR%%/cbios.txt
%%PORTDOCS%%%%DOCSDIR%%/manual/commands.html
%%PORTDOCS%%%%DOCSDIR%%/manual/compile.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/debugger-layout.png
%%PORTDOCS%%%%DOCSDIR%%/manual/diskmanipulator.html
%%PORTDOCS%%%%DOCSDIR%%/manual/faq.html
%%PORTDOCS%%%%DOCSDIR%%/manual/index.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/main_menu_bar.png
%%PORTDOCS%%%%DOCSDIR%%/manual/manual-minty.css
%%PORTDOCS%%%%DOCSDIR%%/manual/manual-purple.css
%%PORTDOCS%%%%DOCSDIR%%/manual/manual.css
%%PORTDOCS%%%%DOCSDIR%%/manual/nocartfound.png
%%PORTDOCS%%%%DOCSDIR%%/manual/openmsx-control.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/osd_icons.png
%%PORTDOCS%%%%DOCSDIR%%/manual/setup.html
%%PORTDOCS%%%%DOCSDIR%%/manual/user.html
%%PORTDOCS%%%%DOCSDIR%%/release-history.txt
%%PORTDOCS%%%%DOCSDIR%%/release-notes.txt
+%%PORTDOCS%%%%DOCSDIR%%/manual/reverse_bar.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/status_bar.png
%%DATADIR%%/extensions/2nd_PSG.xml
%%DATADIR%%/extensions/ASCII_Japanese_MSX-Write.xml
%%DATADIR%%/extensions/ASCII_Japanese_MSX-Write_II.xml
%%DATADIR%%/extensions/ASCII_MSX-DOS2.xml
+%%DATADIR%%/extensions/ASCII16-X_Mapper_XL.xml
%%DATADIR%%/extensions/AVT_DPF-550.xml
%%DATADIR%%/extensions/Beer_IDE.xml
%%DATADIR%%/extensions/Boosted_audio.xml
@@ -54,8 +60,10 @@ bin/openmsx
%%DATADIR%%/extensions/Microsol_CDX-2.xml
%%DATADIR%%/extensions/Mitsubishi_ML-30DC_ML-30FD.xml
%%DATADIR%%/extensions/Musical_Memory_Mapper.xml
+%%DATADIR%%/extensions/National_CF-SM003.xml
%%DATADIR%%/extensions/Neos_MA-20R.xml
%%DATADIR%%/extensions/Neos_MA-20V.xml
+%%DATADIR%%/extensions/OPL3Cartridge_Moonsound_compatible.xml
%%DATADIR%%/extensions/OPL3Cartridge.xml
%%DATADIR%%/extensions/OPL3Cartridge2_mono.xml
%%DATADIR%%/extensions/OPL3Cartridge2_stereo.xml
@@ -65,6 +73,7 @@ bin/openmsx
%%DATADIR%%/extensions/Password_Cartridge.xml
%%DATADIR%%/extensions/Philips_NMS_1200.xml
%%DATADIR%%/extensions/Philips_NMS_1205.xml
+%%DATADIR%%/extensions/Philips_VU_0040.xml
%%DATADIR%%/extensions/Philips_VY_0010.xml
%%DATADIR%%/extensions/Popolon_Sound_Cartridge.xml
%%DATADIR%%/extensions/README
@@ -158,6 +167,7 @@ bin/openmsx
%%DATADIR%%/machines/CIEL_Expert-Turbo.xml
%%DATADIR%%/machines/Canon_V-10.xml
%%DATADIR%%/machines/Canon_V-20.xml
+%%DATADIR%%/machines/Canon_V-20_FR.xml
%%DATADIR%%/machines/Canon_V-20_JP.xml
%%DATADIR%%/machines/Canon_V-25.xml
%%DATADIR%%/machines/Canon_V-30F.xml
@@ -182,6 +192,7 @@ bin/openmsx
%%DATADIR%%/machines/Frael_Bruc_100_1.xml
%%DATADIR%%/machines/Frael_Bruc_100_2.xml
%%DATADIR%%/machines/Fujitsu_FM-X.xml
+%%DATADIR%%/machines/General_Paxon_PCT-55.xml
%%DATADIR%%/machines/Goldstar_FC-200.xml
%%DATADIR%%/machines/Goldstar_FC-80U.xml
%%DATADIR%%/machines/Gradiente_Expert_DD_Plus.xml
@@ -190,8 +201,10 @@ bin/openmsx
%%DATADIR%%/machines/Gradiente_Expert_XP-800.xml
%%DATADIR%%/machines/Hitachi_MB-H1.xml
%%DATADIR%%/machines/Hitachi_MB-H2.xml
+%%DATADIR%%/machines/Hitachi_MB-H21.xml
%%DATADIR%%/machines/Hitachi_MB-H3.xml
%%DATADIR%%/machines/Hitachi_MB-H50.xml
+%%DATADIR%%/machines/Hitachi_MB-H70.xml
%%DATADIR%%/machines/JVC_HC-7GB.xml
%%DATADIR%%/machines/Mitsubishi_ML-8000.xml
%%DATADIR%%/machines/Mitsubishi_ML-F110.xml
@@ -268,6 +281,7 @@ bin/openmsx
%%DATADIR%%/machines/Sanyo_PHC-30N.xml
%%DATADIR%%/machines/Sanyo_PHC-33.xml
%%DATADIR%%/machines/Sanyo_PHC-35J.xml
+%%DATADIR%%/machines/Sanyo_MPC-64.xml
%%DATADIR%%/machines/Sanyo_PHC-70FD.xml
%%DATADIR%%/machines/Sanyo_PHC-70FD2.xml
%%DATADIR%%/machines/Sanyo_PHC-77.xml
@@ -311,6 +325,7 @@ bin/openmsx
%%DATADIR%%/machines/Sony_HB-G900AP.xml
%%DATADIR%%/machines/Sony_HB-G900D.xml
%%DATADIR%%/machines/Sony_HB-G900P.xml
+%%DATADIR%%/machines/Sony_HB-T600.xml
%%DATADIR%%/machines/Spectravideo_SVI-318.xml
%%DATADIR%%/machines/Spectravideo_SVI-328.xml
%%DATADIR%%/machines/Spectravideo_SVI-328_superexpanded.xml
@@ -318,6 +333,7 @@ bin/openmsx
%%DATADIR%%/machines/Spectravideo_SVI-728_ES.xml
%%DATADIR%%/machines/Spectravideo_SVI-728_SE.xml
%%DATADIR%%/machines/Spectravideo_SVI-738.xml
+%%DATADIR%%/machines/Spectravideo_SVI-738_DE.xml
%%DATADIR%%/machines/Spectravideo_SVI-738_PL.xml
%%DATADIR%%/machines/Spectravideo_SVI-738_SE.xml
%%DATADIR%%/machines/Talent_DPC-200.xml
@@ -350,6 +366,7 @@ bin/openmsx
%%DATADIR%%/machines/Yamaha_CX5M.xml
%%DATADIR%%/machines/Yamaha_CX5MII-128.xml
%%DATADIR%%/machines/Yamaha_CX5MII.xml
+%%DATADIR%%/machines/Yamaha_CX5MU.xml
%%DATADIR%%/machines/Yamaha_CX7-128.xml
%%DATADIR%%/machines/Yamaha_CX7M-128.xml
%%DATADIR%%/machines/Yamaha_SX-100.xml
@@ -361,6 +378,7 @@ bin/openmsx
%%DATADIR%%/machines/Yamaha_YIS-604-128.xml
%%DATADIR%%/machines/Yamaha_YIS-805-128R2.xml
%%DATADIR%%/machines/Yashica_YC-64.xml
+%%DATADIR%%/machines/Yeno_DPC-64.xml
%%DATADIR%%/machines/acid-tests/Acid2Test_basic-bios2p.lpt.ips
%%DATADIR%%/machines/acid-tests/Acid2Test_basic-bios2p.ppi.ips
%%DATADIR%%/machines/acid-tests/Acid2Test_basic-bios2p.psg.ips
@@ -421,13 +439,11 @@ bin/openmsx
%%DATADIR%%/scripts/_multi_screenshot.tcl
%%DATADIR%%/scripts/_music_keyboard.tcl
%%DATADIR%%/scripts/_osd.tcl
-%%DATADIR%%/scripts/_osd_keyboard.tcl
%%DATADIR%%/scripts/_osd_menu.tcl
%%DATADIR%%/scripts/_osd_nemesis.tcl
%%DATADIR%%/scripts/_osd_widgets.tcl
%%DATADIR%%/scripts/_psg_log.tcl
%%DATADIR%%/scripts/_psg_profile.tcl
-%%DATADIR%%/scripts/_quitmenu.tcl
%%DATADIR%%/scripts/_raster_view.tcl
%%DATADIR%%/scripts/_record_channels.tcl
%%DATADIR%%/scripts/_record_chunks.tcl
@@ -442,12 +458,10 @@ bin/openmsx
%%DATADIR%%/scripts/_slot.tcl
%%DATADIR%%/scripts/_soundchip_utils.tcl
%%DATADIR%%/scripts/_soundlog.tcl
-%%DATADIR%%/scripts/_sprites.tcl
%%DATADIR%%/scripts/_stack.tcl
%%DATADIR%%/scripts/_tas_tools.tcl
%%DATADIR%%/scripts/_test_machines_and_extensions.tcl
%%DATADIR%%/scripts/_text_echo.tcl
-%%DATADIR%%/scripts/_tileviewer.tcl
%%DATADIR%%/scripts/_toggle_freq.tcl
%%DATADIR%%/scripts/_trainer.tcl
%%DATADIR%%/scripts/_trainerdefs.tcl
@@ -460,15 +474,12 @@ bin/openmsx
%%DATADIR%%/scripts/_vdrive.tcl
%%DATADIR%%/scripts/_vgmrecorder.tcl
%%DATADIR%%/scripts/_vu-meters.tcl
-%%DATADIR%%/scripts/_widgets.tcl
%%DATADIR%%/scripts/autoplug.tcl
%%DATADIR%%/scripts/callbackprocs.tcl
%%DATADIR%%/scripts/cashandler.tcl
%%DATADIR%%/scripts/create_user_dirs.tcl
-%%DATADIR%%/scripts/frame_rate_pusher.tcl
%%DATADIR%%/scripts/keybindings.tcl
%%DATADIR%%/scripts/lazy.tcl
-%%DATADIR%%/scripts/load_icons.tcl
%%DATADIR%%/scripts/mode.tcl
%%DATADIR%%/scripts/monitor.tcl
%%DATADIR%%/scripts/osd_menu.tcl
@@ -477,7 +488,6 @@ bin/openmsx
%%DATADIR%%/scripts/screenshot.tcl
%%DATADIR%%/scripts/session_management.tcl
%%DATADIR%%/scripts/shield.png
-%%DATADIR%%/scripts/tabbed_machine_view.tcl
%%DATADIR%%/scripts/type.tcl
%%DATADIR%%/settings.xml
%%DATADIR%%/shaders/HQ2xLiteOffsets.dat
@@ -501,8 +511,6 @@ bin/openmsx
%%DATADIR%%/shaders/monitor3D.vert
%%DATADIR%%/shaders/rgb.frag
%%DATADIR%%/shaders/rgb.vert
-%%DATADIR%%/shaders/sai.frag
-%%DATADIR%%/shaders/sai.vert
%%DATADIR%%/shaders/scale2x.frag
%%DATADIR%%/shaders/scale2x.vert
%%DATADIR%%/shaders/simple.frag
@@ -520,8 +528,8 @@ bin/openmsx
%%DATADIR%%/skins/ConsoleBackground6.png
%%DATADIR%%/skins/ConsoleBackgroundBlue.png
%%DATADIR%%/skins/ConsoleBackgroundGrey.png
-%%DATADIR%%/skins/Vera.ttf.gz
-%%DATADIR%%/skins/VeraMono.ttf.gz
+%%DATADIR%%/skins/DejaVuSans.ttf.gz
+%%DATADIR%%/skins/DejaVuSansMono.ttf.gz
%%DATADIR%%/skins/breaked.png
%%DATADIR%%/skins/fancy/frame.png
%%DATADIR%%/skins/fancy/led-off.png