Index: head/emulators/higan/Makefile =================================================================== --- head/emulators/higan/Makefile (revision 447592) +++ head/emulators/higan/Makefile (revision 447593) @@ -1,106 +1,105 @@ # Created by: elbarto # $FreeBSD$ PORTNAME= higan -PORTVERSION= 102 -PORTREVISION= 1 +PORTVERSION= 103 CATEGORIES= emulators MASTER_SITES= http://download.byuu.org/ \ http://www.cyberbotx.com/higan/ DISTNAME= ${PORTNAME}_v${PORTVERSION}-source MAINTAINER= cyberbotx@cyberbotx.com COMMENT= Nintendo multi-system emulator +ONLY_FOR_ARCHS= amd64 i386 + USES= 7z:p7zip compiler:c++14-lang gmake pkgconfig USE_LDCONFIG= yes USE_XORG= x11 xext USE_CSTD= c99 USE_CXXSTD= c++14 USE_GCC= yes + MAKEFILE= GNUmakefile +MAKE_ENV= compiler="${CXX}" -ONLY_FOR_ARCHS= i386 amd64 -MAKE_ENV+= compiler="${CXX}" - OPTIONS_DEFINE= DEBUG OPTIONS_SINGLE= GUI OPTIONS_SINGLE_GUI= GTK2 QT4 OPTIONS_MULTI= VIDEO SOUND INPUT OPTIONS_MULTI_VIDEO= GLX SDL XSHM XV OPTIONS_MULTI_SOUND= AO OPENAL OSS PULSEAUDIO OPTIONS_MULTI_INPUT= INPUT_SDL INPUT_X OPTIONS_DEFAULT= GTK2 GLX XSHM XV SDL \ OSS INPUT_SDL INPUT_X XSHM_DESC= Build XShm video driver XV_DESC= Build Xv video driver INPUT_SDL_DESC= Build SDL input driver INPUT_X_DESC= Build X input driver GTK2_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 GTK2_MAKE_ENV= hiro="gtk" GTK2_USE= GNOME=cairo,gdkpixbuf2,gtk20,gtksourceview2 GTK2_USES= gettext QT4_MAKE_ENV= hiro="qt" QT4_USE= QT4=corelib,gui,moc_build GLX_USE= GL=gl GLX_VARS= VIDEO_DRIVER+=video.glx SDL_USE= XORG=xv SDL=sdl SDL_VARS= VIDEO_DRIVER+=video.sdl XSHM_USE= XORG=xext XSHM_VARS= VIDEO_DRIVER+=video.xshm XV_USE= XORG=xv XV_VARS= VIDEO_DRIVER+=video.xv AO_LIB_DEPENDS= libao.so:audio/libao AO_VARS= AUDIO_DRIVER+=audio.ao OPENAL_USES= openal:al OPENAL_VARS= AUDIO_DRIVER+=audio.openal OSS_VARS= AUDIO_DRIVER+=audio.oss PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_VARS= AUDIO_DRIVER+=audio.pulseaudio INPUT_SDL_USE= SDL=sdl INPUT_SDL_VARS= INPUT_DRIVER+=input.sdl INPUT_X_VARS= INPUT_DRIVER+=input.xlib post-patch: ${REINPLACE_CMD} \ -e 's|%%VIDEO%%|${VIDEO_DRIVER}|' \ -e 's|%%AUDIO%%|${AUDIO_DRIVER}|' \ -e 's|%%INPUT%%|${INPUT_DRIVER}|' \ ${WRKSRC}/higan/target-tomoko/GNUmakefile ${REINPLACE_CMD} -e 's|/usr/share/|${PREFIX}/share/|' \ ${WRKSRC}/nall/path.hpp post-patch-DEBUG-on: ${REINPLACE_CMD} -e 's|-O3|-g|g' \ ${WRKSRC}/higan/GNUmakefile \ ${WRKSRC}/icarus/GNUmakefile do-build: .for d in higan icarus @${DO_MAKE_BUILD} ${ALL_TARGET} -C${WRKSRC}/${d} .endfor do-install: ${INSTALL_PROGRAM} ${WRKSRC}/higan/out/higan ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_PROGRAM} ${WRKSRC}/icarus/out/icarus ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_DATA} ${WRKSRC}/higan/data/higan.png ${STAGEDIR}${PREFIX}/share/pixmaps/ ${INSTALL_DATA} ${WRKSRC}/higan/data/higan.desktop ${STAGEDIR}${PREFIX}/share/applications/ (cd ${WRKSRC}/higan/systems && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/) - ${INSTALL_DATA} ${WRKSRC}/higan/data/cheats.bml ${STAGEDIR}${DATADIR}/ (cd ${WRKSRC}/icarus/Database && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/icarus/Database/) .include Index: head/emulators/higan/distinfo =================================================================== --- head/emulators/higan/distinfo (revision 447592) +++ head/emulators/higan/distinfo (revision 447593) @@ -1,3 +1,3 @@ -TIMESTAMP = 1489861177 -SHA256 (higan_v102-source.7z) = 52dadcf2ec5cfab0952e2948cc8acb4883b3996458bce4ecb3995830bb1699f1 -SIZE (higan_v102-source.7z) = 1246258 +TIMESTAMP = 1501216018 +SHA256 (higan_v103-source.7z) = e63a6ab6a4131f9a05382c0c8c67d226aeaec2ec51f139260c87fa1f5e994276 +SIZE (higan_v103-source.7z) = 917959 Index: head/emulators/higan/files/patch-icarus_core_core.cpp =================================================================== --- head/emulators/higan/files/patch-icarus_core_core.cpp (revision 447592) +++ head/emulators/higan/files/patch-icarus_core_core.cpp (revision 447593) @@ -1,33 +1,35 @@ ---- icarus/core/core.cpp.orig 2017-01-11 13:27:39 UTC +--- icarus/core/core.cpp.orig 2017-01-23 13:51:10 UTC +++ icarus/core/core.cpp -@@ -1,17 +1,17 @@ +@@ -1,18 +1,18 @@ Icarus::Icarus() { - database.famicom = BML::unserialize(string::read(locate("Database/Famicom.bml"))); - database.superFamicom = BML::unserialize(string::read(locate("Database/Super Famicom.bml"))); - database.masterSystem = BML::unserialize(string::read(locate("Database/Master System.bml"))); - database.megaDrive = BML::unserialize(string::read(locate("Database/Mega Drive.bml"))); - database.pcEngine = BML::unserialize(string::read(locate("Database/PC Engine.bml"))); +- database.superGrafx = BML::unserialize(string::read(locate("Database/SuperGrafx.bml"))); - database.gameBoy = BML::unserialize(string::read(locate("Database/Game Boy.bml"))); - database.gameBoyColor = BML::unserialize(string::read(locate("Database/Game Boy Color.bml"))); - database.gameBoyAdvance = BML::unserialize(string::read(locate("Database/Game Boy Advance.bml"))); - database.gameGear = BML::unserialize(string::read(locate("Database/Game Gear.bml"))); - database.wonderSwan = BML::unserialize(string::read(locate("Database/WonderSwan.bml"))); - database.wonderSwanColor = BML::unserialize(string::read(locate("Database/WonderSwan Color.bml"))); - database.bsMemory = BML::unserialize(string::read(locate("Database/BS Memory.bml"))); - database.sufamiTurbo = BML::unserialize(string::read(locate("Database/Sufami Turbo.bml"))); + database.famicom = BML::unserialize(string::read(locateShared("Database/Famicom.bml"))); + database.superFamicom = BML::unserialize(string::read(locateShared("Database/Super Famicom.bml"))); + database.masterSystem = BML::unserialize(string::read(locateShared("Database/Master System.bml"))); + database.megaDrive = BML::unserialize(string::read(locateShared("Database/Mega Drive.bml"))); + database.pcEngine = BML::unserialize(string::read(locateShared("Database/PC Engine.bml"))); ++ database.superGrafx = BML::unserialize(string::read(locateShared("Database/SuperGrafx.bml"))); + database.gameBoy = BML::unserialize(string::read(locateShared("Database/Game Boy.bml"))); + database.gameBoyColor = BML::unserialize(string::read(locateShared("Database/Game Boy Color.bml"))); + database.gameBoyAdvance = BML::unserialize(string::read(locateShared("Database/Game Boy Advance.bml"))); + database.gameGear = BML::unserialize(string::read(locateShared("Database/Game Gear.bml"))); + database.wonderSwan = BML::unserialize(string::read(locateShared("Database/WonderSwan.bml"))); + database.wonderSwanColor = BML::unserialize(string::read(locateShared("Database/WonderSwan Color.bml"))); + database.bsMemory = BML::unserialize(string::read(locateShared("Database/BS Memory.bml"))); + database.sufamiTurbo = BML::unserialize(string::read(locateShared("Database/Sufami Turbo.bml"))); } auto Icarus::error() const -> string { Index: head/emulators/higan/pkg-plist =================================================================== --- head/emulators/higan/pkg-plist (revision 447592) +++ head/emulators/higan/pkg-plist (revision 447593) @@ -1,20 +1,20 @@ bin/higan bin/icarus share/applications/higan.desktop %%DATADIR%%/Famicom.sys/manifest.bml %%DATADIR%%/Game Boy Advance.sys/manifest.bml %%DATADIR%%/Game Boy Color.sys/boot.rom %%DATADIR%%/Game Boy Color.sys/manifest.bml %%DATADIR%%/Game Boy.sys/boot.rom %%DATADIR%%/Game Boy.sys/manifest.bml %%DATADIR%%/Game Gear.sys/manifest.bml %%DATADIR%%/Master System.sys/manifest.bml %%DATADIR%%/Mega Drive.sys/manifest.bml %%DATADIR%%/PC Engine.sys/manifest.bml %%DATADIR%%/Super Famicom.sys/ipl.rom %%DATADIR%%/Super Famicom.sys/manifest.bml +%%DATADIR%%/SuperGrafx.sys/manifest.bml %%DATADIR%%/WonderSwan Color.sys/manifest.bml %%DATADIR%%/WonderSwan.sys/manifest.bml -%%DATADIR%%/cheats.bml share/icarus/Database/Super Famicom.bml share/pixmaps/higan.png