Here is an update to Dolphin 20240505.

Upstream took an interest in finding a way of integrating the one
local patch we had left and fixing the need for specifying library
paths by picking up a few more paths via pkg-config when possible.

I took a first stab at trying to enable the Vulkan bits. Not 100%
sure about glslang and shaderc. Anyone with Vulkan hw could please
test this. Also the dependenceis need a double checking.


Index: Makefile
===================================================================
RCS file: /cvs/ports/emulators/dolphin/Makefile,v
retrieving revision 1.22
diff -u -p -u -p -r1.22 Makefile
--- Makefile	3 May 2024 06:50:46 -0000	1.22
+++ Makefile	6 May 2024 01:28:27 -0000
@@ -5,9 +5,9 @@ ONLY_FOR_ARCHS =	aarch64 amd64
 COMMENT-main =		Nintendo GameCube and Wii emulator with GUI
 COMMENT-nogui =		Nintendo GameCube and Wii emulator
 
-PKGNAME =		dolphin-5.0.0.20240421
+PKGNAME =		dolphin-5.0.0.20240505
 DIST_TUPLE +=		github dolphin-emu dolphin \
-			b6f0e8876e40a41941f0fb6cef89cf49c91edb56 . # GPLv2
+			2c913674295e08bca0e2cb1726b778fb61bf6bd1 . # GPLv2
 
 # Externals/
 DIST_TUPLE +=		github dolphin-emu ext-win-qt \
@@ -81,14 +81,14 @@ MULTI_PACKAGES =	-main -nogui
 # GPLv2+
 PERMIT_PACKAGE =	Yes
 
-cWANTLIB =		EGL GL GLU ICE SDL2 SM X11 Xext Xi Xrandr avcodec \
-			avformat avutil bz2 c curl fmt hidapi-libusb iconv \
-			lz4 lzma lzo2 m mbedcrypto mbedtls mbedx509 miniupnpc \
-			minizip pthread pugixml sfml-network sfml-system \
-			speexdsp spng swscale swresample usb-1.0 xxhash \
-			zstd ${COMPILER_LIBCXX}
-# sndio library is dlopen'd
-cWANTLIB +=		sndio
+cWANTLIB =		EGL GL GLU SDL2 X11 Xi Xrandr avcodec avformat avutil \
+			bz2 c curl fmt hidapi-libusb iconv lz4 lzma lzo2 m \
+			mbedcrypto mbedtls mbedx509 miniupnpc minizip pthread \
+			pugixml sfml-network sfml-system speexdsp spng swscale \
+			swresample usb-1.0 xxhash zstd \
+			${COMPILER_LIBCXX}
+# sndio / Vulkan libraries are dlopen'd
+cWANTLIB +=		sndio vulkan
 
 WANTLIB-main =		${cWANTLIB} Qt6Core Qt6Gui Qt6Widgets
 WANTLIB-nogui =		${cWANTLIB}
@@ -96,6 +96,9 @@ WANTLIB-nogui =		${cWANTLIB}
 MODULES =		devel/cmake
 
 BUILD_DEPENDS =		devel/gettext,-tools \
+			graphics/glslang \
+			graphics/shaderc \
+			graphics/vulkan-loader \
 			x11/qt6/qtsvg
 LIB_DEPENDS-nogui =	archivers/lz4 \
 			archivers/lzo2 \
@@ -117,9 +120,10 @@ LIB_DEPENDS-nogui =	archivers/lz4 \
 LIB_DEPENDS-main =	${LIB_DEPENDS-nogui} \
 			x11/qt6/qtbase
 RUN_DEPENDS-main =	${RUN_DEPENDS-nogui} \
+			${BASE_PKGPATH},-nogui \
 			devel/desktop-file-utils \
-			emulators/dolphin,-nogui \
 			x11/gtk+4,-guic
+RUN_DEPENDS-nogui =	graphics/vulkan-loader
 
 COMPILER =		base-clang
 
@@ -128,14 +132,11 @@ CONFIGURE_ARGS +=	-DENABLE_ALSA=OFF \
 			-DENABLE_LLVM=OFF \
 			-DENABLE_LTO=ON \
 			-DENABLE_TESTS=OFF \
-			-DENABLE_VULKAN=OFF \
 			-DUSE_DISCORD_PRESENCE=OFF \
 			-DUSE_SANITIZERS=OFF \
 			-DUSE_SYSTEM_ENET=OFF \
 			-DUSE_SYSTEM_LIBMGBA=OFF \
 			-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
-
-MODCMAKE_LDFLAGS =	-L${X11BASE}/lib -L${LOCALBASE}/lib
 
 FIX_CRLF_FILES =	Externals/soundtouch/SoundTouch.cpp \
 			Externals/soundtouch/SoundTouch.h
Index: distinfo
===================================================================
RCS file: /cvs/ports/emulators/dolphin/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- distinfo	3 May 2024 06:50:46 -0000	1.6
+++ distinfo	6 May 2024 01:28:27 -0000
@@ -4,7 +4,7 @@ SHA256 (KhronosGroup-SPIRV-Cross-0640756
 SHA256 (RetroAchievements-rcheevos-bfa0d3138865ae2a649a0beadfa4206408a14690.tar.gz) = gHG2G+GU7S+Xr6Z0JU7h3uyOR3aQrV5oF/kY2gKUSzc=
 SHA256 (bylaws-libadrenotools-deec5f75ee1a8ccbe32c8780b1d17284fc87b0f1.tar.gz) = o6augsMi1ZiwdoJ9EIZTT0f5/s7Xs2eDiQFTy6+e2YA=
 SHA256 (curl-curl-5379dbc248045ba46e89d76ffc4be4380d854728.tar.gz) = bvVz/TmIBJzA60tqxaAkvj76RRP1AxHbvcRvFSPtzGI=
-SHA256 (dolphin-emu-dolphin-b6f0e8876e40a41941f0fb6cef89cf49c91edb56.tar.gz) = 205WTI1m1d+HP6Mgau1DZDLWWLiDcEL7ySyrwYqGCec=
+SHA256 (dolphin-emu-dolphin-2c913674295e08bca0e2cb1726b778fb61bf6bd1.tar.gz) = osps83FF2G3L0eU+OIBe6DH5K8snEZkC1mxYimWmbDQ=
 SHA256 (dolphin-emu-ext-win-ffmpeg-9bc087fbca36ce5a85eb4fd73f0c73813593e5a2.tar.gz) = yYzYdIDrLVja3JYdx5JWlmlN5KIR0wiSEn/h3HwJJ4U=
 SHA256 (dolphin-emu-ext-win-qt-495517af2b922c10c24f543e0fd6ea3ddf774e50.tar.gz) = 0l6BYA4Uxz8Ikq/C93dfENrESO0KCSSYLMdnc1udUv0=
 SHA256 (epezent-implot-f156599faefe316f7dd20fe6c783bf87c8bb6fd9.tar.gz) = 13nOMzJjQ3JNHg+iPUlgzJrK9K9YS8ATTlBOdxfMxLs=
@@ -26,7 +26,7 @@ SIZE (KhronosGroup-SPIRV-Cross-06407561e
 SIZE (RetroAchievements-rcheevos-bfa0d3138865ae2a649a0beadfa4206408a14690.tar.gz) = 657051
 SIZE (bylaws-libadrenotools-deec5f75ee1a8ccbe32c8780b1d17284fc87b0f1.tar.gz) = 88081
 SIZE (curl-curl-5379dbc248045ba46e89d76ffc4be4380d854728.tar.gz) = 3300739
-SIZE (dolphin-emu-dolphin-b6f0e8876e40a41941f0fb6cef89cf49c91edb56.tar.gz) = 20283207
+SIZE (dolphin-emu-dolphin-2c913674295e08bca0e2cb1726b778fb61bf6bd1.tar.gz) = 20396651
 SIZE (dolphin-emu-ext-win-ffmpeg-9bc087fbca36ce5a85eb4fd73f0c73813593e5a2.tar.gz) = 14871857
 SIZE (dolphin-emu-ext-win-qt-495517af2b922c10c24f543e0fd6ea3ddf774e50.tar.gz) = 100540982
 SIZE (epezent-implot-f156599faefe316f7dd20fe6c783bf87c8bb6fd9.tar.gz) = 140301
Index: patches/patch-Source_Core_Core_HW_WiimoteReal_IOhidapi_cpp
===================================================================
RCS file: patches/patch-Source_Core_Core_HW_WiimoteReal_IOhidapi_cpp
diff -N patches/patch-Source_Core_Core_HW_WiimoteReal_IOhidapi_cpp
--- patches/patch-Source_Core_Core_HW_WiimoteReal_IOhidapi_cpp	16 Apr 2024 17:21:57 -0000	1.4
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-Change hid_init() to hidapi_hid_init() which is renamed locally to avoid
-conflict with usbhid.
-
-Index: Source/Core/Core/HW/WiimoteReal/IOhidapi.cpp
---- Source/Core/Core/HW/WiimoteReal/IOhidapi.cpp.orig
-+++ Source/Core/Core/HW/WiimoteReal/IOhidapi.cpp
-@@ -41,7 +41,7 @@ namespace WiimoteReal
- {
- WiimoteScannerHidapi::WiimoteScannerHidapi()
- {
--  int ret = hid_init();
-+  int ret = hidapi_hid_init();
-   ASSERT_MSG(WIIMOTE, ret == 0, "Couldn't initialise hidapi.");
- }
-