On Mon, Feb 19, 2024 at 11:17:38PM +0000, Klemens Nanni wrote:
> On Sun, Jul 23, 2023 at 09:02:18PM -0400, Brad Smith wrote:
> > On Sat, Jul 22, 2023 at 09:28:43PM -0400, Brad Smith wrote:
> > > On Mon, Jun 05, 2023 at 10:34:00PM -0400, Brad Smith wrote:
> > > > On 2023-06-05 10:21 p.m., Thomas Frohwein wrote:
> > > > > On Sun, Jun 04, 2023 at 10:51:26PM -0400, Brad Smith wrote:
> > > > > > On Sun, Jun 04, 2023 at 09:45:36PM -0400, Thomas Frohwein wrote:
> > > > > > > On Sun, Jun 04, 2023 at 04:38:17PM +0200, Sol?ne Rapenne wrote:
> > > > > > > > On Wed, 2023-05-24 at 00:19 -0400, Brad Smith wrote:
> > > > > > > > > Here is an update to Dolphin 20230523 snapshot.
> > > > > > > > >
> > > > > > > > > Rolling up 4 years worth of work. I don't see any sort of change log.
> > > > > > > > >
> > > > > > > > Nice, thanks!
> > > > > > > >
> > > > > > > > It builds fine on amd64, and the GUI runs. The diff looks good. I can't
> > > > > > > > try dolphin more, but I'd be happy to commit if someone else is ok.
> > > > > > > >
> > > > > > > Doesn't build here; also amd64:
> > > > > > >
> > > > > > > /usr/ports/pobj/dolphin-5.0.0.20230523/dolphin-5.0.0.20230523/Source/Core/Core/HW/GBACore.cpp:308:11
> > > > > > > : error: no member named 'currentVideoSize' in 'mCore'
> > > > > > > m_core->currentVideoSize(m_core, &info.width, &info.height);
> > > > > > Try this updated diff. Looks like you have the mGBA port installed, but it's
> > > > > > not new enough.
> > > > > The new diff picks up graphics/glslang even though -DENABLE_VULKAN=OFF:
> > > > >
> > > > > In file included from /usr/ports/pobj/dolphin-5.0.0.20230523/dolphin-5.0.0.20230523/Source/Core/Vi
> > > > > deoCommon/Spirv.cpp:7:
> > > > > In file included from /usr/ports/pobj/dolphin-5.0.0.20230523/dolphin-5.0.0.20230523/Externals/glsl
> > > > > ang/SPIRV/GlslangToSpv.h:42:
> > > > > In file included from /usr/ports/pobj/dolphin-5.0.0.20230523/dolphin-5.0.0.20230523/Externals/glsl
> > > > > ang/SPIRV/SpvTools.h:50:
> > > > > In file included from /usr/local/include/glslang/MachineIndependent/localintermediate.h:42:
> > > > > In file included from /usr/local/include/glslang/MachineIndependent/../Include/intermediate.h:57:
> > > > > /usr/local/include/glslang/MachineIndependent/../Include/../Include/Types.h:903:14: error: use of
> > > > > undeclared identifier 'EShLangMesh'
> > > > > case EShLangMesh:
> > > >
> > > > That's the internal copy being built, but then looks like it picks up on
> > > > port / package headers instead
> > > > of internal headers. I'll see what I can do. Thanks.
> > >
> > > Rolled forward to a newer snap. The build issue with a system copy of glslang
> > > has been resolved as well as the CMake issue with a system copy of minizip.
> >
> > Add a new build depends on Qt6Svg.
>
>
> Current dolphin-5.0.0.20190621p4 crashes when loading a GameCube game image.
>
> $ dolphin-emu ./game.iso
> Program terminated with signal SIGILL, Illegal instruction.
> #0 0x0000075bc3dd3000 in ?? ()
> [Current thread is 1 (process 282494)]
> (gdb) bt
> #0 0x0000075bc3dd3000 in ?? ()
> #1 0x0000075b9d69feb0 in ?? ()
> #2 0xffffffffffffffff in ?? ()
> #3 0x0000075b9d69fee0 in ?? ()
> #4 0x00000758b5973678 in CPU::s_state_cpu_idle_cvar ()
> #5 0x0000000000000001 in ?? ()
> #6 0x00000758b5973670 in CPU::s_state_change_lock ()
> #7 0x0000075b4f90f000 in ?? ()
> #8 0x0000075b9d69fec0 in ?? ()
> #9 0x0000000000000000 in ?? ()
>
> USE_NOBTCFI=Yes avoids crashing (but the game window remains black).
>
> Your update fails to build for me on amd64:
>
> FAILED: Source/Core/UICommon/CMakeFiles/uicommon.dir/ResourcePack/ResourcePack.cpp.o
> /usr/local/bin/ccache /usr/ports/pobj/dolphin-5.0.0.20230722/bin/c++ -DAUTOUPDATE=1 -DDATA_DIR=\"/usr/local/share/dolphin-emu/\" -DFMT_SHARED -DHAS_OPENGL -DHAVE_EGL=1 -DHAVE_FFMPEG -DHAVE_X11=1 -DHAVE_XRANDR=1 -DUSE_ANALYTICS=1 -DUSE_MEMORYWATCHER=1 -DUSE_PIPES=1 -DUSE_UPNP -D_ARCH_64=1 -D_DEFAULT_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_M_X86=1 -D_M_X86_64=1 -D__LIBUSB__ -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -I/usr/X11R6/include -I/usr/ports/pobj/dolphin-5.0.0.20230722/dolphin-5.0.0.20230722/Source/Core -I/usr/ports/pobj/dolphin-5.0.0.20230722/dolphin-5.0.0.20230722/Externals/soundtouch -I/usr/ports/pobj/dolphin-5.0.0.20230722/dolphin-5.0.0.20230722/Externals/picojson -I/usr/ports/pobj/dolphin-5.0.0.20230722/build-amd64/Source/Core -I/usr/ports/pobj/dolphin-5.0.0.20230722/dolphin-5.0.0.20230722/Externals/cpp-optparse/. -I/usr/ports/pobj/dolphin-5.0.0.20230722/dolphin-5.0.0.20230722/Externals/Bochs_disasm -isystem /usr/local/include -isystem /usr/local/include/minizip -isystem /usr/local/include/libusb-1.0 -O2 -pipe -Qunused-arguments -fcolor-diagnostics -DNDEBUG -std=c++20 -msse2 -fdiagnostics-color -fno-strict-aliasing -fno-exceptions -fvisibility-inlines-hidden -fvisibility=hidden -fomit-frame-pointer -flto -Wall -Wtype-limits -Wsign-compare -Wignored-qualifiers -Wuninitialized -Wshadow -Winit-self -Wmissing-declarations -Wmissing-variable-declarations -Werror=format -MD -MT Source/Core/UICommon/CMakeFiles/uicommon.dir/ResourcePack/ResourcePack.cpp.o -MF Source/Core/UICommon/CMakeFiles/uicommon.dir/ResourcePack/ResourcePack.cpp.o.d -o Source/Core/UICommon/CMakeFiles/uicommon.dir/ResourcePack/ResourcePack.cpp.o -c /usr/ports/pobj/dolphin-5.0.0.20230722/dolphin-5.0.0.20230722/Source/Core/UICommon/ResourcePack/ResourcePack.cpp
> /usr/ports/pobj/dolphin-5.0.0.20230722/dolphin-5.0.0.20230722/Source/Core/UICommon/ResourcePack/ResourcePack.cpp:39:7: error: no matching function for call to 'unzLocateFile'
> if (unzLocateFile(file, "manifest.json", nullptr) == UNZ_END_OF_LIST_OF_FILE)
> ^~~~~~~~~~~~~
> /usr/local/include/minizip/mz_compat.h:364:17: note: candidate function not viable: no known conversion from 'std::nullptr_t' to 'unzFileNameCase' (aka 'int') for 3rd argument
> ZEXPORT int unzLocateFile(unzFile file, const char *filename, unzFileNameCase filename_case);
> ^
> /usr/ports/pobj/dolphin-5.0.0.20230722/dolphin-5.0.0.20230722/Source/Core/UICommon/ResourcePack/ResourcePack.cpp:66:7: error: no matching function for call to 'unzLocateFile'
> if (unzLocateFile(file, "logo.png", nullptr) != UNZ_END_OF_LIST_OF_FILE)
> ^~~~~~~~~~~~~
> /usr/local/include/minizip/mz_compat.h:364:17: note: candidate function not viable: no known conversion from 'std::nullptr_t' to 'unzFileNameCase' (aka 'int') for 3rd argument
> ZEXPORT int unzLocateFile(unzFile file, const char *filename, unzFileNameCase filename_case);
> ^
> 2 errors generated.
Tried again now and saw a different failure:
FAILED: Source/Core/Core/CMakeFiles/core.dir/HW/GBACore.cpp.o
/usr/local/bin/ccache /usr/ports/pobj/dolphin-5.0.0.20230722/bin/c++ -DAUTOUPDATE=1 -DDATA_DIR=\"/usr/local/share/dolphin-emu/\" -DFMT_SHARED -DHAS_LIBMGBA -DHAS_OPENGL -DHAVE_EGL=1 -DHAVE_FFMPEG -DHAVE_HIDAPI=1 -DHAVE_SDL2=1 -DHAVE_X11=1 -DHAVE_XRANDR=1 -DUSE_ANALYTICS=1 -DUSE_MEMORYWATCHER=1 -DUSE_PIPES=1 -DUSE_RETRO_ACHIEVEMENTS -DUSE_UPNP -D_ARCH_64=1 -D_DEFAULT_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_M_X86=1 -D_M_X86_64=1 -D__LIBUSB__ -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -I/usr/X11R6/include -I/usr/ports/pobj/dolphin-5.0.0.20230722/dolphin-5.0.0.20230722/Source/Core -I/usr/ports/pobj/dolphin-5.0.0.20230722/dolphin-5.0.0.20230722/Externals/soundtouch -I/usr/ports/pobj/dolphin-5.0.0.20230722/dolphin-5.0.0.20230722/Externals/picojson -I/usr/ports/pobj/dolphin-5.0.0.20230722/build-amd64/Source/Core -I/usr/ports/pobj/dolphin-5.0.0.20230722/dolphin-5.0.0.20230722/Externals/expr/include -I/usr/ports/pobj/dolphin-5.0.0.20230722/dolphin-5.0.0.20230722/Externals/cubeb/cubeb/include -I/usr/ports/pobj/dolphin-5.0.0.20230722/build-amd64/exports -I/usr/ports/pobj/dolphin-5.0.0.20230722/dolphin-5.0.0.20230722/Externals/FatFs -I/usr/ports/pobj/dolphin-5.0.0.20230722/build-amd64/Externals/zlib-ng/zlib-ng -I/usr/ports/pobj/dolphin-5.0.0.20230722/dolphin-5.0.0.20230722/Externals/zlib-ng/zlib-ng -I/usr/ports/pobj/dolphin-5.0.0.20230722/dolphin-5.0.0.20230722/Externals/Bochs_disasm -I/usr/ports/pobj/dolphin-5.0.0.20230722/dolphin-5.0.0.20230722/Externals/rcheevos -isystem /usr/local/include -isystem /usr/local/include/minizip -isystem /usr/local/include/libusb-1.0 -isystem /usr/local/include/hidapi -isystem /usr/ports/pobj/dolphin-5.0.0.20230722/dolphin-5.0.0.20230722/Externals/rangeset/include -isystem /usr/ports/pobj/dolphin-5.0.0.20230722/dolphin-5.0.0.20230722/Externals/glslang/glslang/Public -isystem /usr/ports/pobj/dolphin-5.0.0.20230722/dolphin-5.0.0.20230722/Source/Core/VideoCommon/SYSTEM -O2 -pipe -Qunused-arguments -fcolor-diagnostics -DNDEBUG -std=c++20 -msse2 -fdiagnostics-color -fno-strict-aliasing -fno-exceptions -fvisibility-inlines-hidden -fvisibility=hidden -fomit-frame-pointer -flto -Wall -Wtype-limits -Wsign-compare -Wignored-qualifiers -Wuninitialized -Wshadow -Winit-self -Wmissing-declarations -Wmissing-variable-declarations -Werror=format -MD -MT Source/Core/Core/CMakeFiles/core.dir/HW/GBACore.cpp.o -MF Source/Core/Core/CMakeFiles/core.dir/HW/GBACore.cpp.o.d -o Source/Core/Core/CMakeFiles/core.dir/HW/GBACore.cpp.o -c /usr/ports/pobj/dolphin-5.0.0.20230722/dolphin-5.0.0.20230722/Source/Core/Core/HW/GBACore.cpp
/usr/ports/pobj/dolphin-5.0.0.20230722/dolphin-5.0.0.20230722/Source/Core/Core/HW/GBACore.cpp:308:11: error: no member named 'currentVideoSize' in 'mCore'
m_core->currentVideoSize(m_core, &info.width, &info.height);
~~~~~~ ^
/usr/ports/pobj/dolphin-5.0.0.20230722/dolphin-5.0.0.20230722/Source/Core/Core/HW/GBACore.cpp:395:11: error: no member named 'currentVideoSize' in 'mCore'
m_core->currentVideoSize(m_core, &width, &height);
~~~~~~ ^
2 errors generated.
Also, git is picked up and invoked during build, configure with
-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
>
> >
> >
> > Index: Makefile
> > ===================================================================
> > RCS file: /home/cvs/ports/emulators/dolphin/Makefile,v
> > retrieving revision 1.19
> > diff -u -p -u -p -r1.19 Makefile
> > --- Makefile 24 Apr 2023 11:40:38 -0000 1.19
> > +++ Makefile 23 Jul 2023 23:50:01 -0000
> > @@ -1,69 +1,66 @@
> > USE_WXNEEDED = Yes
> > -ONLY_FOR_ARCHS = amd64
> > +ONLY_FOR_ARCHS = aarch64 amd64
> >
> > COMMENT-main = Nintendo GameCube and Wii emulator with GUI
> > COMMENT-nogui = Nintendo GameCube and Wii emulator
> >
> > -V = 5.0.0.20190621
> > -DISTNAME = dolphin-emu-${V}
> > -PKGNAME = dolphin-${V}
> > -REVISION-main = 4
> > -REVISION-nogui = 4
> > +V = 5.0.0.20230722
> > +DISTNAME = dolphin-${V}
> > +CATEGORIES = emulators
> > +MASTER_SITES = https://comstyle.com/source/
> > +EXTRACT_SUFX = .tar.xz
> >
> > MULTI_PACKAGES = -main -nogui
> >
> > -.include <bsd.port.arch.mk>
> > -
> > -GH_ACCOUNT = dolphin-emu
> > -GH_PROJECT = dolphin
> > -GH_COMMIT = 981925a831e28d3967104e1a64dd8fa9b382660a
> > -
> > -CATEGORIES = emulators
> > -
> > # GPLv2+
> > PERMIT_PACKAGE = Yes
> >
> > cWANTLIB = EGL GL GLU ICE SDL2 SM X11 Xext Xi Xrandr avcodec \
> > - avformat avutil c curl hidapi-libusb iconv intl lzo2 \
> > - m mbedcrypto mbedtls mbedx509 miniupnpc png pthread \
> > - pugixml sfml-network sfml-system sndio swscale \
> > - usb-1.0 z ${COMPILER_LIBCXX}
> > + avformat avutil bz2 c curl fmt hidapi-libusb iconv \
> > + lzma lzo2 m mbedcrypto mbedtls mbedx509 miniupnpc \
> > + minizip pthread pugixml sfml-network sfml-system \
> > + speexdsp spng swscale swresample usb-1.0 zstd \
> > + ${COMPILER_LIBCXX}
> >
> > -WANTLIB-main = ${cWANTLIB} Qt5Core Qt5Gui Qt5Widgets
> > -WANTLIB-nogui = ${cWANTLIB}
> > -
> > -COMPILER = base-clang ports-gcc base-gcc
> > +WANTLIB-main = ${cWANTLIB} Qt6Core Qt6Gui Qt6Widgets
> > +WANTLIB-nogui = ${cWANTLIB}
> >
> > MODULES = devel/cmake
> > -TEST_DEPENDS = devel/gtest
> > +
> > BUILD_DEPENDS = devel/gettext,-tools \
> > - devel/fmt
> > + x11/qt6/qtsvg
> > LIB_DEPENDS-nogui = archivers/lzo2 \
> > + archivers/minizip \
> > + archivers/zstd \
> > comms/libhidapi \
> > converters/libiconv \
> > - devel/gettext,-runtime \
> > + devel/fmt \
> > devel/libusb1 \
> > devel/sdl2 \
> > graphics/ffmpeg \
> > - graphics/png \
> > + graphics/libspng \
> > multimedia/sfml \
> > net/curl \
> > net/miniupnp/miniupnpc \
> > security/polarssl \
> > textproc/pugixml
> > LIB_DEPENDS-main = ${LIB_DEPENDS-nogui} \
> > - x11/qt5/qtbase
> > + x11/qt6/qtbase
> > RUN_DEPENDS-main = ${RUN_DEPENDS-nogui} \
> > devel/desktop-file-utils \
> > emulators/dolphin,-nogui \
> > x11/gtk+4,-guic
> > -CONFIGURE_ARGS += -Dmandir:=${PREFIX}/man \
> > - -DENABLE_ALSA=OFF \
> > +
> > +COMPILER = base-clang
> > +
> > +CONFIGURE_ARGS += -DENABLE_ALSA=OFF \
> > -DENABLE_PULSEAUDIO=OFF \
> > -DENABLE_LLVM=OFF \
> > - -DQt5_DIR="${LOCALBASE}/lib/qt5/cmake/Qt5" \
> > - -DUSE_DISCORD_PRESENCE=OFF
> > -TEST_TARGET = unittests
> > + -DENABLE_LTO=ON \
> > + -DENABLE_TESTS=OFF \
> > + -DENABLE_VULKAN=OFF \
> > + -DUSE_DISCORD_PRESENCE=OFF \
> > + -DUSE_SANITIZERS=OFF
> >
> > MODCMAKE_LDFLAGS = -L${X11BASE}/lib -L${LOCALBASE}/lib
> >
> > Index: distinfo
> > ===================================================================
> > RCS file: /home/cvs/ports/emulators/dolphin/distinfo,v
> > retrieving revision 1.3
> > diff -u -p -u -p -r1.3 distinfo
> > --- distinfo 8 Mar 2020 02:15:51 -0000 1.3
> > +++ distinfo 22 Jul 2023 06:56:13 -0000
> > @@ -1,2 +1,2 @@
> > -SHA256 (dolphin-emu-5.0.0.20190621-981925a8.tar.gz) = NU3/NTFnFtmsOaj8OqC2NtZdbrmL4+gnsoHgKKiaZvI=
> > -SIZE (dolphin-emu-5.0.0.20190621-981925a8.tar.gz) = 38837330
> > +SHA256 (dolphin-5.0.0.20230722.tar.xz) = SSd8KSIOytSXCt7q+n6pZ5gXz43GZ4cFP1HHkhW9Nrw=
> > +SIZE (dolphin-5.0.0.20230722.tar.xz) = 91976488
> > Index: patches/patch-CMakeLists_txt
> > ===================================================================
> > RCS file: patches/patch-CMakeLists_txt
> > diff -N patches/patch-CMakeLists_txt
> > --- patches/patch-CMakeLists_txt 11 Mar 2022 18:59:34 -0000 1.3
> > +++ /dev/null 1 Jan 1970 00:00:00 -0000
> > @@ -1,23 +0,0 @@
> > -use devel/gtest instead of this bundled gtest, which fails to compile
> > -use system devel/fmt instead of bundled fmt
> > -
> > -Index: CMakeLists.txt
> > ---- CMakeLists.txt.orig
> > -+++ CMakeLists.txt
> > -@@ -530,7 +530,6 @@ if (_M_X86)
> > - add_subdirectory(Externals/Bochs_disasm)
> > - endif()
> > - add_subdirectory(Externals/cpp-optparse)
> > --add_subdirectory(Externals/fmt EXCLUDE_FROM_ALL)
> > - add_subdirectory(Externals/glslang)
> > - add_subdirectory(Externals/imgui)
> > -
> > -@@ -748,8 +747,6 @@ include_directories("${PROJECT_BINARY_DIR}/Source/Core
> > - # Unit testing.
> > - #
> > - if(ENABLE_TESTS)
> > -- message(STATUS "Using static gtest from Externals")
> > -- add_subdirectory(Externals/gtest EXCLUDE_FROM_ALL)
> > - else()
> > - message(STATUS "Unit tests are disabled")
> > - endif()
> > Index: patches/patch-Externals_Bochs_disasm_CMakeLists_txt
> > ===================================================================
> > RCS file: patches/patch-Externals_Bochs_disasm_CMakeLists_txt
> > diff -N patches/patch-Externals_Bochs_disasm_CMakeLists_txt
> > --- patches/patch-Externals_Bochs_disasm_CMakeLists_txt 11 Mar 2022 18:59:34 -0000 1.2
> > +++ /dev/null 1 Jan 1970 00:00:00 -0000
> > @@ -1,11 +0,0 @@
> > -link against intl
> > -
> > -Index: Externals/Bochs_disasm/CMakeLists.txt
> > ---- Externals/Bochs_disasm/CMakeLists.txt.orig
> > -+++ Externals/Bochs_disasm/CMakeLists.txt
> > -@@ -16,3 +16,5 @@ target_include_directories(bdisasm
> > - PUBLIC
> > - ${CMAKE_CURRENT_SOURCE_DIR}
> > - )
> > -+
> > -+target_link_libraries(bdisasm intl)
> > Index: patches/patch-Externals_glslang_glslang_Include_PoolAlloc_h
> > ===================================================================
> > RCS file: patches/patch-Externals_glslang_glslang_Include_PoolAlloc_h
> > diff -N patches/patch-Externals_glslang_glslang_Include_PoolAlloc_h
> > --- patches/patch-Externals_glslang_glslang_Include_PoolAlloc_h 11 Mar 2022 18:59:34 -0000 1.2
> > +++ /dev/null 1 Jan 1970 00:00:00 -0000
> > @@ -1,13 +0,0 @@
> > -fix clang 10 build (error: 'operator=' is a private member)
> > -
> > -Index: Externals/glslang/glslang/Include/PoolAlloc.h
> > ---- Externals/glslang/glslang/Include/PoolAlloc.h.orig
> > -+++ Externals/glslang/glslang/Include/PoolAlloc.h
> > -@@ -304,7 +304,6 @@ class pool_allocator { (public)
> > - size_type max_size() const { return static_cast<size_type>(-1) / sizeof(T); }
> > - size_type max_size(int size) const { return static_cast<size_type>(-1) / size; }
> > -
> > -- void setAllocator(TPoolAllocator* a) { allocator = *a; }
> > - TPoolAllocator& getAllocator() const { return allocator; }
> > -
> > - protected:
> > Index: patches/patch-Externals_soundtouch_SoundTouch_cpp
> > ===================================================================
> > RCS file: /home/cvs/ports/emulators/dolphin/patches/patch-Externals_soundtouch_SoundTouch_cpp,v
> > retrieving revision 1.3
> > diff -u -p -u -p -r1.3 patch-Externals_soundtouch_SoundTouch_cpp
> > --- patches/patch-Externals_soundtouch_SoundTouch_cpp 11 Mar 2022 18:59:34 -0000 1.3
> > +++ patches/patch-Externals_soundtouch_SoundTouch_cpp 25 Apr 2023 03:28:44 -0000
> > @@ -1,7 +1,7 @@
> > Index: Externals/soundtouch/SoundTouch.cpp
> > --- Externals/soundtouch/SoundTouch.cpp.orig
> > +++ Externals/soundtouch/SoundTouch.cpp
> > -@@ -75,7 +75,7 @@
> > +@@ -68,7 +68,7 @@
> > #include <math.h>
> > #include <stdio.h>
> >
> > Index: patches/patch-Externals_soundtouch_SoundTouch_h
> > ===================================================================
> > RCS file: /home/cvs/ports/emulators/dolphin/patches/patch-Externals_soundtouch_SoundTouch_h,v
> > retrieving revision 1.3
> > diff -u -p -u -p -r1.3 patch-Externals_soundtouch_SoundTouch_h
> > --- patches/patch-Externals_soundtouch_SoundTouch_h 11 Mar 2022 18:59:34 -0000 1.3
> > +++ patches/patch-Externals_soundtouch_SoundTouch_h 22 Jul 2023 22:15:45 -0000
> > @@ -1,11 +1,12 @@
> > 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
> > -@@ -69,8 +69,8 @@
> > +@@ -62,8 +62,8 @@
> > //
> > ////////////////////////////////////////////////////////////////////////////////
> >
> > Index: patches/patch-Source_Core_AudioCommon_AudioStretcher_h
> > ===================================================================
> > RCS file: /home/cvs/ports/emulators/dolphin/patches/patch-Source_Core_AudioCommon_AudioStretcher_h,v
> > retrieving revision 1.2
> > diff -u -p -u -p -r1.2 patch-Source_Core_AudioCommon_AudioStretcher_h
> > --- patches/patch-Source_Core_AudioCommon_AudioStretcher_h 11 Mar 2022 18:59:34 -0000 1.2
> > +++ patches/patch-Source_Core_AudioCommon_AudioStretcher_h 25 Apr 2023 03:28:44 -0000
> > @@ -1,12 +1,12 @@
> > Index: Source/Core/AudioCommon/AudioStretcher.h
> > --- Source/Core/AudioCommon/AudioStretcher.h.orig
> > +++ Source/Core/AudioCommon/AudioStretcher.h
> > -@@ -6,7 +6,7 @@
> > +@@ -5,7 +5,7 @@
> >
> > #include <array>
> >
> > --#include <soundtouch/SoundTouch.h>
> > -+#include <soundtouch/ExtSoundTouch.h>
> > +-#include <SoundTouch.h>
> > ++#include <ExtSoundTouch.h>
> >
> > namespace AudioCommon
> > {
> > Index: patches/patch-Source_Core_Common_CMakeLists_txt
> > ===================================================================
> > RCS file: patches/patch-Source_Core_Common_CMakeLists_txt
> > diff -N patches/patch-Source_Core_Common_CMakeLists_txt
> > --- patches/patch-Source_Core_Common_CMakeLists_txt 11 Mar 2022 18:59:34 -0000 1.2
> > +++ /dev/null 1 Jan 1970 00:00:00 -0000
> > @@ -1,14 +0,0 @@
> > -fmt::fmt => fmt, to use system lib
> > -
> > -Index: Source/Core/Common/CMakeLists.txt
> > ---- Source/Core/Common/CMakeLists.txt.orig
> > -+++ Source/Core/Common/CMakeLists.txt
> > -@@ -132,7 +132,7 @@ target_link_libraries(common
> > - PUBLIC
> > - ${CMAKE_THREAD_LIBS_INIT}
> > - enet
> > -- fmt::fmt
> > -+ fmt
> > - ${MBEDTLS_LIBRARIES}
> > -
> > - PRIVATE
> > Index: patches/patch-Source_Core_Core_CMakeLists_txt
> > ===================================================================
> > RCS file: patches/patch-Source_Core_Core_CMakeLists_txt
> > diff -N patches/patch-Source_Core_Core_CMakeLists_txt
> > --- patches/patch-Source_Core_Core_CMakeLists_txt 11 Mar 2022 18:59:34 -0000 1.2
> > +++ /dev/null 1 Jan 1970 00:00:00 -0000
> > @@ -1,12 +0,0 @@
> > -Index: Source/Core/Core/CMakeLists.txt
> > ---- Source/Core/Core/CMakeLists.txt.orig
> > -+++ Source/Core/Core/CMakeLists.txt
> > -@@ -557,7 +557,7 @@ PUBLIC
> > - videovulkan
> > -
> > - PRIVATE
> > -- fmt::fmt
> > -+ fmt
> > - ${LZO}
> > - ZLIB::ZLIB
> > - )
> > Index: patches/patch-Source_Core_Core_ConfigManager_cpp
> > ===================================================================
> > RCS file: patches/patch-Source_Core_Core_ConfigManager_cpp
> > diff -N patches/patch-Source_Core_Core_ConfigManager_cpp
> > --- patches/patch-Source_Core_Core_ConfigManager_cpp 11 Mar 2022 18:59:34 -0000 1.4
> > +++ /dev/null 1 Jan 1970 00:00:00 -0000
> > @@ -1,27 +0,0 @@
> > -Disable Fastmem by default. This is an option for fast, but unsafe
> > -memory use by the JIT that triggers SIGSEGV by design that is meant to
> > -be caught and then replaced by the emulator. However, on OpenBSD this
> > -just results in segfault on start of dolphin. Therefore set it to
> > -'false' by default.
> > -
> > -Index: Source/Core/Core/ConfigManager.cpp
> > ---- Source/Core/Core/ConfigManager.cpp.orig
> > -+++ Source/Core/Core/ConfigManager.cpp
> > -@@ -479,7 +479,7 @@ void SConfig::LoadCoreSettings(IniFile& ini)
> > - core->Get("CPUCore", &cpu_core, PowerPC::CPUCore::Interpreter);
> > -
No comments:
Post a Comment