mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-20 04:02:27 +00:00
Code Issues Releases Activity

emulators/yuzu: update to s20210417

Browse Source 
Changes:	eedbe8351...ce921e0f2
This commit is contained in:
Jan Beich 2021-04-16 17:36:48 +00:00
parent dbd13c9ba8
commit 52526dc566
4 changed files with 65 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
emulators/yuzu/Makefile
View File

@ -1,21 +1,20 @@
PORTNAME= yuzu
PORTVERSION= s20210414
PORTVERSION= s20210417
PORTREVISION?= 0
CATEGORIES= emulators
PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
PATCHFILES+= 09efade03619.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/1340
PATCHFILES+= 91076a814ff2.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/4836
PATCHFILES+= ec7337d1da05.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896
PATCHFILES+= 4c1e00b7780f.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896
PATCHFILES+= 1d703019d37a.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896
PATCHFILES+= 96dc85f79b0b.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896
PATCHFILES+= 8ab3e2366b32.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896
PATCHFILES+= c279e3ad6104.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896
PATCHFILES+= 9b429b84617c.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896
PATCHFILES+= cc4650cc8a84.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896
PATCHFILES+= 4233c859a602.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896
PATCHFILES+= c8880a62d365.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896
PATCHFILES+= abf034785ed2.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/4836
PATCHFILES+= d37bd764e826.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896
PATCHFILES+= d04bf0f3726d.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896
PATCHFILES+= 098eed11d05e.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896
PATCHFILES+= 931b5dfb8af9.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896
PATCHFILES+= b2330ec6a431.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896
PATCHFILES+= 21e69958e168.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896
PATCHFILES+= ffc1b3a3dd67.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896
PATCHFILES+= f736f4a65bc0.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896
PATCHFILES+= 09b61318aa4f.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896
PATCHFILES+= 4c3d3bbd2ad4.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896
MAINTAINER= jbeich@FreeBSD.org
COMMENT= Nintendo Switch emulator/debugger
@ -43,7 +42,7 @@ LIB_DEPENDS= liblz4.so:archivers/liblz4 \
USE_GITHUB= yes
GH_ACCOUNT= yuzu-emu
GH_TAGNAME= eedbe8351
GH_TAGNAME= ce921e0f2
GH_TUPLE= yuzu-emu:mbedtls:v2.16.9-52-geac2416b8:mbedtls/externals/mbedtls \
KhronosGroup:SPIRV-Headers:2c51218:SPIRV_Headers/externals/sirit/externals/SPIRV-Headers \
KhronosGroup:Vulkan-Headers:v1.2.145:Vulkan_Headers/externals/Vulkan-Headers \

52
emulators/yuzu/distinfo
View File

@ -1,6 +1,6 @@
TIMESTAMP = 1618435551
SHA256 (yuzu-emu-yuzu-s20210414-eedbe8351_GH0.tar.gz) = be0be285aaaf151ccdc0dc4146fb349ae36a52df486675a94a6723f5f7531ea9
SIZE (yuzu-emu-yuzu-s20210414-eedbe8351_GH0.tar.gz) = 3606638
TIMESTAMP = 1618684637
SHA256 (yuzu-emu-yuzu-s20210417-ce921e0f2_GH0.tar.gz) = 19c957c8299a005ef6e72a2b17572d43aff4fba418809776d4927632e5cb5eb2
SIZE (yuzu-emu-yuzu-s20210417-ce921e0f2_GH0.tar.gz) = 3795308
SHA256 (yuzu-emu-mbedtls-v2.16.9-52-geac2416b8_GH0.tar.gz) = 8d3b480b4121feaa30f12fdec06de741775465454610202363edaf7564d4f3bb
SIZE (yuzu-emu-mbedtls-v2.16.9-52-geac2416b8_GH0.tar.gz) = 2676404
SHA256 (KhronosGroup-SPIRV-Headers-2c51218_GH0.tar.gz) = 08f70947b69e17c7e322156adcd471cf02b4b3f63e7baf8ee0f02d32603ac5ff
@ -25,27 +25,25 @@ SHA256 (kinetiknz-cubeb-cubeb-0.2-1298-g8d53747_GH0.tar.gz) = b5cd93de1ca5c98105
SIZE (kinetiknz-cubeb-cubeb-0.2-1298-g8d53747_GH0.tar.gz) = 218055
SHA256 (benhoyt-inih-r52_GH0.tar.gz) = 439cff9ce9a8afc52d08772ac3e93b3cecd79c7707f871fb4534fb3a48201880
SIZE (benhoyt-inih-r52_GH0.tar.gz) = 16808
SHA256 (09efade03619.patch) = 096e4ed92b58e788be04766774b8eedc958d490fd5df35e51a239253ca1f8180
SIZE (09efade03619.patch) = 2551
SHA256 (91076a814ff2.patch) = 6060de2a8ae4fb5f3f244daccc42d3bce7d6ee42918234f1f2720ac36f12cb6b
SIZE (91076a814ff2.patch) = 10992
SHA256 (ec7337d1da05.patch) = fc6f8cc5fe86ed588d9d4115da88cc16c04a2a7fbcea851486f33c334cae3a24
SIZE (ec7337d1da05.patch) = 5944
SHA256 (4c1e00b7780f.patch) = 5520cdfc27951b72661ab7777e9cc6b551d8f30e6f9ec22e4544b25eab367c83
SIZE (4c1e00b7780f.patch) = 11749
SHA256 (1d703019d37a.patch) = 2b578d68cd96416c13f073238628691f63abecf6d2e6ab906d293062799075ca
SIZE (1d703019d37a.patch) = 6472
SHA256 (96dc85f79b0b.patch) = bdd39790b87ae771d94e03be730ac17db69427fa538d84724e555f4149b77e29
SIZE (96dc85f79b0b.patch) = 21980
SHA256 (8ab3e2366b32.patch) = d4cb57b295840b0a6553dec300acbaa40c212bd235481bfefac78e5ca855645a
SIZE (8ab3e2366b32.patch) = 11925
SHA256 (c279e3ad6104.patch) = 528ae5a9f06f06116863dae30918ea471a98522515ba43248ff53cbbf33d766e
SIZE (c279e3ad6104.patch) = 6679
SHA256 (9b429b84617c.patch) = 69b45a549a7b584276a6592c19f8434bde8b06173d93435c5c467995141678d4
SIZE (9b429b84617c.patch) = 3670
SHA256 (cc4650cc8a84.patch) = 48b09c977205f7107c4f26aae0a76797dc4702ab4a6af7db961d7cbad025d81f
SIZE (cc4650cc8a84.patch) = 4700
SHA256 (4233c859a602.patch) = 1ceafe906bc4a70f54450c3c80eafb0f443fe3165a232770c94a0a0f961352ac
SIZE (4233c859a602.patch) = 6093
SHA256 (c8880a62d365.patch) = f0873e838ac50206850d3673712a7d25d187003ff280f02379d5e23ead90221c
SIZE (c8880a62d365.patch) = 4616
SHA256 (abf034785ed2.patch) = 14704f7a15146ca03f958d119fa485d8265ea8201f06369bfe9453f49d9775f9
SIZE (abf034785ed2.patch) = 11178
SHA256 (d37bd764e826.patch) = 20e4cd888744e98f4cf84d9eef7649be0d2ad123673bd331f9004a9bf0a9add0
SIZE (d37bd764e826.patch) = 5944
SHA256 (d04bf0f3726d.patch) = f37978b6b8dc0db3c2122368e72fc0a9bda8b1fc74025ec01c9e12f72af15aa4
SIZE (d04bf0f3726d.patch) = 11749
SHA256 (098eed11d05e.patch) = 99a52b14914ee3178e5b555cbbe78db9b51cc9b51109cf6489867dcbee49e519
SIZE (098eed11d05e.patch) = 6472
SHA256 (931b5dfb8af9.patch) = 95e305c337d440e8f87abd67eff63fd03256f76a241757e9853fb5c74f98b8ad
SIZE (931b5dfb8af9.patch) = 21968
SHA256 (b2330ec6a431.patch) = 48016002a219483dacaafd5d0ecfa2e20abdbfdd03db2747be4d096efd1867cc
SIZE (b2330ec6a431.patch) = 11925
SHA256 (21e69958e168.patch) = af335daf474e5645bda2ba8a7a7febe112b13a60e9105581d4fb5b9d98d102ef
SIZE (21e69958e168.patch) = 6679
SHA256 (ffc1b3a3dd67.patch) = 9f6c8a107d1ab4c5811c10ea20b771f1f31dd5141086c23c5e537a6e664d31f0
SIZE (ffc1b3a3dd67.patch) = 3670
SHA256 (f736f4a65bc0.patch) = c4aac19b310cc7afe05450ec2aade85c7fac83774731d2885d19250b4645d1b9
SIZE (f736f4a65bc0.patch) = 4700
SHA256 (09b61318aa4f.patch) = b0b0b734581d9d0f2b28c71de67ee83ef113b2b052049a95fe1830b40ffa4d13
SIZE (09b61318aa4f.patch) = 6093
SHA256 (4c3d3bbd2ad4.patch) = 25877444f0908f1980b45cfe410471045a8f8778728fe54a481212699d8d240a
SIZE (4c3d3bbd2ad4.patch) = 4616

34
emulators/yuzu/files/patch-CMakeLists.txt
View File

@ -1,15 +1,27 @@
yuzu (Qt) currently needs SDL for input
--- CMakeLists.txt.orig 2020-06-29 05:12:38 UTC
--- CMakeLists.txt.orig 2021-04-16 17:36:48 UTC
+++ CMakeLists.txt
@@ -225,7 +225,9 @@ if(ENABLE_SDL2)
list(APPEND CMAKE_MODULE_PATH "${CONAN_SDL2_ROOT_RELEASE}")
list(APPEND CMAKE_PREFIX_PATH "${CONAN_SDL2_ROOT_RELEASE}")
endif()
- find_package(SDL2)
@@ -274,8 +274,12 @@ if (ENABLE_SDL2)
target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARY}")
target_include_directories(SDL2 INTERFACE "${SDL2_INCLUDE_DIR}")
else()
- find_package(SDL2 REQUIRED)
+ find_package(SDL2)
+ endif()
+endif()
+find_package(SDL2)
+if(ENABLE_SDL2)
if (NOT SDL2_FOUND)
# otherwise add this to the list of libraries to install
list(APPEND CONAN_REQUIRED_LIBS "sdl2/2.0.12@bincrafters/stable")
+if(SDL2_FOUND)
+ if(NOT YUZU_USE_BUNDLED_SDL2)
# Some installations don't set SDL2_LIBRARIES
if("${SDL2_LIBRARIES}" STREQUAL "")
message(WARNING "SDL2_LIBRARIES wasn't set, manually setting to SDL2::SDL2")
@@ -286,8 +290,6 @@ if (ENABLE_SDL2)
add_library(SDL2 INTERFACE)
target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARIES}")
endif()
-else()
- set(SDL2_FOUND NO)
endif()
# Install any missing dependencies with conan install

8
emulators/yuzu/files/patch-fmt
View File

@ -47,16 +47,16 @@ microinstruction.cpp:(.text._ZN3fmt2v76detail12format_valueIcN8Dynarmic2IR6Opcod
microinstruction.cpp:(.text._ZN3fmt2v76detail12format_valueIcN8Dynarmic2IR4TypeEEEvRNS1_6bufferIT_EERKT0_NS1_10locale_refE[_ZN3fmt2v76detail12format_valueIcN8Dynarmic2IR4TypeEEEvRNS1_6bufferIT_EERKT0_NS1_10locale_refE]+0x10f): undefined reference to `std::locale fmt::v7::detail::locale_ref::get<std::locale>() const'
collect2: error: ld returned 1 exit status
--- CMakeLists.txt.orig 2021-02-22 04:23:45 UTC
--- CMakeLists.txt.orig 2021-04-17 06:14:44 UTC
+++ CMakeLists.txt
@@ -165,7 +165,6 @@ macro(yuzu_find_packages)
@@ -166,7 +166,6 @@ macro(yuzu_find_packages)
set(REQUIRED_LIBS
# Cmake Pkg Prefix Version Conan Pkg
"Catch2 2.13 catch2/2.13.0"
- "fmt 7.1 fmt/7.1.2"
# can't use until https://github.com/bincrafters/community/issues/1173
#"libzip 1.5 libzip/1.5.2@bincrafters/stable"
"lz4 1.8 lz4/1.9.2"
"nlohmann_json 3.8 nlohmann_json/3.8.0"
"ZLIB 1.2 zlib/1.2.11"
--- externals/CMakeLists.txt.orig 2021-02-22 04:23:45 UTC
+++ externals/CMakeLists.txt
@@ -15,6 +15,10 @@ endif()