Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 28 Sep 2020 10:42:15 +0000 (UTC)
From:      Ganael LAPLANCHE <martymac@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r550417 - in head/emulators/dolphin-emu: . files
Message-ID:  <202009281042.08SAgFRt014102@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: martymac
Date: Mon Sep 28 10:42:14 2020
New Revision: 550417
URL: https://svnweb.freebsd.org/changeset/ports/550417

Log:
  Update to 5.0.12247

Deleted:
  head/emulators/dolphin-emu/files/patch-Externals_glslang_glslang_Include_PoolAlloc.h
  head/emulators/dolphin-emu/files/patch-Source_Core_DolphinQt_Config_Mapping_MappingIndicator.cpp
  head/emulators/dolphin-emu/files/patch-Vulkan.txt
Modified:
  head/emulators/dolphin-emu/Makefile
  head/emulators/dolphin-emu/distinfo
  head/emulators/dolphin-emu/files/patch-CMakeLists.txt
  head/emulators/dolphin-emu/files/patch-Source-Core-DolphinQt-CMakeLists.txt
  head/emulators/dolphin-emu/pkg-plist

Modified: head/emulators/dolphin-emu/Makefile
==============================================================================
--- head/emulators/dolphin-emu/Makefile	Mon Sep 28 10:15:25 2020	(r550416)
+++ head/emulators/dolphin-emu/Makefile	Mon Sep 28 10:42:14 2020	(r550417)
@@ -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 \

Modified: head/emulators/dolphin-emu/distinfo
==============================================================================
--- head/emulators/dolphin-emu/distinfo	Mon Sep 28 10:15:25 2020	(r550416)
+++ head/emulators/dolphin-emu/distinfo	Mon Sep 28 10:42:14 2020	(r550417)
@@ -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

Modified: head/emulators/dolphin-emu/files/patch-CMakeLists.txt
==============================================================================
--- head/emulators/dolphin-emu/files/patch-CMakeLists.txt	Mon Sep 28 10:15:25 2020	(r550416)
+++ head/emulators/dolphin-emu/files/patch-CMakeLists.txt	Mon Sep 28 10:42:14 2020	(r550417)
@@ -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")

Modified: head/emulators/dolphin-emu/files/patch-Source-Core-DolphinQt-CMakeLists.txt
==============================================================================
--- head/emulators/dolphin-emu/files/patch-Source-Core-DolphinQt-CMakeLists.txt	Mon Sep 28 10:15:25 2020	(r550416)
+++ head/emulators/dolphin-emu/files/patch-Source-Core-DolphinQt-CMakeLists.txt	Mon Sep 28 10:42:14 2020	(r550417)
@@ -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

Modified: head/emulators/dolphin-emu/pkg-plist
==============================================================================
--- head/emulators/dolphin-emu/pkg-plist	Mon Sep 28 10:15:25 2020	(r550416)
+++ head/emulators/dolphin-emu/pkg-plist	Mon Sep 28 10:42:14 2020	(r550417)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009281042.08SAgFRt014102>