1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00

Update to 5.0.12247

This commit is contained in:
Ganael LAPLANCHE 2020-09-28 10:42:14 +00:00
parent 94b1b9ba04
commit fdb3cafc5a
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=550417
8 changed files with 45 additions and 76 deletions

View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= dolphin-emu
PORTVERSION= 5.0.10960
PORTREVISION= 1
PORTVERSION= 5.0.12247
CATEGORIES= emulators
MAINTAINER= martymac@FreeBSD.org
@ -15,11 +14,12 @@ LICENSE_FILE= ${WRKSRC}/license.txt
BROKEN_aarch64= fails to build: Source/Core/Common/ArmCPUDetect.cpp:5:10: fatal error: 'asm/hwcap.h' file not found
# Notes on dependencies:
# - alsa support has been disabled (not optimal)
# - enet and soundtouch come from Externals/ as Dolphin's versions diverge
# (see comments in CMakeLists.txt)
# - alsa support has been disabled (not optimal)
# Various problems that may be addressed in the future:
# - xxhash comes from Externals/ as it cannot be properly detected yet
# - minizip comes from Externals/ as v>=2.0.0 is not available from ports yet
# - freesurround comes from Externals/ as it is not available from ports yet
# - cubeb comes from Externals/ as it is not available from ports yet
# - gtest detection is missing (Externals/ version enforced by CMakeLists.txt)
@ -40,22 +40,25 @@ LIB_DEPENDS= libpulse.so:audio/pulseaudio \
libminiupnpc.so:net/miniupnpc \
libmbedtls.so:security/mbedtls \
libcurl.so:ftp/curl \
libhidapi.so:comms/hidapi
libhidapi.so:comms/hidapi \
libzstd.so:archivers/zstd \
libfmt.so:devel/libfmt
USES= cmake compiler:c++17-lang desktop-file-utils gl iconv \
pkgconfig qmake qt:5 sdl xorg
# See: https://fr.dolphin-emu.org/download/?ref=btn
# for latest beta version and associated commit
USE_GITHUB= yes
GH_PROJECT= dolphin
GH_TAGNAME= 19ed641
GH_TAGNAME= 9c12a84
USE_GL= gl glew glu
USE_SDL= sdl2
USE_XORG= ice sm x11 xext xi xrandr
USE_QT= buildtools_build core gui widgets
CMAKE_ARGS+= -DTRY_X11:BOOL=ON \
-DUSE_UPNP:BOOL=ON \
CMAKE_ARGS+= -DUSE_UPNP:BOOL=ON \
-DENABLE_QT:BOOL=ON \
-DENABLE_ALSA:BOOL=OFF \
-DENABLE_PULSEAUDIO:BOOL=ON \

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1570479360
SHA256 (dolphin-emu-dolphin-5.0.10960-19ed641_GH0.tar.gz) = d7f1553275569d4046e8f3d780628f4103ccf2825ab5e8ad5183050fe7de07f3
SIZE (dolphin-emu-dolphin-5.0.10960-19ed641_GH0.tar.gz) = 39761206
TIMESTAMP = 1600977235
SHA256 (dolphin-emu-dolphin-5.0.12247-9c12a84_GH0.tar.gz) = ae820f660b74b79919a3b72adc8c7e981c856748c6750a366d4abf010afe70f6
SIZE (dolphin-emu-dolphin-5.0.12247-9c12a84_GH0.tar.gz) = 41565258

View File

@ -1,6 +1,6 @@
--- CMakeLists.txt.orig 2018-12-13 21:39:07.971867000 +0100
+++ CMakeLists.txt 2018-12-13 21:39:46.807545000 +0100
@@ -93,7 +93,7 @@
--- CMakeLists.txt.orig 2020-07-04 04:19:59 UTC
+++ CMakeLists.txt
@@ -97,7 +97,7 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
# Set up paths
set(bindir ${CMAKE_INSTALL_PREFIX}/bin CACHE PATH "bindir")
set(datadir ${CMAKE_INSTALL_PREFIX}/share/dolphin-emu CACHE PATH "datadir")

View File

@ -1,26 +0,0 @@
https://github.com/KhronosGroup/glslang/commit/24b3e8384e93
In file included from Externals/glslang/glslang/GenericCodeGen/CodeGen.cpp:35:
In file included from Externals/glslang/glslang/GenericCodeGen/../Include/Common.h:107:
Externals/glslang/glslang/GenericCodeGen/../Include/PoolAlloc.h:307:54: error: 'operator=' is a private member of 'glslang::TPoolAllocator'
void setAllocator(TPoolAllocator* a) { allocator = *a; }
~~~~~~~~~ ^ ~~
Externals/glslang/glslang/GenericCodeGen/../Include/PoolAlloc.h:244:21: note: declared private here
TPoolAllocator& operator=(const TPoolAllocator&); // don't allow assignment operator
^
In file included from Externals/glslang/glslang/GenericCodeGen/CodeGen.cpp:36:
In file included from Externals/glslang/glslang/GenericCodeGen/../Include/ShHandle.h:46:
Externals/glslang/glslang/GenericCodeGen/../Include/../Public/ShaderLang.h:85:22: warning: '__fastcall__' calling convention is not supported for this target [-Wignored-attributes]
SH_IMPORT_EXPORT int __fastcall ShFinalize();
^
--- Externals/glslang/glslang/Include/PoolAlloc.h.orig 2019-10-07 00:46:03 UTC
+++ 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:

View File

@ -1,8 +1,8 @@
Add DISABLE_NLS option
--- Source/Core/DolphinQt/CMakeLists.txt.orig 2019-10-07 22:20:46.334504000 +0200
+++ Source/Core/DolphinQt/CMakeLists.txt 2019-10-07 22:22:45.882601000 +0200
@@ -334,51 +334,54 @@
--- Source/Core/DolphinQt/CMakeLists.txt.orig 2020-07-04 04:19:59 UTC
+++ Source/Core/DolphinQt/CMakeLists.txt
@@ -365,51 +365,54 @@ if(WIN32)
endif()
# Handle localization

View File

@ -1,10 +0,0 @@
--- Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp.orig 2020-05-19 18:47:30 UTC
+++ Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp
@@ -11,6 +11,7 @@
#include <QAction>
#include <QDateTime>
#include <QPainter>
+#include <QPainterPath>
#include <QTimer>
#include "Common/MathUtil.h"

View File

@ -1,24 +0,0 @@
Work around casting problems from 'nullptr_t' to 'VkDeviceMemory' on i386
--- Source/Core/VideoBackends/Vulkan/VKTexture.h.orig 2019-10-07 22:49:08.522989000 +0200
+++ Source/Core/VideoBackends/Vulkan/VKTexture.h 2019-10-07 22:55:45.619770000 +0200
@@ -54,7 +54,7 @@
VkImageView GetView() const { return m_view; }
VkImageLayout GetLayout() const { return m_layout; }
VkFormat GetVkFormat() const { return GetVkFormatForHostTextureFormat(m_config.format); }
- bool IsAdopted() const { return m_device_memory != nullptr; }
+ bool IsAdopted() const { return m_device_memory != static_cast<VkDeviceMemory>(VK_NULL_HANDLE); }
static std::unique_ptr<VKTexture> Create(const TextureConfig& tex_config);
static std::unique_ptr<VKTexture>
--- Source/Core/VideoBackends/Vulkan/VKTexture.cpp.orig 2019-10-07 23:53:26.533835000 +0200
+++ Source/Core/VideoBackends/Vulkan/VKTexture.cpp 2019-10-07 23:53:57.764628000 +0200
@@ -120,7 +120,7 @@
VkImageViewType view_type, VkImageLayout layout)
{
std::unique_ptr<VKTexture> texture = std::make_unique<VKTexture>(
- tex_config, nullptr, image, layout, ComputeImageLayout::Undefined);
+ tex_config, static_cast<VkDeviceMemory>(VK_NULL_HANDLE), image, layout, ComputeImageLayout::Undefined);
if (!texture->CreateView(view_type))
return nullptr;

View File

@ -14,6 +14,10 @@ share/applications/dolphin-emu.desktop
%%DATADIR%%/sys/GameSettings/D43.ini
%%DATADIR%%/sys/GameSettings/D43E01.ini
%%DATADIR%%/sys/GameSettings/D43J01.ini
%%DATADIR%%/sys/GameSettings/D85.ini
%%DATADIR%%/sys/GameSettings/D86.ini
%%DATADIR%%/sys/GameSettings/D95.ini
%%DATADIR%%/sys/GameSettings/DAX.ini
%%DATADIR%%/sys/GameSettings/DD2.ini
%%DATADIR%%/sys/GameSettings/DJU.ini
%%DATADIR%%/sys/GameSettings/DLS.ini
@ -154,9 +158,11 @@ share/applications/dolphin-emu.desktop
%%DATADIR%%/sys/GameSettings/G4GEE9.ini
%%DATADIR%%/sys/GameSettings/G4M.ini
%%DATADIR%%/sys/GameSettings/G4NJDA.ini
%%DATADIR%%/sys/GameSettings/G4P.ini
%%DATADIR%%/sys/GameSettings/G4QE01.ini
%%DATADIR%%/sys/GameSettings/G4S.ini
%%DATADIR%%/sys/GameSettings/G4SP01.ini
%%DATADIR%%/sys/GameSettings/G4Z.ini
%%DATADIR%%/sys/GameSettings/G5N.ini
%%DATADIR%%/sys/GameSettings/G5T.ini
%%DATADIR%%/sys/GameSettings/G6Q.ini
@ -166,6 +172,9 @@ share/applications/dolphin-emu.desktop
%%DATADIR%%/sys/GameSettings/G8ME01.ini
%%DATADIR%%/sys/GameSettings/G8W.ini
%%DATADIR%%/sys/GameSettings/G8WP01.ini
%%DATADIR%%/sys/GameSettings/G95.ini
%%DATADIR%%/sys/GameSettings/G96.ini
%%DATADIR%%/sys/GameSettings/G99.ini
%%DATADIR%%/sys/GameSettings/G9R.ini
%%DATADIR%%/sys/GameSettings/G9S.ini
%%DATADIR%%/sys/GameSettings/G9T.ini
@ -249,6 +258,7 @@ share/applications/dolphin-emu.desktop
%%DATADIR%%/sys/GameSettings/GFZJ01.ini
%%DATADIR%%/sys/GameSettings/GFZJ8P.ini
%%DATADIR%%/sys/GameSettings/GFZP01.ini
%%DATADIR%%/sys/GameSettings/GGC.ini
%%DATADIR%%/sys/GameSettings/GGE.ini
%%DATADIR%%/sys/GameSettings/GGN.ini
%%DATADIR%%/sys/GameSettings/GGR.ini
@ -380,6 +390,7 @@ share/applications/dolphin-emu.desktop
%%DATADIR%%/sys/GameSettings/GQS.ini
%%DATADIR%%/sys/GameSettings/GQSEAF.ini
%%DATADIR%%/sys/GameSettings/GQX.ini
%%DATADIR%%/sys/GameSettings/GR6.ini
%%DATADIR%%/sys/GameSettings/GRB.ini
%%DATADIR%%/sys/GameSettings/GREE08.ini
%%DATADIR%%/sys/GameSettings/GRH.ini
@ -457,6 +468,7 @@ share/applications/dolphin-emu.desktop
%%DATADIR%%/sys/GameSettings/GXSP8P.ini
%%DATADIR%%/sys/GameSettings/GXU.ini
%%DATADIR%%/sys/GameSettings/GXX.ini
%%DATADIR%%/sys/GameSettings/GYA.ini
%%DATADIR%%/sys/GameSettings/GYQ.ini
%%DATADIR%%/sys/GameSettings/GYT.ini
%%DATADIR%%/sys/GameSettings/GZ2.ini
@ -485,6 +497,7 @@ share/applications/dolphin-emu.desktop
%%DATADIR%%/sys/GameSettings/HBG.ini
%%DATADIR%%/sys/GameSettings/HBI.ini
%%DATADIR%%/sys/GameSettings/HBK.ini
%%DATADIR%%/sys/GameSettings/HC4.ini
%%DATADIR%%/sys/GameSettings/HCL.ini
%%DATADIR%%/sys/GameSettings/HCS.ini
%%DATADIR%%/sys/GameSettings/J.ini
@ -584,6 +597,7 @@ share/applications/dolphin-emu.desktop
%%DATADIR%%/sys/GameSettings/R5D.ini
%%DATADIR%%/sys/GameSettings/R5I.ini
%%DATADIR%%/sys/GameSettings/R5O.ini
%%DATADIR%%/sys/GameSettings/R5P.ini
%%DATADIR%%/sys/GameSettings/R5Q.ini
%%DATADIR%%/sys/GameSettings/R5S.ini
%%DATADIR%%/sys/GameSettings/R5T.ini
@ -657,6 +671,7 @@ share/applications/dolphin-emu.desktop
%%DATADIR%%/sys/GameSettings/RBS.ini
%%DATADIR%%/sys/GameSettings/RBT.ini
%%DATADIR%%/sys/GameSettings/RBW.ini
%%DATADIR%%/sys/GameSettings/RBY.ini
%%DATADIR%%/sys/GameSettings/RBZ.ini
%%DATADIR%%/sys/GameSettings/RC4.ini
%%DATADIR%%/sys/GameSettings/RC5.ini
@ -685,6 +700,7 @@ share/applications/dolphin-emu.desktop
%%DATADIR%%/sys/GameSettings/RDS.ini
%%DATADIR%%/sys/GameSettings/RDT.ini
%%DATADIR%%/sys/GameSettings/RDU.ini
%%DATADIR%%/sys/GameSettings/RDZ.ini
%%DATADIR%%/sys/GameSettings/RE8.ini
%%DATADIR%%/sys/GameSettings/REB.ini
%%DATADIR%%/sys/GameSettings/RED.ini
@ -731,9 +747,11 @@ share/applications/dolphin-emu.desktop
%%DATADIR%%/sys/GameSettings/RH2.ini
%%DATADIR%%/sys/GameSettings/RH4.ini
%%DATADIR%%/sys/GameSettings/RH5.ini
%%DATADIR%%/sys/GameSettings/RH6.ini
%%DATADIR%%/sys/GameSettings/RH7.ini
%%DATADIR%%/sys/GameSettings/RH8.ini
%%DATADIR%%/sys/GameSettings/RH9.ini
%%DATADIR%%/sys/GameSettings/RHA.ini
%%DATADIR%%/sys/GameSettings/RHC.ini
%%DATADIR%%/sys/GameSettings/RHD.ini
%%DATADIR%%/sys/GameSettings/RHE.ini
@ -821,6 +839,7 @@ share/applications/dolphin-emu.desktop
%%DATADIR%%/sys/GameSettings/RN2.ini
%%DATADIR%%/sys/GameSettings/RN5.ini
%%DATADIR%%/sys/GameSettings/RN8.ini
%%DATADIR%%/sys/GameSettings/RNB.ini
%%DATADIR%%/sys/GameSettings/RNC.ini
%%DATADIR%%/sys/GameSettings/RND.ini
%%DATADIR%%/sys/GameSettings/RNG.ini
@ -910,6 +929,7 @@ share/applications/dolphin-emu.desktop
%%DATADIR%%/sys/GameSettings/RSN.ini
%%DATADIR%%/sys/GameSettings/RSP.ini
%%DATADIR%%/sys/GameSettings/RSS.ini
%%DATADIR%%/sys/GameSettings/RST.ini
%%DATADIR%%/sys/GameSettings/RSX.ini
%%DATADIR%%/sys/GameSettings/RSY.ini
%%DATADIR%%/sys/GameSettings/RT3.ini
@ -917,6 +937,7 @@ share/applications/dolphin-emu.desktop
%%DATADIR%%/sys/GameSettings/RT8.ini
%%DATADIR%%/sys/GameSettings/RTB.ini
%%DATADIR%%/sys/GameSettings/RTG.ini
%%DATADIR%%/sys/GameSettings/RTH.ini
%%DATADIR%%/sys/GameSettings/RTJ.ini
%%DATADIR%%/sys/GameSettings/RTK.ini
%%DATADIR%%/sys/GameSettings/RTL.ini
@ -946,6 +967,7 @@ share/applications/dolphin-emu.desktop
%%DATADIR%%/sys/GameSettings/RVR.ini
%%DATADIR%%/sys/GameSettings/RW3.ini
%%DATADIR%%/sys/GameSettings/RW4.ini
%%DATADIR%%/sys/GameSettings/RW7.ini
%%DATADIR%%/sys/GameSettings/RW8.ini
%%DATADIR%%/sys/GameSettings/RWA.ini
%%DATADIR%%/sys/GameSettings/RWB.ini
@ -1000,6 +1022,7 @@ share/applications/dolphin-emu.desktop
%%DATADIR%%/sys/GameSettings/RZF.ini
%%DATADIR%%/sys/GameSettings/RZJ.ini
%%DATADIR%%/sys/GameSettings/RZJP69.ini
%%DATADIR%%/sys/GameSettings/RZL.ini
%%DATADIR%%/sys/GameSettings/RZO.ini
%%DATADIR%%/sys/GameSettings/RZR.ini
%%DATADIR%%/sys/GameSettings/RZT.ini
@ -1038,6 +1061,7 @@ share/applications/dolphin-emu.desktop
%%DATADIR%%/sys/GameSettings/SCE.ini
%%DATADIR%%/sys/GameSettings/SCF.ini
%%DATADIR%%/sys/GameSettings/SCH.ini
%%DATADIR%%/sys/GameSettings/SCI.ini
%%DATADIR%%/sys/GameSettings/SCK.ini
%%DATADIR%%/sys/GameSettings/SCT.ini
%%DATADIR%%/sys/GameSettings/SCY.ini
@ -1053,6 +1077,7 @@ share/applications/dolphin-emu.desktop
%%DATADIR%%/sys/GameSettings/SDW.ini
%%DATADIR%%/sys/GameSettings/SE2.ini
%%DATADIR%%/sys/GameSettings/SEA.ini
%%DATADIR%%/sys/GameSettings/SEC.ini
%%DATADIR%%/sys/GameSettings/SEG.ini
%%DATADIR%%/sys/GameSettings/SEM.ini
%%DATADIR%%/sys/GameSettings/SER.ini
@ -1278,6 +1303,7 @@ share/applications/dolphin-emu.desktop
%%DATADIR%%/sys/GameSettings/WKT.ini
%%DATADIR%%/sys/GameSettings/WKU.ini
%%DATADIR%%/sys/GameSettings/WKW.ini
%%DATADIR%%/sys/GameSettings/WL9.ini
%%DATADIR%%/sys/GameSettings/WLC.ini
%%DATADIR%%/sys/GameSettings/WLD.ini
%%DATADIR%%/sys/GameSettings/WLE.ini