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.
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 29 May 2023 06:13:54 -0000
@@ -1,69 +1,64 @@
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.20230523
+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 \
+ pthread pugixml sfml-network sfml-system speexdsp \
+ swscale swresample usb-1.0 zstd ${COMPILER_LIBCXX}
-WANTLIB-main = ${cWANTLIB} Qt5Core Qt5Gui Qt5Widgets
+WANTLIB-main = ${cWANTLIB} Qt6Core Qt6Gui Qt6Widgets
WANTLIB-nogui = ${cWANTLIB}
-COMPILER = base-clang ports-gcc base-gcc
+COMPILER = base-clang
MODULES = devel/cmake
-TEST_DEPENDS = devel/gtest
-BUILD_DEPENDS = devel/gettext,-tools \
- devel/fmt
+
+COMPILER = base-clang
+
+BUILD_DEPENDS = devel/gettext,-tools
LIB_DEPENDS-nogui = archivers/lzo2 \
+ archivers/zstd \
comms/libhidapi \
converters/libiconv \
- devel/gettext,-runtime \
+ devel/fmt \
devel/libusb1 \
devel/sdl2 \
graphics/ffmpeg \
- graphics/png \
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 \
+
+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 23 May 2023 07:52:58 -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.20230523.tar.xz) = mAjiIqss+a4xPUfZHl+7fkbfQfmNnDja5RSL1dW01tA=
+SIZE (dolphin-5.0.0.20230523.tar.xz) = 91899720
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /home/cvs/ports/emulators/dolphin/patches/patch-CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 11 Mar 2022 18:59:34 -0000 1.3
+++ patches/patch-CMakeLists_txt 5 Jun 2023 02:48:04 -0000
@@ -1,23 +1,41 @@
-use devel/gtest instead of this bundled gtest, which fails to compile
-use system devel/fmt instead of bundled fmt
+- Use bundled copy of minizip to workaround build infrastructure issue
+- Use bunbled copy of mGBA as the released version in ports is not new enough
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)
+@@ -808,16 +808,10 @@ endif()
+
+ add_subdirectory(Externals/zlib-ng)
+
+-pkg_check_modules(MINIZIP minizip>=3.0.0)
+-if(MINIZIP_FOUND)
+- message(STATUS "Using shared minizip")
+- include_directories(${MINIZIP_INCLUDE_DIRS})
+-else()
+- check_vendoring_approved(minizip)
+- message(STATUS "Shared minizip not found, falling back to the static library")
+- add_subdirectory(Externals/minizip)
+- include_directories(External/minizip)
+-endif()
++check_vendoring_approved(minizip)
++message(STATUS "Shared minizip not found, falling back to the static library")
++add_subdirectory(Externals/minizip)
++include_directories(External/minizip)
-@@ -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")
+ if(NOT APPLE)
+ check_lib(LZO "(no .pc for lzo2)" lzo2 lzo/lzo1x.h QUIET)
+@@ -968,11 +962,8 @@ if(NOT ENABLE_QT)
+ set(USE_MGBA 0)
endif()
+ if(USE_MGBA)
+- find_package(LIBMGBA)
+- if(NOT LIBMGBA_FOUND)
+- message(STATUS "Using static libmgba from Externals")
+- add_subdirectory(Externals/mGBA)
+- endif()
++ message(STATUS "Using static libmgba from Externals")
++ add_subdirectory(Externals/mGBA)
+ endif()
+
+ find_package(SYSTEMD)
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 25 Apr 2023 03:28:44 -0000
@@ -5,7 +5,7 @@ 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