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.
[...]
> FAILED: Binaries/dolphin-emu-nogui=20
> : && /exopi-obj/pobj/dolphin-emu-5.0.0.20180713/bin/c++ -O2 -pipe -DNDEB=
UG Source/Core/DolphinNoGUI/CMakeFiles/dolphin-nogui.dir/MainNoGUI.cpp.o =
-o Binaries/dolphin-emu-nogui -L/usr/local/lib -L/usr/X11R6/lib -Wl,-rpat=
h,/usr/local/lib: Source/Core/Core/libcore.a Source/Core/UICommon/libuicomm=
on.a Externals/cpp-optparse/libcpp-optparse.a Source/Core/VideoBackends/Nul=
l/libvideonull.a Source/Core/VideoBackends/OGL/libvideoogl.a Source/Core/Vi=
deoBackends/Software/libvideosoftware.a Source/Core/VideoBackends/Vulkan/li=
bvideovulkan.a Source/Core/VideoCommon/libvideocommon.a Source/Core/Core/li=
bcore.a Source/Core/VideoBackends/Null/libvideonull.a Source/Core/VideoBack=
ends/OGL/libvideoogl.a Source/Core/VideoBackends/Software/libvideosoftware.=
a Source/Core/VideoBackends/Vulkan/libvideovulkan.a Source/Core/VideoCommon=
/libvideocommon.a Source/Core/AudioCommon/libaudiocommon.a /usr/local/lib/l=
ibpulse.so.7.0 Externals/soundtouch/libSoundTouch.a Externals/cubeb/libcube=
b.a -lsndio Source/Core/DiscIO/libdiscio.a Source/Core/InputCommon/libinput=
common.a -lXi /usr/local/lib/libSDL2.so.0.5 /usr/local/lib/libpugixml.so.0.=
0 -lsfml-network -lsfml-system -llzo2 /usr/lib/libz.so.5.0 /usr/local/lib/l=
ibhidapi.so.0.0 -lSM -lICE -lX11 -lXext Externals/glslang/libglslang.a Exte=
rnals/xxhash/libxxhash.a /usr/local/lib/libavformat.so.19.4 /usr/local/lib/=
libavcodec.so.22.2 /usr/local/lib/libswscale.so.6.1 /usr/local/lib/libavuti=
l.so.12.4 Source/Core/Common/libcommon.a Externals/enet/libenet.a -lpthread=
-lmbedtls -lmbedx509 -lmbedcrypto -lcurl -liconv -lpng -lGL -lGLU -lXrandr=
/usr/local/lib/libminiupnpc.so.2.0 Externals/Bochs_disasm/libbdisasm.a -li=
ntl -lusb-1.0 -lLLVM-6.0 -Wl,-rpath-link,/usr/X11R6/lib:/usr/local/lib && :
> /usr/bin/ld: cannot find -lLLVM-6.0
> c++: error: linker command failed with exit code 1 (use -v to see invocat=
ion)
[...]
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?
Index: Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
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 20:23:44 -0000
@@ -6,7 +6,7 @@ ONLY_FOR_ARCHS =3D amd64
COMMENT-main =3D Nintendo GameCube and Wii emulator with GUI
COMMENT-nogui =3D Nintendo GameCube and Wii emulator
=20
-V =3D 5.0.0.20180713
+V =3D 5.0.0.20180901
DISTNAME =3D dolphin-emu-${V}
PKGNAME-main =3D dolphin-${V}
PKGNAME-nogui =3D dolphin-nogui-${V}
@@ -17,7 +17,7 @@ MULTI_PACKAGES =3D -main -nogui
=20
GH_ACCOUNT =3D dolphin-emu
GH_PROJECT =3D dolphin
-GH_COMMIT =3D 865d737efd54b6ed297e05662909f01651170c1b
+GH_COMMIT =3D 5f0d825f40b8aabe13eaef32d44ab667ff8e8c28
=20
CATEGORIES =3D emulators
MAINTAINER =3D Thomas Frohwein <tfrohw...@fastmail.com>
@@ -57,5 +57,9 @@ CONFIGURE_ARGS +=3D -Dmandir:=3D${PREFIX}/ma
-DENABLE_ALSA=3DOFF \
-DQt5_DIR=3D"${LOCALBASE}/lib/qt5/cmake/Qt5" \
-DUSE_DISCORD_PRESENCE=3DOFF
+
+.if ${PROPERTIES:Mclang}
+BUILD_DEPENDS +=3D devel/llvm
+.endif
=20
.include <bsd.port.mk>
Index: distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
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 20:23:44 -0000
@@ -1,2 +1,2 @@
-SHA256 (dolphin-emu-5.0.0.20180713-865d737e.tar.gz) =3D 2ueEuyQZA9NprPWihA=
I6hzuoG6m30SYR5iv032G087M=3D
-SIZE (dolphin-emu-5.0.0.20180713-865d737e.tar.gz) =3D 37343856
+SHA256 (dolphin-emu-5.0.0.20180901-5f0d825f.tar.gz) =3D 1AW5Afee85MVt3at+T=
R84YunSaMKrDlpaDRc9j3x1+o=3D
+SIZE (dolphin-emu-5.0.0.20180901-5f0d825f.tar.gz) =3D 36775895
Index: patches/patch-Source_Core_Core_ConfigManager_cpp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/ports/emulators/dolphin/patches/patch-Source_Core_Core_Confi=
gManager_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 20:23:44 -0=
000
@@ -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 =3D true;
bRunCompareServer =3D false;
bDSPHLE =3D true;
Index: pkg/PLIST-main
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
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 20:23:44 -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
