From: Brad Smith <brad@comstyle.com>
Subject: UPDATE: Dolphin
To: ports@openbsd.org
Date: Thu, 13 Jun 2024 14:27:03 -0400

Here are some fixes for the Dolphin port.

- Now that the enet port is up to date use the system copy.
- Remove the SoundTouch build workaround. The issue with the way the header
  was included and the header path was fixed properly.


Index: Makefile
===================================================================
RCS file: /cvs/ports/emulators/dolphin/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- Makefile	1 Jun 2024 09:01:48 -0000	1.23
+++ Makefile	13 Jun 2024 18:21:55 -0000
@@ -6,6 +6,7 @@ COMMENT-main =		Nintendo GameCube and Wi
 COMMENT-nogui =		Nintendo GameCube and Wii emulator
 
 PKGNAME =		dolphin-5.0.0.20240524
+REVISION =		0
 DIST_TUPLE +=		github dolphin-emu dolphin \
 			222a3930807545d9ebffebfbd13c3a816f788434 . # GPLv2
 
@@ -82,7 +83,7 @@ MULTI_PACKAGES =	-main -nogui
 PERMIT_PACKAGE =	Yes
 
 cWANTLIB =		EGL GL GLU SDL2 X11 Xi Xrandr avcodec avformat avutil \
-			bz2 c curl fmt hidapi-libusb iconv lz4 lzma lzo2 m \
+			bz2 c curl enet 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 \
@@ -110,6 +111,7 @@ LIB_DEPENDS-nogui =	archivers/lz4 \
 			graphics/libspng \
 			multimedia/sfml \
 			net/curl \
+			net/enet>=1.3.18 \
 			net/miniupnp/miniupnpc \
 			security/polarssl \
 			sysutils/xxhash \
@@ -131,15 +133,7 @@ CONFIGURE_ARGS +=	-DENABLE_ALSA=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
-
-FIX_CRLF_FILES =	Externals/soundtouch/SoundTouch.cpp \
-			Externals/soundtouch/SoundTouch.h
-
-post-configure:
-	@mv ${WRKSRC}/Externals/soundtouch/SoundTouch.h \
-		${WRKSRC}/Externals/soundtouch/ExtSoundTouch.h
 
 .include <bsd.port.mk>
Index: patches/patch-Externals_soundtouch_SoundTouch_cpp
===================================================================
RCS file: patches/patch-Externals_soundtouch_SoundTouch_cpp
diff -N patches/patch-Externals_soundtouch_SoundTouch_cpp
--- patches/patch-Externals_soundtouch_SoundTouch_cpp	16 Apr 2024 17:21:57 -0000	1.4
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-Index: Externals/soundtouch/SoundTouch.cpp
---- Externals/soundtouch/SoundTouch.cpp.orig
-+++ Externals/soundtouch/SoundTouch.cpp
-@@ -68,7 +68,7 @@
- #include <math.h>
- #include <stdio.h>
- 
--#include "SoundTouch.h"
-+#include "ExtSoundTouch.h"
- #include "TDStretch.h"
- #include "RateTransposer.h"
- #include "cpu_detect.h"
Index: patches/patch-Externals_soundtouch_SoundTouch_h
===================================================================
RCS file: patches/patch-Externals_soundtouch_SoundTouch_h
diff -N patches/patch-Externals_soundtouch_SoundTouch_h
--- patches/patch-Externals_soundtouch_SoundTouch_h	16 Apr 2024 17:21:57 -0000	1.4
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-Avoid picking up SoundTouch.h from audio/soundtouch if installed.
-
-CMakeLists.txt: "Unable to use system soundtouch library: We require shorts, not
-floats"
-
-Index: Externals/soundtouch/SoundTouch.h
---- Externals/soundtouch/SoundTouch.h.orig
-+++ Externals/soundtouch/SoundTouch.h
-@@ -62,8 +62,8 @@
- //
- ////////////////////////////////////////////////////////////////////////////////
- 
--#ifndef SoundTouch_H
--#define SoundTouch_H
-+#ifndef ExtSoundTouch_H
-+#define ExtSoundTouch_H
- 
- #include "FIFOSamplePipe.h"
- #include "STTypes.h"
Index: patches/patch-Source_Core_AudioCommon_AudioStretcher_h
===================================================================
RCS file: patches/patch-Source_Core_AudioCommon_AudioStretcher_h
diff -N patches/patch-Source_Core_AudioCommon_AudioStretcher_h
--- patches/patch-Source_Core_AudioCommon_AudioStretcher_h	16 Apr 2024 17:21:57 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-Index: Source/Core/AudioCommon/AudioStretcher.h
---- Source/Core/AudioCommon/AudioStretcher.h.orig
-+++ Source/Core/AudioCommon/AudioStretcher.h
-@@ -5,7 +5,7 @@
- 
- #include <array>
- 
--#include <SoundTouch.h>
-+#include <ExtSoundTouch.h>
- 
- namespace AudioCommon
- {