Index: devel/libepoll-shim/Makefile =================================================================== --- devel/libepoll-shim/Makefile +++ devel/libepoll-shim/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libepoll-shim -PORTVERSION= 0.0.20201229 +PORTVERSION= 0.0.20210213 CATEGORIES= devel MAINTAINER= x11@FreeBSD.org @@ -16,7 +16,7 @@ USE_GITHUB= yes GH_ACCOUNT= jiixyj GH_PROJECT= epoll-shim -GH_TAGNAME= 1c27d2d +GH_TAGNAME= c8491d3 PLIST_SUB= SHIM_EVENTFD="${exists(/usr/include/sys/eventfd.h):?@comment :}" do-test: Index: devel/libepoll-shim/distinfo =================================================================== --- devel/libepoll-shim/distinfo +++ devel/libepoll-shim/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1609265133 -SHA256 (jiixyj-epoll-shim-0.0.20201229-1c27d2d_GH0.tar.gz) = 38e33bab1066a733e611188e03e8501923c396efbb27e0ae936ad5ab9facc4a6 -SIZE (jiixyj-epoll-shim-0.0.20201229-1c27d2d_GH0.tar.gz) = 60751 +TIMESTAMP = 1613231831 +SHA256 (jiixyj-epoll-shim-0.0.20210213-c8491d3_GH0.tar.gz) = fb96e03509b26ef183f1a3743fd19295aa530752751b482ac747e034bc36bdbb +SIZE (jiixyj-epoll-shim-0.0.20210213-c8491d3_GH0.tar.gz) = 84283 Index: emulators/yuzu-qt5/Makefile =================================================================== --- emulators/yuzu-qt5/Makefile +++ emulators/yuzu-qt5/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= -qt5 MASTERDIR= ${.CURDIR}/../yuzu Index: emulators/yuzu/Makefile =================================================================== --- emulators/yuzu/Makefile +++ emulators/yuzu/Makefile @@ -1,23 +1,12 @@ # $FreeBSD$ PORTNAME= yuzu -PORTVERSION= s20210216 -PORTREVISION?= 0 +PORTVERSION= s20201218 +PORTREVISION?= 1 CATEGORIES= emulators PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= 905e8016a04e.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 MAINTAINER= jbeich@FreeBSD.org COMMENT= Nintendo Switch emulator/debugger @@ -35,8 +24,7 @@ ONLY_FOR_ARCHS_REASON= requires int128 BUILD_DEPENDS= catch>0:devel/catch \ - nlohmann-json>0:devel/nlohmann-json \ - glslangValidator:graphics/glslang + nlohmann-json>0:devel/nlohmann-json LIB_DEPENDS= liblz4.so:archivers/liblz4 \ libzstd.so:archivers/zstd \ libopus.so:audio/opus \ @@ -46,11 +34,11 @@ USE_GITHUB= yes GH_ACCOUNT= yuzu-emu -GH_TAGNAME= 6be0975bf +GH_TAGNAME= 0b47f7a46 GH_TUPLE= DarkLordZach:mbedtls:a280e60: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 \ - MerryMage:dynarmic:r3-278-g8c09da66:dynarmic/externals/dynarmic \ + MerryMage:dynarmic:r3-242-g0e1112b7:dynarmic/externals/dynarmic \ ReinUsesLisp:sirit:eefca56:sirit/externals/sirit \ arsenm:sanitizers-cmake:aab6948:sanitizers_cmake/externals/cubeb/cmake/sanitizers-cmake \ citra-emu:ext-soundtouch:060181e:soundtouch/externals/soundtouch \ Index: emulators/yuzu/distinfo =================================================================== --- emulators/yuzu/distinfo +++ emulators/yuzu/distinfo @@ -1,14 +1,14 @@ -TIMESTAMP = 1613510242 -SHA256 (yuzu-emu-yuzu-s20210216-6be0975bf_GH0.tar.gz) = 3581f2ed81c6537d116096f8c6aa4516cf7e8293ebd74c82321ff3e54ab05379 -SIZE (yuzu-emu-yuzu-s20210216-6be0975bf_GH0.tar.gz) = 3575718 +TIMESTAMP = 1608278232 +SHA256 (yuzu-emu-yuzu-s20201218-0b47f7a46_GH0.tar.gz) = be57025587658949cfc5a7584014c7eea2785012fc82b1ff23a64395d1383bb9 +SIZE (yuzu-emu-yuzu-s20201218-0b47f7a46_GH0.tar.gz) = 4062898 SHA256 (DarkLordZach-mbedtls-a280e60_GH0.tar.gz) = 4fc6ddc256bc75b975fd5ad8bb7d31ff79c62d49daafb0108585c9ef80c6c5a7 SIZE (DarkLordZach-mbedtls-a280e60_GH0.tar.gz) = 2283313 SHA256 (KhronosGroup-SPIRV-Headers-2c51218_GH0.tar.gz) = 08f70947b69e17c7e322156adcd471cf02b4b3f63e7baf8ee0f02d32603ac5ff SIZE (KhronosGroup-SPIRV-Headers-2c51218_GH0.tar.gz) = 280829 SHA256 (KhronosGroup-Vulkan-Headers-v1.2.145_GH0.tar.gz) = c8656969f0dc33f5f544b9449f02d66b7c9de67e6e58376c1cd4999694ab8517 SIZE (KhronosGroup-Vulkan-Headers-v1.2.145_GH0.tar.gz) = 766896 -SHA256 (MerryMage-dynarmic-r3-278-g8c09da66_GH0.tar.gz) = 1513c80c3972253311be7106595f9de13ad1575433ae43157f50535e337e9d3d -SIZE (MerryMage-dynarmic-r3-278-g8c09da66_GH0.tar.gz) = 1668319 +SHA256 (MerryMage-dynarmic-r3-242-g0e1112b7_GH0.tar.gz) = f552cb543bd8937dc145a780e6a11925f510b90b6fe281db44de93e74db07654 +SIZE (MerryMage-dynarmic-r3-242-g0e1112b7_GH0.tar.gz) = 1646910 SHA256 (ReinUsesLisp-sirit-eefca56_GH0.tar.gz) = cc95e8155e14e596526c378d0a3cc2bb4bfe7da68773a79f224d48f89b20685a SIZE (ReinUsesLisp-sirit-eefca56_GH0.tar.gz) = 22035 SHA256 (arsenm-sanitizers-cmake-aab6948_GH0.tar.gz) = d9009e17948aff769a6f6e16b52d4d8752c5cc2cab1e9c381d3a31fd1a680b58 @@ -25,25 +25,3 @@ SIZE (benhoyt-inih-r52_GH0.tar.gz) = 16808 SHA256 (905e8016a04e.patch) = cecc02f098917ee236ace0a350f37a9ffbb4aae92232f6c105a520476f7b23b5 SIZE (905e8016a04e.patch) = 2545 -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 Index: emulators/yuzu/files/patch-libc++ =================================================================== --- emulators/yuzu/files/patch-libc++ +++ /dev/null @@ -1,108 +0,0 @@ -In file included from src/core/arm/dynarmic/arm_dynarmic_64.cpp:18: -In file included from src/./core/hle/kernel/k_scheduler.h:14: -In file included from src/./core/hle/kernel/global_scheduler_context.h:14: -In file included from src/./core/hle/kernel/k_scheduler_lock.h:13: -In file included from src/./core/hle/kernel/k_thread.h:16: -src/./common/intrusive_red_black_tree.h:239:7: error: no template named 'convertible_to' in namespace 'std'; did you mean 'ConvertibleTo'? - ->std::convertible_to; - ^~~~~~~~~~~~~~~~~~~ - ConvertibleTo -src/./common/concepts.h:36:9: note: 'ConvertibleTo' declared here -concept ConvertibleTo = std::is_convertible_v; - ^ - -src/core/hle/kernel/k_scheduler.cpp:206:14: error: no member named 'atomic_ref' in namespace 'std' - std::atomic_ref prev_thread(kernel.Scheduler(static_cast(i)).prev_thread); - ~~~~~^ -src/core/hle/kernel/k_scheduler.cpp:206:25: error: 'KThread' does not refer to a value - std::atomic_ref prev_thread(kernel.Scheduler(static_cast(i)).prev_thread); - ^ -src/./core/hle/kernel/process.h:33:7: note: declared here -class KThread; - ^ -src/core/hle/kernel/k_scheduler.cpp:206:33: error: expected expression - std::atomic_ref prev_thread(kernel.Scheduler(static_cast(i)).prev_thread); - ^ -src/core/hle/kernel/k_scheduler.cpp:206:35: error: invalid use of member 'prev_thread' in static member function - std::atomic_ref prev_thread(kernel.Scheduler(static_cast(i)).prev_thread); - ^~~~~~~~~~~ -src/core/hle/kernel/k_scheduler.cpp:207:28: error: no member named 'atomic_ref' in namespace 'std' - static_assert(std::atomic_ref::is_always_lock_free); - ~~~~~^ -src/core/hle/kernel/k_scheduler.cpp:207:39: error: 'KThread' does not refer to a value - static_assert(std::atomic_ref::is_always_lock_free); - ^ -src/./core/hle/kernel/process.h:33:7: note: declared here -class KThread; - ^ -src/core/hle/kernel/k_scheduler.cpp:207:47: error: expected expression - static_assert(std::atomic_ref::is_always_lock_free); - ^ -src/core/hle/kernel/k_scheduler.cpp:207:50: error: no member named 'is_always_lock_free' in the global namespace; did you mean '__atomic_always_lock_free'? - static_assert(std::atomic_ref::is_always_lock_free); - ~~^~~~~~~~~~~~~~~~~~~ - __atomic_always_lock_free -/usr/include/c++/v1/atomic:1578:55: note: '__atomic_always_lock_free' declared here - static _LIBCPP_CONSTEXPR bool is_always_lock_free = __atomic_always_lock_free(sizeof(__a_), 0); - ^ -src/core/hle/kernel/k_scheduler.cpp:211:9: error: invalid use of member 'prev_thread' in static member function - prev_thread.compare_exchange_strong(compare, nullptr); - ^~~~~~~~~~~ - ---- src/common/intrusive_red_black_tree.h.orig 2021-02-16 21:17:22 UTC -+++ src/common/intrusive_red_black_tree.h -@@ -4,6 +4,7 @@ - - #pragma once - -+#include "common/concepts.h" - #include "common/parent_of_member.h" - #include "common/tree.h" - -@@ -236,7 +237,7 @@ class IntrusiveRedBlackTreeImpl { (public) - template - concept HasLightCompareType = requires { - { std::is_same::value } -- ->std::convertible_to; -+ ->Common::ConvertibleTo; - }; - - namespace impl { ---- src/core/hle/kernel/k_scheduler.cpp~ 2021-02-16 21:17:22.000000000 +0000 -+++ src/core/hle/kernel/k_scheduler.cpp 2021-02-17 20:59:35.953795140 +0000 -@@ -23,6 +23,35 @@ - #include "core/hle/kernel/process.h" - #include "core/hle/kernel/time_manager.h" - -+#ifdef _LIBCPP_VERSION -+_LIBCPP_BEGIN_NAMESPACE_STD -+template -+struct atomic_ref // since C++20 -+{ -+ static constexpr bool is_always_lock_free = __atomic_always_lock_free(sizeof(__cxx_atomic_impl::__a_value), 0); -+ static constexpr size_t required_alignment = alignment_of::__a_value)>::value; -+ -+ explicit atomic_ref(T& obj) noexcept; -+ atomic_ref(const atomic_ref&) noexcept; -+ T operator=(T desired) const noexcept; -+ atomic_ref& operator=(const atomic_ref&) = delete; -+ -+ bool is_lock_free() const noexcept; -+ void store(T desr, memory_order m = memory_order_seq_cst) const noexcept; -+ T load(memory_order m = memory_order_seq_cst) const noexcept; -+ operator T() const noexcept; -+ T exchange(T desr, memory_order m = memory_order_seq_cst) const noexcept; -+ bool compare_exchange_weak(T& expc, T desr, memory_order s, memory_order f) const noexcept; -+ bool compare_exchange_strong(T& expc, T desr, -+ memory_order s, memory_order f) const noexcept; -+ bool compare_exchange_weak(T& expc, T desr, -+ memory_order m = memory_order_seq_cst) const noexcept; -+ bool compare_exchange_strong(T& expc, T desr, -+ memory_order m = memory_order_seq_cst) const noexcept; -+}; -+_LIBCPP_END_NAMESPACE_STD -+#endif -+ - namespace Kernel { - - static void IncrementScheduledCount(Kernel::KThread* thread) { Index: emulators/yuzu/files/patch-libc++10 =================================================================== --- emulators/yuzu/files/patch-libc++10 +++ /dev/null @@ -1,74 +0,0 @@ -Drop after FreeBSD 12.2/13.0 EOL. See https://github.com/llvm/llvm-project/commit/601f7631827a - -In file included from src/core/arm/dynarmic/arm_dynarmic_64.cpp:18: -In file included from src/./core/hle/kernel/k_scheduler.h:14: -In file included from src/./core/hle/kernel/global_scheduler_context.h:13: -src/./core/hle/kernel/k_priority_queue.h:12:10: fatal error: 'concepts' file not found -#include - ^~~~~~~~~~ - ---- src/core/hle/kernel/k_priority_queue.h.orig 2021-02-07 14:20:47 UTC -+++ src/core/hle/kernel/k_priority_queue.h -@@ -9,7 +9,29 @@ - - #include - #include -+#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 12000 -+_LIBCPP_BEGIN_NAMESPACE_STD -+#ifndef _LIBCPP_CONCEPTS -+#define _LIBCPP_CONCEPTS -+ -+// [concept.same] -+ -+template -+concept __same_as_impl = _VSTD::_IsSame<_Tp, _Up>::value; -+ -+template -+concept same_as = __same_as_impl<_Tp, _Up> && __same_as_impl<_Up, _Tp>; -+ -+// [concept.destructible] -+ -+template -+concept destructible = _VSTD::is_nothrow_destructible_v<_Tp>; -+ -+#endif //_LIBCPP_CONCEPTS -+_LIBCPP_END_NAMESPACE_STD -+#else - #include -+#endif - - #include "common/assert.h" - #include "common/bit_set.h" ---- src/core/hle/kernel/k_scoped_lock.h.orig 2021-02-07 14:20:47 UTC -+++ src/core/hle/kernel/k_scoped_lock.h -@@ -7,6 +7,30 @@ - - #pragma once - -+#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 12000 -+_LIBCPP_BEGIN_NAMESPACE_STD -+#ifndef _LIBCPP_CONCEPTS -+#define _LIBCPP_CONCEPTS -+ -+// [concept.same] -+ -+template -+concept __same_as_impl = _VSTD::_IsSame<_Tp, _Up>::value; -+ -+template -+concept same_as = __same_as_impl<_Tp, _Up> && __same_as_impl<_Up, _Tp>; -+ -+// [concept.destructible] -+ -+template -+concept destructible = _VSTD::is_nothrow_destructible_v<_Tp>; -+ -+#endif //_LIBCPP_CONCEPTS -+_LIBCPP_END_NAMESPACE_STD -+#else -+#include -+#endif -+ - #include "common/common_types.h" - - namespace Kernel { Index: emulators/yuzu/files/patch-zstd =================================================================== --- emulators/yuzu/files/patch-zstd +++ /dev/null @@ -1,13 +0,0 @@ -https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=251957 - ---- CMakeLists.txt.orig -+++ CMakeLists.txt -@@ -166,7 +166,7 @@ macro(yuzu_find_packages) - # we need to be careful as the version check might be broken https://github.com/xiph/opus/issues/110 - "opus 1.3 opus/1.3.1" - "ZLIB 1.2 zlib/1.2.11" -- "zstd 1.4 zstd/1.4.8" -+ "zstd 1.4 zstd/1.4.5" - ) - - foreach(PACKAGE ${REQUIRED_LIBS})