On Sat, Sep 01, 2018 at 01:27:49PM -0700, Thomas Frohwein wrote: > On Sat, Sep 01, 2018 at 07:24:29PM +0200, Antoine Jacoutot wrote: > > Hi. > >=20 > > Doplhin failed to build in my last bulk. Looks like a missing dependency = > to > > llvm. > > [...] > > The following diff should fix it - taken from citra where we need to add > llvm BDEP for clang arches. Also updates dolphin to newest version. > > the '.if ${PROPERTIES:Mclang}' is for possible future unlocking of non- > amd64 branches. Right now ONLY_FOR_ARCHS=3Damd64 is still set. > > Notable changes include bugfixes for the JIT that affect primarily > homebrew ROMs, some PNG loading issues, netplay fixes. > > A summary of recent changes can be found on dolphin-emu's blog: > https://dolphin-emu.org/blog/2018/09/01/dolphin-progress-report-august-2018/ > > No regressions noticed on brief testing. > > ok? >
Sorry, not sure why the diff got mangled between cvs(1), tee(1), vi(1), and neomutt(1). New one without tee looks normal when I send it to myself: Index: Makefile =================================================================== RCS file: /cvs/ports/emulators/dolphin/Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 Makefile --- Makefile 22 Jul 2018 16:54:48 -0000 1.1.1.1 +++ Makefile 1 Sep 2018 22:44:07 -0000 @@ -6,7 +6,7 @@ ONLY_FOR_ARCHS = amd64 COMMENT-main = Nintendo GameCube and Wii emulator with GUI COMMENT-nogui = Nintendo GameCube and Wii emulator -V = 5.0.0.20180713 +V = 5.0.0.20180901 DISTNAME = dolphin-emu-${V} PKGNAME-main = dolphin-${V} PKGNAME-nogui = dolphin-nogui-${V} @@ -17,7 +17,7 @@ MULTI_PACKAGES = -main -nogui GH_ACCOUNT = dolphin-emu GH_PROJECT = dolphin -GH_COMMIT = 865d737efd54b6ed297e05662909f01651170c1b +GH_COMMIT = 5f0d825f40b8aabe13eaef32d44ab667ff8e8c28 CATEGORIES = emulators MAINTAINER = Thomas Frohwein <tfrohw...@fastmail.com> @@ -57,5 +57,9 @@ CONFIGURE_ARGS += -Dmandir:=${PREFIX}/ma -DENABLE_ALSA=OFF \ -DQt5_DIR="${LOCALBASE}/lib/qt5/cmake/Qt5" \ -DUSE_DISCORD_PRESENCE=OFF + +.if ${PROPERTIES:Mclang} +BUILD_DEPENDS += devel/llvm +.endif .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/emulators/dolphin/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo 22 Jul 2018 16:54:48 -0000 1.1.1.1 +++ distinfo 1 Sep 2018 22:44:07 -0000 @@ -1,2 +1,2 @@ -SHA256 (dolphin-emu-5.0.0.20180713-865d737e.tar.gz) = 2ueEuyQZA9NprPWihAI6hzuoG6m30SYR5iv032G087M= -SIZE (dolphin-emu-5.0.0.20180713-865d737e.tar.gz) = 37343856 +SHA256 (dolphin-emu-5.0.0.20180901-5f0d825f.tar.gz) = 1AW5Afee85MVt3at+TR84YunSaMKrDlpaDRc9j3x1+o= +SIZE (dolphin-emu-5.0.0.20180901-5f0d825f.tar.gz) = 36775895 Index: patches/patch-Source_Core_Core_ConfigManager_cpp =================================================================== RCS file: /cvs/ports/emulators/dolphin/patches/patch-Source_Core_Core_ConfigManager_cpp,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-Source_Core_Core_ConfigManager_cpp --- patches/patch-Source_Core_Core_ConfigManager_cpp 22 Jul 2018 16:54:48 -0000 1.1.1.1 +++ patches/patch-Source_Core_Core_ConfigManager_cpp 1 Sep 2018 22:44:07 -0000 @@ -9,7 +9,7 @@ just results in segfault on start of dol Index: Source/Core/Core/ConfigManager.cpp --- Source/Core/Core/ConfigManager.cpp.orig +++ Source/Core/Core/ConfigManager.cpp -@@ -512,7 +512,7 @@ void SConfig::LoadCoreSettings(IniFile& ini) +@@ -490,7 +490,7 @@ void SConfig::LoadCoreSettings(IniFile& ini) core->Get("CPUCore", &cpu_core, PowerPC::CPUCore::Interpreter); #endif core->Get("JITFollowBranch", &bJITFollowBranch, true); @@ -18,7 +18,7 @@ Index: Source/Core/Core/ConfigManager.cp core->Get("DSPHLE", &bDSPHLE, true); core->Get("TimingVariance", &iTimingVariance, 40); core->Get("CPUThread", &bCPUThread, true); -@@ -769,7 +769,7 @@ void SConfig::LoadDefaults() +@@ -743,7 +743,7 @@ void SConfig::LoadDefaults() bSyncGPUOnSkipIdleHack = true; bRunCompareServer = false; bDSPHLE = true; Index: pkg/PLIST-main =================================================================== RCS file: /cvs/ports/emulators/dolphin/pkg/PLIST-main,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST-main --- pkg/PLIST-main 22 Jul 2018 16:54:48 -0000 1.1.1.1 +++ pkg/PLIST-main 1 Sep 2018 22:44:07 -0000 @@ -2,6 +2,7 @@ @bin bin/dolphin-emu @man man/man6/dolphin-emu.6 share/applications/dolphin-emu.desktop +share/dolphin-emu/sys/GameSettings/GFTE01.ini share/icons/hicolor/256x256/apps/dolphin-emu.png share/icons/hicolor/scalable/apps/dolphin-emu.svg share/locale/ar/LC_MESSAGES/dolphin-emu.mo