Date: Tue, 20 Apr 2021 00:49:27 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: f855bd67f546 - main - emulators/yuzu: update to s20210419 Message-ID: <202104200049.13K0nR1x037329@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=f855bd67f5462f331f4812697a2a90dd68d0484d commit f855bd67f5462f331f4812697a2a90dd68d0484d Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2021-04-19 21:30:36 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2021-04-20 00:46:57 +0000 emulators/yuzu: update to s20210419 Changes: https://github.com/yuzu-emu/yuzu/compare/ce921e0f2...0da84c4de --- emulators/yuzu/Makefile | 4 ++-- emulators/yuzu/distinfo | 6 +++--- emulators/yuzu/files/patch-CMakeLists.txt | 31 ++++++++++++++++--------------- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/emulators/yuzu/Makefile b/emulators/yuzu/Makefile index 50dac7190527..33f28badea7b 100644 --- a/emulators/yuzu/Makefile +++ b/emulators/yuzu/Makefile @@ -1,5 +1,5 @@ PORTNAME= yuzu -PORTVERSION= s20210417 +PORTVERSION= s20210419 PORTREVISION?= 0 CATEGORIES= emulators @@ -42,7 +42,7 @@ LIB_DEPENDS= liblz4.so:archivers/liblz4 \ USE_GITHUB= yes GH_ACCOUNT= yuzu-emu -GH_TAGNAME= ce921e0f2 +GH_TAGNAME= 0da84c4de 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 \ diff --git a/emulators/yuzu/distinfo b/emulators/yuzu/distinfo index 972a48ce0b2a..72c094a2f412 100644 --- a/emulators/yuzu/distinfo +++ b/emulators/yuzu/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1618684637 -SHA256 (yuzu-emu-yuzu-s20210417-ce921e0f2_GH0.tar.gz) = 19c957c8299a005ef6e72a2b17572d43aff4fba418809776d4927632e5cb5eb2 -SIZE (yuzu-emu-yuzu-s20210417-ce921e0f2_GH0.tar.gz) = 3795308 +TIMESTAMP = 1618867836 +SHA256 (yuzu-emu-yuzu-s20210419-0da84c4de_GH0.tar.gz) = 87031df2ab1eade83bca2f151893273566ce710705ac0517f3fd57a46d570c3b +SIZE (yuzu-emu-yuzu-s20210419-0da84c4de_GH0.tar.gz) = 3795217 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 diff --git a/emulators/yuzu/files/patch-CMakeLists.txt b/emulators/yuzu/files/patch-CMakeLists.txt index 02af027bd196..ec3911fb99a5 100644 --- a/emulators/yuzu/files/patch-CMakeLists.txt +++ b/emulators/yuzu/files/patch-CMakeLists.txt @@ -1,25 +1,26 @@ yuzu (Qt) currently needs SDL for input ---- CMakeLists.txt.orig 2021-04-16 17:36:48 UTC +--- CMakeLists.txt.orig 2021-04-19 21:30:36 UTC +++ CMakeLists.txt -@@ -274,8 +274,12 @@ if (ENABLE_SDL2) +@@ -273,9 +273,10 @@ if (ENABLE_SDL2) + add_library(SDL2 INTERFACE) target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARY}") target_include_directories(SDL2 INTERFACE "${SDL2_INCLUDE_DIR}") - else() -- find_package(SDL2 REQUIRED) -+ find_package(SDL2) +- else() +- find_package(SDL2 2.0.12) +- + endif() +endif() - -+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() ++if (NOT YUZU_USE_BUNDLED_SDL2) ++ find_package(SDL2 2.0.12) + if(SDL2_FOUND) + # Some installations don't set SDL2_LIBRARIES + if("${SDL2_LIBRARIES}" STREQUAL "") +@@ -287,9 +288,6 @@ if (ENABLE_SDL2) + add_library(SDL2 INTERFACE) + target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARIES}") + endif() +- endif() -else() - set(SDL2_FOUND NO) endif()
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104200049.13K0nR1x037329>