update to 17.0

this is two major releases ahead of what we had before so the full release notes
can be found on the links below.

https://raw.githubusercontent.com/openMSX/openMSX/RELEASE_16_0/doc/release-notes.txt
https://raw.githubusercontent.com/openMSX/openMSX/RELEASE_17_0/doc/release-notes.txt

cluebat stick, testing on riscv64 and ok provided by jca@
This commit is contained in:
mestre 2021-08-06 08:02:10 +00:00
parent 1f1e683b26
commit 9d1309119b
8 changed files with 90 additions and 71 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.30 2021/02/23 19:39:22 sthen Exp $
# $OpenBSD: Makefile,v 1.31 2021/08/06 08:02:10 mestre Exp $
BROKEN-powerpc =CPUCore.cc:2347: error: insn does not satisfy its constraints
BROKEN-hppa = OOM when building src/cpu/CPUCore.cc
@ -6,7 +6,7 @@ BROKEN-alpha = OOM when building src/cpu/CPUCore.cc
COMMENT = MSX home computer emulator
V = 0.15.0
V = 17.0
DISTNAME = openmsx-$V
CATEGORIES = emulators
@ -17,7 +17,7 @@ PERMIT_PACKAGE = claims GPLv2, but no copyright notices in source files
PERMIT_DISTFILES = claims GPLv2, but no copyright notices in source files
WANTLIB += ${MODTCL_LIB}
WANTLIB += GL GLEW SDL SDL_ttf c freetype m ogg png
WANTLIB += GL GLEW SDL2 SDL2_ttf c freetype m ogg png
WANTLIB += pthread ${COMPILER_LIBCXX} theoradec vorbis z
MASTER_SITES = https://github.com/openMSX/openMSX/releases/download/RELEASE_${V:S/./_/g}/
@ -30,7 +30,8 @@ MAKE_ENV += INSTALL_BASE=${PREFIX}/share/openmsx \
COMPILER = base-clang ports-gcc
LIB_DEPENDS = audio/libvorbis \
devel/sdl-ttf \
devel/sdl2 \
devel/sdl2-ttf \
graphics/glew \
graphics/png \
multimedia/libtheora \
@ -40,7 +41,7 @@ NO_TEST = Yes
MODULES = lang/python \
lang/tcl
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2}
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
MODPY_RUNDEP = No
MAKE_FILE = GNUmakefile

View File

@ -1,2 +1,2 @@
SHA256 (openmsx-0.15.0.tar.gz) = k/IJ2P7S4E5iUmRpu2u0MbgupNB+zcRdqyuMxMoh1io=
SIZE (openmsx-0.15.0.tar.gz) = 3748998
SHA256 (openmsx-17.0.tar.gz) = cOxoWVItjju8lyJ6u5jIclbs2lVbAW0dqFzdmQcs5WQ=
SIZE (openmsx-17.0.tar.gz) = 4045461

View File

@ -1,18 +0,0 @@
$OpenBSD: patch-build_cpu_py,v 1.1 2021/08/01 00:18:05 jca Exp $
Index: build/cpu.py
--- build/cpu.py.orig
+++ build/cpu.py
@@ -88,6 +88,12 @@ class PPC64(CPU):
name = 'ppc64'
bigEndian = True
+class RISCV64(CPU):
+ '''64-bit RISC-V.
+ '''
+ name = 'riscv64'
+ bigEndian = False
+
class S390(CPU):
'''IBM S/390.
'''

View File

@ -1,9 +1,11 @@
$OpenBSD: patch-build_detectsys_py,v 1.6 2021/08/01 00:18:05 jca Exp $
$OpenBSD: patch-build_detectsys_py,v 1.7 2021/08/06 08:02:10 mestre Exp $
https://github.com/openMSX/openMSX/commit/321d1d2f634d10ef72dc71831588540a7c6de59e
Index: build/detectsys.py
--- build/detectsys.py.orig
+++ build/detectsys.py
@@ -48,6 +48,8 @@ def detectCPU():
@@ -53,6 +53,8 @@ def detectCPU():
return 'sheb' if cpu.endswith('eb') else 'sh'
elif cpu == 'avr32':
return 'avr32'

View File

@ -1,17 +1,17 @@
$OpenBSD: patch-build_main_mk,v 1.3 2019/10/20 22:07:03 bentley Exp $
$OpenBSD: patch-build_main_mk,v 1.4 2021/08/06 08:02:10 mestre Exp $
Index: build/main.mk
--- build/main.mk.orig
+++ build/main.mk
@@ -342,7 +342,7 @@ LINK_FLAGS+=$(TARGET_FLAGS)
@@ -334,7 +334,7 @@ LINK_FLAGS+=$(TARGET_FLAGS)
CXX?=g++
WINDRES?=windres
DEPEND_FLAGS:=
-ifneq ($(filter %clang++,$(CXX))$(filter clang++%,$(CXX)),)
+ifneq ($(filter %clang++,$(CXX))$(filter clang++%,$(CXX))$(filter c++,$(CXX)),)
# Enable C++14 (supported since clang-3.5)
COMPILE_FLAGS+=-std=c++14
# Clang does support -Wunused-macros, but it triggers on SDL's headers,
@@ -394,6 +394,8 @@ else
# Enable C++17 (for the most part supported since clang-5)
COMPILE_FLAGS+=-std=c++17 -fconstexpr-steps=2000000
COMPILE_FLAGS+=-Wall -Wextra -Wundef -Wno-invalid-offsetof -Wunused-macros -Wdouble-promotion -Wmissing-declarations -Wshadow -Wold-style-cast -Wzero-as-null-pointer-constant
@@ -361,6 +361,8 @@ else
else
$(warning Unsupported compiler: $(CXX), please update Makefile)
endif

View File

@ -1,33 +0,0 @@
$OpenBSD: patch-src_utils_small_compare_hh,v 1.1 2021/01/15 20:21:51 jasper Exp $
https://github.com/openMSX/openMSX/commit/316828d56ca23529512164ee7892e3346f79b594
Index: src/utils/small_compare.hh
--- src/utils/small_compare.hh.orig
+++ src/utils/small_compare.hh
@@ -70,18 +70,18 @@ template<typename T, T v, T m, T s> struct ScValLeImpl
static const T mask = m;
};
template<typename T, T v, T m, T s, char N0, char ...Ns> struct ScValLeImpl<T, v, m, s, N0, Ns...>
- : ScValLeImpl<T, v + (T(N0 & 255) << s), (m << 8) + 255, s + 8, Ns...> {};
+ : ScValLeImpl<T, v + (T(N0 & 255) << s), m + (T(255) << s), T(s + 8), Ns...> {};
template<typename T, char ...Ns> struct ScValLe : ScValLeImpl<T, 0, 0, 0, Ns...> {};
// ScVal-big-endian
-template<typename T, T v, T m, char ...Ns> struct ScValBeImpl;
-template<typename T, T v, T m> struct ScValBeImpl<T, v, m> {
+template<typename T, T v, T m, T s, char ...Ns> struct ScValBeImpl;
+template<typename T, T v, T m, T s> struct ScValBeImpl<T, v, m, s> {
static const T value = v;
- static const T mask = ~m;
+ static const T mask = m;
};
-template<typename T, T v, T m, char N0, char ...Ns> struct ScValBeImpl<T, v, m, N0, Ns...>
- : ScValBeImpl<T, (v << 8) + T(N0 & 255), (m >> 8), Ns...> {};
-template<typename T, char ...Ns> struct ScValBe : ScValBeImpl<T, 0, -1, Ns...> {};
+template<typename T, T v, T m, T s, char N0, char ...Ns> struct ScValBeImpl<T, v, m, s, N0, Ns...>
+ : ScValBeImpl<T, v + (T(N0 & 255) << s), m + (T(255) << s), T(s - 8), Ns...> {};
+template<typename T, char ...Ns> struct ScValBe : ScValBeImpl<T, 0, 0, 8 * (sizeof(T) - 1), Ns...> {};
// ScVal: combines all given characters in one value of type T, also computes a
// mask-value with 1-bits in the 'used' positions.

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-src_video_ZMBVEncoder_cc,v 1.1 2021/08/06 08:02:10 mestre Exp $
Index: src/video/ZMBVEncoder.cc
--- src/video/ZMBVEncoder.cc.orig
+++ src/video/ZMBVEncoder.cc
@@ -430,7 +430,7 @@ span<const uint8_t> ZMBVEncoder::compressFrame(bool ke
auto r = deflate(&zstream, Z_SYNC_FLUSH);
assert(r == Z_OK); (void)r;
- return {output.data(), writeDone + zstream.total_out};
+ return {output.data(), static_cast<size_t>(writeDone + zstream.total_out)};
}
} // namespace openmsx

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.7 2019/10/20 22:07:03 bentley Exp $
@comment $OpenBSD: PLIST,v 1.8 2021/08/06 08:02:10 mestre Exp $
@bin bin/openmsx
share/doc/openmsx/
share/doc/openmsx/GPL.txt
@ -41,6 +41,7 @@ share/openmsx/extensions/Epson_Chakkari_Copy.xml
share/openmsx/extensions/FAC_MIDI_Interface.xml
share/openmsx/extensions/Gouda_SCSI.xml
share/openmsx/extensions/Gradiente_CT-80E.xml
share/openmsx/extensions/JVC_MSX_MIDI.xml
share/openmsx/extensions/Konami_EC-702.xml
share/openmsx/extensions/Konami_SD-Snatcher_Sound_Cartridge.xml
share/openmsx/extensions/Konami_Snatcher_Sound_Cartridge.xml
@ -67,7 +68,9 @@ share/openmsx/extensions/Password_Cartridge.xml
share/openmsx/extensions/Philips_NMS_1200.xml
share/openmsx/extensions/Philips_NMS_1205.xml
share/openmsx/extensions/Philips_VY_0010.xml
share/openmsx/extensions/Popolon_Sound_Cartridge.xml
share/openmsx/extensions/README
share/openmsx/extensions/ROM_Hunter_Mk2.xml
share/openmsx/extensions/SN76489.xml
share/openmsx/extensions/Sanyo_MFD-001.xml
share/openmsx/extensions/Sanyo_MRS-001.xml
@ -78,11 +81,15 @@ share/openmsx/extensions/Sony_HBD-50.xml
share/openmsx/extensions/Sony_HBD-F1.xml
share/openmsx/extensions/Sony_HBI-232.xml
share/openmsx/extensions/Sony_HBI-55.xml
share/openmsx/extensions/Sony_HBI-J1.xml
share/openmsx/extensions/Sony_HBK-30.xml
share/openmsx/extensions/Spectravideo_SVI-707.xml
share/openmsx/extensions/Talent_DPF-550.xml
share/openmsx/extensions/Tecall_MSX_RAMFILE_TM220.xml
share/openmsx/extensions/Toshiba_HX-F101PE.xml
share/openmsx/extensions/Toshiba_HX-MU900.xml
share/openmsx/extensions/Yamaha_FD-03.xml
share/openmsx/extensions/Yamaha_FD-05.xml
share/openmsx/extensions/Yamaha_SFG-01.xml
share/openmsx/extensions/Yamaha_SFG-05.xml
share/openmsx/extensions/advram.xml
@ -121,6 +128,7 @@ share/openmsx/icons/openMSX-logo-48.png
share/openmsx/icons/openMSX-logo-64.png
share/openmsx/init.tcl
share/openmsx/machines/
share/openmsx/machines/AVT_DPC-200.xml
share/openmsx/machines/Acid1Test-slots.xml
share/openmsx/machines/Acid2Test-hardware.xml
share/openmsx/machines/Acid3Test-mapper.xml
@ -178,12 +186,15 @@ share/openmsx/machines/Gradiente_Expert_GPC-1.xml
share/openmsx/machines/Gradiente_Expert_Plus.xml
share/openmsx/machines/Gradiente_Expert_XP-800.xml
share/openmsx/machines/Hitachi_MB-H1.xml
share/openmsx/machines/Hitachi_MB-H2.xml
share/openmsx/machines/Hitachi_MB-H3.xml
share/openmsx/machines/Hitachi_MB-H50.xml
share/openmsx/machines/JVC_HC-7GB.xml
share/openmsx/machines/Mitsubishi_ML-F110.xml
share/openmsx/machines/Mitsubishi_ML-F120.xml
share/openmsx/machines/Mitsubishi_ML-F80.xml
share/openmsx/machines/Mitsubishi_ML-FX1.xml
share/openmsx/machines/Mitsubishi_ML-G10.xml
share/openmsx/machines/Mitsubishi_ML-G1_ES.xml
share/openmsx/machines/Mitsubishi_ML-G3_ES.xml
share/openmsx/machines/National_CF-1200.xml
@ -194,11 +205,12 @@ share/openmsx/machines/National_CF-3300.xml
share/openmsx/machines/National_FS-1300.xml
share/openmsx/machines/National_FS-4000.xml
share/openmsx/machines/National_FS-4500.xml
share/openmsx/machines/National_FS-4600.xml
share/openmsx/machines/National_FS-4700.xml
share/openmsx/machines/National_FS-5000.xml
share/openmsx/machines/National_FS-4600F.xml
share/openmsx/machines/National_FS-4700F.xml
share/openmsx/machines/National_FS-5000F2.xml
share/openmsx/machines/National_FS-5500F1.xml
share/openmsx/machines/National_FS-5500F2.xml
share/openmsx/machines/Olympia_PHC-2.xml
share/openmsx/machines/Panasonic_CF-2700_DE.xml
share/openmsx/machines/Panasonic_FS-A1.xml
share/openmsx/machines/Panasonic_FS-A1F.xml
@ -212,6 +224,7 @@ share/openmsx/machines/Panasonic_FS-A1WX.xml
share/openmsx/machines/Philips_NMS_801.xml
share/openmsx/machines/Philips_NMS_8220.xml
share/openmsx/machines/Philips_NMS_8245.xml
share/openmsx/machines/Philips_NMS_8250-19.xml
share/openmsx/machines/Philips_NMS_8250.xml
share/openmsx/machines/Philips_NMS_8255.xml
share/openmsx/machines/Philips_VG_8000.xml
@ -231,13 +244,21 @@ share/openmsx/machines/Sanyo_MPC-10.xml
share/openmsx/machines/Sanyo_MPC-100.xml
share/openmsx/machines/Sanyo_MPC-2.xml
share/openmsx/machines/Sanyo_MPC-25FD.xml
share/openmsx/machines/Sanyo_MPC-3.xml
share/openmsx/machines/Sanyo_MPC-6.xml
share/openmsx/machines/Sanyo_PHC-23.xml
share/openmsx/machines/Sanyo_PHC-23J.xml
share/openmsx/machines/Sanyo_PHC-23JB.xml
share/openmsx/machines/Sanyo_PHC-28L.xml
share/openmsx/machines/Sanyo_PHC-28P.xml
share/openmsx/machines/Sanyo_PHC-28S.xml
share/openmsx/machines/Sanyo_PHC-30N.xml
share/openmsx/machines/Sanyo_PHC-33.xml
share/openmsx/machines/Sanyo_PHC-35J.xml
share/openmsx/machines/Sanyo_PHC-70FD.xml
share/openmsx/machines/Sanyo_PHC-70FD2.xml
share/openmsx/machines/Sanyo_PHC-77.xml
share/openmsx/machines/Sanyo_PHC-SPC.xml
share/openmsx/machines/Sharp_HB-8000_1.1.xml
share/openmsx/machines/Sharp_HB-8000_1.2.xml
share/openmsx/machines/Sony_HB-10.xml
@ -249,6 +270,8 @@ share/openmsx/machines/Sony_HB-201P.xml
share/openmsx/machines/Sony_HB-20P.xml
share/openmsx/machines/Sony_HB-501P.xml
share/openmsx/machines/Sony_HB-55P.xml
share/openmsx/machines/Sony_HB-75.xml
share/openmsx/machines/Sony_HB-75D.xml
share/openmsx/machines/Sony_HB-75P.xml
share/openmsx/machines/Sony_HB-F1.xml
share/openmsx/machines/Sony_HB-F1II.xml
@ -256,14 +279,18 @@ share/openmsx/machines/Sony_HB-F1XD.xml
share/openmsx/machines/Sony_HB-F1XDJ.xml
share/openmsx/machines/Sony_HB-F1XV.xml
share/openmsx/machines/Sony_HB-F5.xml
share/openmsx/machines/Sony_HB-F500.xml
share/openmsx/machines/Sony_HB-F500P.xml
share/openmsx/machines/Sony_HB-F500_v2.xml
share/openmsx/machines/Sony_HB-F700D.xml
share/openmsx/machines/Sony_HB-F700F.xml
share/openmsx/machines/Sony_HB-F700P.xml
share/openmsx/machines/Sony_HB-F900.xml
share/openmsx/machines/Sony_HB-F9P.xml
share/openmsx/machines/Sony_HB-F9P_Russian.xml
share/openmsx/machines/Sony_HB-F9S.xml
share/openmsx/machines/Sony_HB-G900AP.xml
share/openmsx/machines/Sony_HB-G900D.xml
share/openmsx/machines/Sony_HB-G900P.xml
share/openmsx/machines/Spectravideo_SVI-318.xml
share/openmsx/machines/Spectravideo_SVI-328.xml
@ -276,27 +303,38 @@ share/openmsx/machines/Talent_TPC-310.xml
share/openmsx/machines/Toshiba_FS-TM1.xml
share/openmsx/machines/Toshiba_HX-10.xml
share/openmsx/machines/Toshiba_HX-10D.xml
share/openmsx/machines/Toshiba_HX-20E.xml
share/openmsx/machines/Toshiba_HX-21.xml
share/openmsx/machines/Toshiba_HX-22.xml
share/openmsx/machines/Toshiba_HX-22I.xml
share/openmsx/machines/Toshiba_HX-23.xml
share/openmsx/machines/Toshiba_HX-23F.xml
share/openmsx/machines/Toshiba_HX-32.xml
share/openmsx/machines/Toshiba_HX-33.xml
share/openmsx/machines/Toshiba_HX-34.xml
share/openmsx/machines/Toshiba_HX-51I.xml
share/openmsx/machines/Victor_HC-7.xml
share/openmsx/machines/Victor_HC-80.xml
share/openmsx/machines/Victor_HC-95A.xml
share/openmsx/machines/WIP_Mitsubishi_ML-TS2.xml
share/openmsx/machines/Yamaha_AX150.xml
share/openmsx/machines/Yamaha_AX350II.xml
share/openmsx/machines/Yamaha_AX350IIF.xml
share/openmsx/machines/Yamaha_AX500.xml
share/openmsx/machines/Yamaha_CX11.xml
share/openmsx/machines/Yamaha_CX5F.xml
share/openmsx/machines/Yamaha_CX5M.xml
share/openmsx/machines/Yamaha_CX5MII-128.xml
share/openmsx/machines/Yamaha_CX5MII.xml
share/openmsx/machines/Yamaha_CX7-128.xml
share/openmsx/machines/Yamaha_CX7M-128.xml
share/openmsx/machines/Yamaha_SX-100.xml
share/openmsx/machines/Yamaha_YIS-503.xml
share/openmsx/machines/Yamaha_YIS-503F.xml
share/openmsx/machines/Yamaha_YIS-503II.xml
share/openmsx/machines/Yamaha_YIS-503IIIR.xml
share/openmsx/machines/Yamaha_YIS-503IIR.xml
share/openmsx/machines/Yamaha_YIS-604-128.xml
share/openmsx/machines/Yamaha_YIS-805-128R2.xml
share/openmsx/machines/Yashica_YC-64.xml
share/openmsx/machines/acid-tests/
@ -360,7 +398,6 @@ share/openmsx/scripts/_guess_title.tcl
share/openmsx/scripts/_info_panel.tcl
share/openmsx/scripts/_metal_gear_overlay.tcl
share/openmsx/scripts/_mog-overlay.tcl
share/openmsx/scripts/_monitor.tcl
share/openmsx/scripts/_multi_screenshot.tcl
share/openmsx/scripts/_music_keyboard.tcl
share/openmsx/scripts/_osd.tcl
@ -412,7 +449,9 @@ share/openmsx/scripts/keybindings.tcl
share/openmsx/scripts/lazy.tcl
share/openmsx/scripts/load_icons.tcl
share/openmsx/scripts/mode.tcl
share/openmsx/scripts/monitor.tcl
share/openmsx/scripts/osd_menu.tcl
share/openmsx/scripts/pause_on_lost_focus.tcl
share/openmsx/scripts/reverse.tcl
share/openmsx/scripts/screenshot.tcl
share/openmsx/scripts/session_management.tcl
@ -530,6 +569,20 @@ share/openmsx/skins/set2/power-on.png
share/openmsx/skins/set2/skin.tcl
share/openmsx/skins/set2/turbo-off.png
share/openmsx/skins/set2/turbo-on.png
share/openmsx/skins/set3/
share/openmsx/skins/set3/caps-off.png
share/openmsx/skins/set3/caps-on.png
share/openmsx/skins/set3/fdd-off.png
share/openmsx/skins/set3/fdd-on.png
share/openmsx/skins/set3/kana-off.png
share/openmsx/skins/set3/kana-on.png
share/openmsx/skins/set3/pause-off.png
share/openmsx/skins/set3/pause-on.png
share/openmsx/skins/set3/power-off.png
share/openmsx/skins/set3/power-on.png
share/openmsx/skins/set3/skin.tcl
share/openmsx/skins/set3/turbo-off.png
share/openmsx/skins/set3/turbo-on.png
share/openmsx/skins/set4/
share/openmsx/skins/set4/caps-off.png
share/openmsx/skins/set4/caps-on.png