CVS commit: pkgsrc/emulators/dolphin-emu

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Jun  8 23:54:35 UTC 2025

Modified Files:
        pkgsrc/emulators/dolphin-emu: Makefile distinfo options.mk
Added Files:
        pkgsrc/emulators/dolphin-emu/patches:
            patch-Source_Core_AudioCommon_OpenALStream.cpp
Removed Files:
        pkgsrc/emulators/dolphin-emu: MESSAGE.NetBSD

Log Message:
dolphin-emu: Make sound work out of the box.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r0 pkgsrc/emulators/dolphin-emu/MESSAGE.NetBSD
cvs rdiff -u -r1.71 -r1.72 pkgsrc/emulators/dolphin-emu/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/emulators/dolphin-emu/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/emulators/dolphin-emu/options.mk
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/emulators/dolphin-emu/patches/patch-Source_Core_AudioCommon_OpenALStream.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/dolphin-emu/Makefile
diff -u pkgsrc/emulators/dolphin-emu/Makefile:1.71 pkgsrc/emulators/dolphin-emu/Makefile:1.72
--- pkgsrc/emulators/dolphin-emu/Makefile:1.71  Thu Apr 24 14:13:48 2025
+++ pkgsrc/emulators/dolphin-emu/Makefile       Sun Jun  8 23:54:35 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.71 2025/04/24 14:13:48 wiz Exp $
+# $NetBSD: Makefile,v 1.72 2025/06/08 23:54:35 nia Exp $
 
 DISTNAME=      dolphin-emu-5.0
-PKGREVISION=   61
+PKGREVISION=   62
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=dolphin-emu/}
 GITHUB_PROJECT=        dolphin
@@ -36,6 +36,11 @@ BROKEN_ON_PLATFORM+= SunOS-*-*
 CMAKE_CONFIGURE_ARGS+=         -DENABLE_GENERIC=1
 .endif
 
+.include "../../mk/compiler.mk"
+.if ${CC_VERSION:Mgcc-*}
+CMAKE_CONFIGURE_ARGS+= -DENABLE_PCH=OFF
+.endif
+
 # "Couldn't find libevdev and/or libudev.  Can't build evdev controller backend."
 CMAKE_CONFIGURE_ARGS.Linux+=   -DENABLE_EVDEV=0
 

Index: pkgsrc/emulators/dolphin-emu/distinfo
diff -u pkgsrc/emulators/dolphin-emu/distinfo:1.7 pkgsrc/emulators/dolphin-emu/distinfo:1.8
--- pkgsrc/emulators/dolphin-emu/distinfo:1.7   Tue Oct 26 10:23:48 2021
+++ pkgsrc/emulators/dolphin-emu/distinfo       Sun Jun  8 23:54:35 2025
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.7 2021/10/26 10:23:48 nia Exp $
+$NetBSD: distinfo,v 1.8 2025/06/08 23:54:35 nia Exp $
 
 BLAKE2s (dolphin-emu-5.0.tar.gz) = ceec308ace0877748d49e954798a71f9262e2af537ada0a88e59c887adf1b904
 SHA512 (dolphin-emu-5.0.tar.gz) = 8de76f811abfb82e19502336734e86ba600c11d9fa95bcf7f70a2a525165d07ead826854c39377602aab7856a057af9ba91bff458cf2dd008712527290489d3a
 Size (dolphin-emu-5.0.tar.gz) = 38246344 bytes
 SHA1 (patch-CMakeLists.txt) = e6f8d72d53ea930306dfb7a879608c3d3ab946aa
 SHA1 (patch-Externals_SFML_include_SFML_Config.hpp) = 75ece2ce86b54b219a80d6ff028ecc80a00454f5
+SHA1 (patch-Source_Core_AudioCommon_OpenALStream.cpp) = 9a535d8c456667cbd377295142ab6948f28c4907
 SHA1 (patch-Source_Core_Common_FileUtil.cpp) = 27b859714e294abbfb3f468928e22b30abfd0099
 SHA1 (patch-Source_Core_Common_MemoryUtil.cpp) = af681a3f43687f7af09c87732a7a2da8e8c58e05
 SHA1 (patch-Source_Core_Common_StringUtil.cpp) = 3a53d42ae9da1d50c0693bd222cb20be9ebe5a16

Index: pkgsrc/emulators/dolphin-emu/options.mk
diff -u pkgsrc/emulators/dolphin-emu/options.mk:1.5 pkgsrc/emulators/dolphin-emu/options.mk:1.6
--- pkgsrc/emulators/dolphin-emu/options.mk:1.5 Sun Aug 25 06:18:40 2024
+++ pkgsrc/emulators/dolphin-emu/options.mk     Sun Jun  8 23:54:35 2025
@@ -1,8 +1,10 @@
-# $NetBSD: options.mk,v 1.5 2024/08/25 06:18:40 wiz Exp $
+# $NetBSD: options.mk,v 1.6 2025/06/08 23:54:35 nia Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.dolphin-emu
 PKG_SUPPORTED_OPTIONS=         alsa libao llvm openal portaudio pulseaudio
-PKG_SUGGESTED_OPTIONS+=                alsa libao
+
+PKG_SUGGESTED_OPTIONS.Linux=   alsa
+PKG_SUGGESTED_OPTIONS=         openal
 
 .include "../../mk/bsd.options.mk"
 

Added files:

Index: pkgsrc/emulators/dolphin-emu/patches/patch-Source_Core_AudioCommon_OpenALStream.cpp
diff -u /dev/null pkgsrc/emulators/dolphin-emu/patches/patch-Source_Core_AudioCommon_OpenALStream.cpp:1.1
--- /dev/null   Sun Jun  8 23:54:35 2025
+++ pkgsrc/emulators/dolphin-emu/patches/patch-Source_Core_AudioCommon_OpenALStream.cpp Sun Jun  8 23:54:35 2025
@@ -0,0 +1,27 @@
+$NetBSD: patch-Source_Core_AudioCommon_OpenALStream.cpp,v 1.1 2025/06/08 23:54:35 nia Exp $
+
+Make this work on NetBSD.
+
+--- Source/Core/AudioCommon/OpenALStream.cpp.orig      2025-06-08 23:32:45.886303150 +0000
++++ Source/Core/AudioCommon/OpenALStream.cpp
+@@ -139,12 +139,20 @@ void OpenALStream::SoundLoop()
+       surround_capable = false;
+       const ALenum AL_FORMAT_51CHN32 = 0;
+       const ALenum AL_FORMAT_51CHN16 = 0;
++#elif defined(__NetBSD__)
++      bool float32_capable = false;
++      surround_capable = false;
+ #else
+       bool float32_capable = true;
+ #endif
+ 
+       u32 ulFrequency = m_mixer->GetSampleRate();
++
++#ifndef __NetBSD__
+       numBuffers = SConfig::GetInstance().iLatency + 2; // OpenAL requires a minimum of two buffers
++#else
++      numBuffers = SConfig::GetInstance().iLatency + 8;
++#endif
+ 
+       memset(uiBuffers, 0, numBuffers * sizeof(ALuint));
+       uiSource = 0;