pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/emulators/openmsx openmsx: Update to 17.0, fix package.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f7ee4f93fa60
branches:  trunk
changeset: 457723:f7ee4f93fa60
user:      nia <nia%pkgsrc.org@localhost>
date:      Tue Aug 31 10:57:08 2021 +0000

description:
openmsx: Update to 17.0, fix package.

diffstat:

 emulators/openmsx/Makefile                         |    91 +-
 emulators/openmsx/PLIST                            |  1284 ++++++++++---------
 emulators/openmsx/distinfo                         |    13 +-
 emulators/openmsx/files/openmsx.desktop            |    39 +
 emulators/openmsx/options.mk                       |    38 +
 emulators/openmsx/patches/patch-build_detectsys.py |    15 -
 emulators/openmsx/patches/patch-build_main.mk      |    28 -
 emulators/openmsx/patches/patch-src_meson.build    |    14 +
 8 files changed, 794 insertions(+), 728 deletions(-)

diffs (truncated from 1577 to 300 lines):

diff -r 620dee9deb57 -r f7ee4f93fa60 emulators/openmsx/Makefile
--- a/emulators/openmsx/Makefile        Tue Aug 31 10:39:28 2021 +0000
+++ b/emulators/openmsx/Makefile        Tue Aug 31 10:57:08 2021 +0000
@@ -1,76 +1,57 @@
-# $NetBSD: Makefile,v 1.61 2020/12/04 20:45:17 nia Exp $
+# $NetBSD: Makefile,v 1.62 2021/08/31 10:57:08 nia Exp $
 
-DISTNAME=              openmsx-0.15.0
-PKGREVISION=           1
+DISTNAME=              openmsx-17.0
 CATEGORIES=            emulators
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=openMSX/}
 GITHUB_PROJECT=                openMSX
-GITHUB_RELEASE=                RELEASE_0_15_0
+GITHUB_TAG=            RELEASE_17_0
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              https://openmsx.org/
 COMMENT=               MSX emulator that aims for perfection
 LICENSE=               gnu-gpl-v2
 
-USE_TOOLS+=            gmake
-USE_LANGUAGES=         c c++14
-HAS_CONFIGURE=         yes
+USE_LANGUAGES=         c c++
+USE_TOOLS+=            pkg-config pax
 
-MAKE_FILE=             GNUmakefile
-MAKE_ENV+=             OPENMSX_FLAVOUR=opt
-CONFIGURE_ENV+=                OPENMSX_FLAVOUR=opt
-CONFIGURE_ENV+=                LOCALBASE=${PREFIX}
-INSTALLATION_DIRS+=    bin
-INSTALL_MAKE_FLAGS+=   SYMLINK_FOR_BINARY=false
-INSTALL_MAKE_FLAGS+=   INSTALL_BASE=${PREFIX}/openmsx
-MAKE_ENV+=             OPENMSX_INSTALL=${PREFIX}/openmsx
-
-PYTHON_VERSIONS_ACCEPTED=      27 # not yet ported as of 0.9.0
+GCC_REQD+=             7 # C++17
 
-SUBST_CLASSES+=                        bswap
-SUBST_STAGE.bswap=             pre-configure
-SUBST_MESSAGE.bswap=           Do not conflict bswap functions.
-SUBST_FILES.bswap=             src/utils/endian.hh
-SUBST_FILES.bswap+=            src/utils/sha1.cc
-SUBST_FILES.bswap+=            src/utils/tiger.cc
-SUBST_SED.bswap=               -e 's, bswap, openmsx_bswap,g'
-SUBST_SED.bswap+=              -e 's,::bswap,::openmsx_bswap,g'
-
-# c++14
-GCC_REQD+=     5
+# Not sure why this is necessary to find components.hh...
+CXXFLAGS+=             -I${WRKSRC}/output
 
-.include "../../mk/bsd.prefs.mk"
-
-do-configure:
-       cd ${WRKSRC} && ${CONFIGURE_ENV} ${GMAKE} -f build/main.mk probe
+INSTALLATION_DIRS+=    share/applications
+INSTALLATION_DIRS+=    share/pixmaps
 
-post-extract:
-       ${CP} ${WRKSRC}/build/platform-freebsd.mk \
-             ${WRKSRC}/build/platform-dragonfly.mk
-
-post-build:
-       (                                                       \
-       ${ECHO} "#!${SH}";                                      \
-       ${ECHO} 'exec ${PREFIX}/openmsx/bin/openmsx $$@'        \
-       ) > ${WRKSRC}/openmsx.sh
+PYTHON_FOR_BUILD_ONLY=         tool
+PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 post-install:
-       ${INSTALL_SCRIPT} ${WRKSRC}/openmsx.sh ${DESTDIR}${PREFIX}/bin/openmsx
-       @${ECHO_MSG} "======================================================================"
-       @${ECHO_MSG} "  Don't forget to have sound driver loaded before running openMSX."
-       @${ECHO_MSG} "  Otherwise, aRts will throw an exception when launching OpenMSX or"
-       @${ECHO_MSG} "  fail to create a directory called '.mcoprc' in the home directory."
-       @${ECHO_MSG} "  However, you may execute OpenMSX without sound support like this:"
-       @${ECHO_MSG} "  # env SDL_AUDIODRIVER=dummy openmsx <args>"
-       @${ECHO_MSG} "======================================================================"
+       cd ${WRKSRC}/Contrib/cbios && ${PAX} -rw -pp . \
+               ${DESTDIR}${PREFIX}/share/openmsx/machines
+       cd ${WRKSRC}/share && ${PAX} -rw -pp . \
+               ${DESTDIR}${PREFIX}/share/openmsx
+       cd ${WRKSRC}/doc && ${PAX} -rw -pp . \
+               ${DESTDIR}${PREFIX}/share/doc/openmsx
+# in testing through xfce4-appfinder these icons wouldn't appear...
+#.for s in 16 32 48 64 128 256
+#      ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps
+#      ${INSTALL_DATA} ${WRKSRC}/share/icons/openMSX-logo-${s}.png \
+#              ${DESTDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps/openmsx.png
+#.endfor
+       ${INSTALL_DATA} ${WRKSRC}/share/icons/openMSX-logo-256.png \
+               ${DESTDIR}${PREFIX}/share/pixmaps/openmsx.png
+       ${INSTALL_DATA} ${FILESDIR}/openmsx.desktop \
+               ${DESTDIR}${PREFIX}/share/applications
+       ${FIND} ${DESTDIR}${PREFIX}/share -name '.gitignore' -exec rm '{}' ';'
 
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../devel/SDL_ttf/buildlink3.mk"
+.include "options.mk"
+.include "../../devel/meson/build.mk"
+.include "../../devel/SDL2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/glew/buildlink3.mk"
+.include "../../fonts/SDL2_ttf/buildlink3.mk"
+#.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../lang/python/application.mk"
+.include "../../lang/python/tool.mk"
 .include "../../lang/tcl/buildlink3.mk"
-.include "../../multimedia/libogg/buildlink3.mk"
-.include "../../multimedia/libtheora/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 620dee9deb57 -r f7ee4f93fa60 emulators/openmsx/PLIST
--- a/emulators/openmsx/PLIST   Tue Aug 31 10:39:28 2021 +0000
+++ b/emulators/openmsx/PLIST   Tue Aug 31 10:57:08 2021 +0000
@@ -1,624 +1,662 @@
-@comment $NetBSD: PLIST,v 1.9 2019/06/17 15:16:28 nia Exp $
+@comment $NetBSD: PLIST,v 1.10 2021/08/31 10:57:08 nia Exp $
 bin/openmsx
-openmsx/bin/openmsx
-openmsx/doc/GPL.txt
-openmsx/doc/authors.txt
-openmsx/doc/cbios.txt
-openmsx/doc/manual/commands.html
-openmsx/doc/manual/compile.html
-openmsx/doc/manual/diskmanipulator.html
-openmsx/doc/manual/faq.html
-openmsx/doc/manual/index.html
-openmsx/doc/manual/manual-minty.css
-openmsx/doc/manual/manual-purple.css
-openmsx/doc/manual/manual.css
-openmsx/doc/manual/nocartfound.png
-openmsx/doc/manual/openmsx-control.html
-openmsx/doc/manual/setup.html
-openmsx/doc/manual/user.html
-openmsx/doc/release-history.txt
-openmsx/doc/release-notes.txt
-openmsx/share/extensions/ASCII_Japanese_MSX-Write.xml
-openmsx/share/extensions/ASCII_Japanese_MSX-Write_II.xml
-openmsx/share/extensions/ASCII_MSX-DOS2.xml
-openmsx/share/extensions/AVT_DPF-550.xml
-openmsx/share/extensions/Beer_IDE.xml
-openmsx/share/extensions/Boosted_audio.xml
-openmsx/share/extensions/Carnivore2.xml
-openmsx/share/extensions/Casio_KB-10.xml
-openmsx/share/extensions/Casio_KB-7.xml
-openmsx/share/extensions/Checkmark_FM_Stereo_PAK.xml
-openmsx/share/extensions/DDX_3.0.xml
-openmsx/share/extensions/ESE_MEGA-SCSI.xml
-openmsx/share/extensions/ESE_Ramdisk.xml
-openmsx/share/extensions/ESE_SCC.xml
-openmsx/share/extensions/ESE_WAVE-SCSI.xml
-openmsx/share/extensions/Epson_Chakkari_Copy.xml
-openmsx/share/extensions/FAC_MIDI_Interface.xml
-openmsx/share/extensions/Gouda_SCSI.xml
-openmsx/share/extensions/Gradiente_CT-80E.xml
-openmsx/share/extensions/Konami_EC-702.xml
-openmsx/share/extensions/Konami_SD-Snatcher_Sound_Cartridge.xml
-openmsx/share/extensions/Konami_Snatcher_Sound_Cartridge.xml
-openmsx/share/extensions/Konami_Ultimate_Collection.xml
-openmsx/share/extensions/Lascom_Kanji-dummy.rom.gz
-openmsx/share/extensions/Lascom_Kanji.xml
-openmsx/share/extensions/MIDI_Interface_3.xml
-openmsx/share/extensions/MegaFlashROM_SCC+.xml
-openmsx/share/extensions/MegaFlashROM_SCC+_SD.xml
-openmsx/share/extensions/MegaFlashROM_SCC.xml
-openmsx/share/extensions/MegaRAM_2MB.xml
-openmsx/share/extensions/MegaRAM_Disk.xml
-openmsx/share/extensions/Microsol_CDX-2.xml
-openmsx/share/extensions/Mitsubishi_ML-30DC_ML-30FD.xml
-openmsx/share/extensions/Musical_Memory_Mapper.xml
-openmsx/share/extensions/Neos_MA-20R.xml
-openmsx/share/extensions/Neos_MA-20V.xml
-openmsx/share/extensions/OPL3Cartridge.xml
-openmsx/share/extensions/OPL3Cartridge2_mono.xml
-openmsx/share/extensions/OPL3Cartridge2_stereo.xml
-openmsx/share/extensions/Panasonic_FS-CA1.xml
-openmsx/share/extensions/Panasonic_FS-FD1A.xml
-openmsx/share/extensions/Password_Cartridge.xml
-openmsx/share/extensions/Philips_NMS_1200.xml
-openmsx/share/extensions/Philips_NMS_1205.xml
-openmsx/share/extensions/Philips_VY_0010.xml
-openmsx/share/extensions/README
-openmsx/share/extensions/SN76489.xml
-openmsx/share/extensions/Sanyo_MFD-001.xml
-openmsx/share/extensions/Sanyo_MRS-001.xml
-openmsx/share/extensions/SensorKid.xml
-openmsx/share/extensions/Sharp_HB-3600.xml
-openmsx/share/extensions/Sharp_HB-4000.xml
-openmsx/share/extensions/Sony_HBD-50.xml
-openmsx/share/extensions/Sony_HBD-F1.xml
-openmsx/share/extensions/Sony_HBI-232.xml
-openmsx/share/extensions/Sony_HBI-55.xml
-openmsx/share/extensions/Sony_HBK-30.xml
-openmsx/share/extensions/Spectravideo_SVI-707.xml
-openmsx/share/extensions/Talent_DPF-550.xml
-openmsx/share/extensions/Tecall_MSX_RAMFILE_TM220.xml
-openmsx/share/extensions/Toshiba_HX-MU900.xml
-openmsx/share/extensions/Yamaha_SFG-01.xml
-openmsx/share/extensions/Yamaha_SFG-05.xml
-openmsx/share/extensions/advram.xml
-openmsx/share/extensions/audio.xml
-openmsx/share/extensions/audio2.xml
-openmsx/share/extensions/debugdevice.xml
-openmsx/share/extensions/fmpac.xml
-openmsx/share/extensions/gfx9000.xml
-openmsx/share/extensions/hirestimer.xml
-openmsx/share/extensions/ide.xml
-openmsx/share/extensions/mbstereo.xml
-openmsx/share/extensions/megaram.xml
-openmsx/share/extensions/moonsound.xml
-openmsx/share/extensions/msxdos2.xml
-openmsx/share/extensions/mu-PACK.xml
-openmsx/share/extensions/nowind.xml
-openmsx/share/extensions/pac.xml
-openmsx/share/extensions/ram16k.xml
-openmsx/share/extensions/ram1mb.xml
-openmsx/share/extensions/ram2mb.xml
-openmsx/share/extensions/ram32k.xml
-openmsx/share/extensions/ram4mb.xml
-openmsx/share/extensions/ram512k.xml
-openmsx/share/extensions/ram64k.xml
-openmsx/share/extensions/rs232.xml
-openmsx/share/extensions/scc+.xml
-openmsx/share/extensions/scc.xml
-openmsx/share/extensions/slotexpander.xml
-openmsx/share/extensions/video9000.xml
-openmsx/share/icons/openMSX-logo-128.png
-openmsx/share/icons/openMSX-logo-16.png
-openmsx/share/icons/openMSX-logo-256.png
-openmsx/share/icons/openMSX-logo-32.png
-openmsx/share/icons/openMSX-logo-48.png
-openmsx/share/icons/openMSX-logo-64.png
-openmsx/share/init.tcl
-openmsx/share/machines/Acid1Test-slots.xml
-openmsx/share/machines/Acid2Test-hardware.xml
-openmsx/share/machines/Acid3Test-mapper.xml
-openmsx/share/machines/Al_Alamiah_AX170.xml
-openmsx/share/machines/Al_Alamiah_AX230.xml
-openmsx/share/machines/Al_Alamiah_AX370.xml
-openmsx/share/machines/Aucnet_NIA-2001.xml
-openmsx/share/machines/Bawareth_Perfect_MSX1.xml
-openmsx/share/machines/Boosted_MSX2+_JP.txt
-openmsx/share/machines/Boosted_MSX2+_JP.xml
-openmsx/share/machines/Boosted_MSX2_EN.txt
-openmsx/share/machines/Boosted_MSX2_EN.xml
-openmsx/share/machines/Boosted_MSXturboR_with_IDE.txt
-openmsx/share/machines/Boosted_MSXturboR_with_IDE.xml
-openmsx/share/machines/C-BIOS_MSX1.xml
-openmsx/share/machines/C-BIOS_MSX1_BR.xml
-openmsx/share/machines/C-BIOS_MSX1_EU.xml
-openmsx/share/machines/C-BIOS_MSX1_JP.xml
-openmsx/share/machines/C-BIOS_MSX2+.xml
-openmsx/share/machines/C-BIOS_MSX2+_BR.xml
-openmsx/share/machines/C-BIOS_MSX2+_EU.xml
-openmsx/share/machines/C-BIOS_MSX2+_JP.xml
-openmsx/share/machines/C-BIOS_MSX2.xml
-openmsx/share/machines/C-BIOS_MSX2_BR.xml
-openmsx/share/machines/C-BIOS_MSX2_EU.xml
-openmsx/share/machines/C-BIOS_MSX2_JP.xml
-openmsx/share/machines/CIEL_Expert-Turbo.xml
-openmsx/share/machines/Canon_V-10.xml
-openmsx/share/machines/Canon_V-20.xml
-openmsx/share/machines/Canon_V-20_JP.xml
-openmsx/share/machines/Canon_V-25.xml
-openmsx/share/machines/Canon_V-8.xml
-openmsx/share/machines/Casio_MX-10.xml
-openmsx/share/machines/Casio_PV-16.xml
-openmsx/share/machines/Casio_PV-7.xml
-openmsx/share/machines/ColecoVision.xml
-openmsx/share/machines/ColecoVision_SGM.xml
-openmsx/share/machines/Daewoo_CPC-300.xml
-openmsx/share/machines/Daewoo_CPC-300E.xml
-openmsx/share/machines/Daewoo_CPC-400S.xml
-openmsx/share/machines/Daewoo_CPC-51_Zemmix_V.xml
-openmsx/share/machines/Daewoo_CPC-61_Zemmix_Super_V.xml
-openmsx/share/machines/Daewoo_DPC-100.xml
-openmsx/share/machines/Daewoo_DPC-180.xml
-openmsx/share/machines/Daewoo_DPC-200.xml
-openmsx/share/machines/Eurohard_Dragon_MSX.xml
-openmsx/share/machines/Fenner_SPC-800.xml
-openmsx/share/machines/Frael_Bruc_100_1.xml
-openmsx/share/machines/Frael_Bruc_100_2.xml
-openmsx/share/machines/Fujitsu_FM-X.xml
-openmsx/share/machines/Goldstar_FC-200.xml
-openmsx/share/machines/Goldstar_FC-80U.xml
-openmsx/share/machines/Gradiente_Expert_DD_Plus.xml
-openmsx/share/machines/Gradiente_Expert_GPC-1.xml
-openmsx/share/machines/Gradiente_Expert_Plus.xml
-openmsx/share/machines/Gradiente_Expert_XP-800.xml
-openmsx/share/machines/Hitachi_MB-H1.xml
-openmsx/share/machines/Hitachi_MB-H3.xml
-openmsx/share/machines/JVC_HC-7GB.xml
-openmsx/share/machines/Mitsubishi_ML-F110.xml
-openmsx/share/machines/Mitsubishi_ML-F120.xml
-openmsx/share/machines/Mitsubishi_ML-F80.xml



Home | Main Index | Thread Index | Old Index