From 56e723e5d3d8d8fad91a8f3ecde98b2f34cc3de6 Mon Sep 17 00:00:00 2001 From: Yuri Victorovich Date: Wed, 26 Jul 2023 09:52:41 -0700 Subject: [PATCH] =?UTF-8?q?devel/eastl:=20Update=203.13.06=20=E2=86=92=203?= =?UTF-8?q?.21.12-9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reported by: portscout --- devel/eastl/Makefile | 17 +- devel/eastl/distinfo | 18 ++- devel/eastl/files/patch-CMakeLists.txt | 11 -- ..._include_Common_EABase_config_eaplatform.h | 4 +- ...ce_unix_eathread__pthread__stack__info.cpp | 10 ++ ...ead_source_unix_eathread__thread__unix.cpp | 11 ++ devel/eastl/pkg-plist | 150 +++++++++++++++++- 7 files changed, 196 insertions(+), 25 deletions(-) delete mode 100644 devel/eastl/files/patch-CMakeLists.txt create mode 100644 devel/eastl/files/patch-test_packages_EAThread_source_unix_eathread__pthread__stack__info.cpp create mode 100644 devel/eastl/files/patch-test_packages_EAThread_source_unix_eathread__thread__unix.cpp diff --git a/devel/eastl/Makefile b/devel/eastl/Makefile index 7850c2dc5c514..066587b90fe60 100644 --- a/devel/eastl/Makefile +++ b/devel/eastl/Makefile @@ -1,6 +1,6 @@ PORTNAME= eastl -DISTVERSION= 3.13.06 -PORTREVISION= 1 +DISTVERSION= 3.21.12-9 +DISTVERSIONSUFFIX= -g089eb20 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org @@ -13,11 +13,20 @@ LICENSE_FILE= ${WRKSRC}/LICENSE NOT_FOR_ARCHS= aarch64 riscv64 NOT_FOR_ARCHS_REASON= test/packages/EABase/include/Common/EABase/config/eaplatform.h:436:4: error: Unknown processor -USES= cmake compiler:c++14-lang +USES= cmake compiler:c++17-lang +USE_LDCONFIG= yes + USE_GITHUB= yes GH_ACCOUNT= electronicarts GH_PROJECT= ${PORTNAME:tu} -USE_LDCONFIG= yes +GH_TUPLE= electronicarts:EAAssert:e5e1812:EAAssert/test/packages/EAAssert \ + electronicarts:EABase:521cb05:EABase/test/packages/EABase \ + electronicarts:EAMain:24ca8bf:EAMain/test/packages/EAMain \ + electronicarts:EAStdC:8dc9e31:EAStdC/test/packages/EAStdC \ + electronicarts:EATest:a59b372:EATest/test/packages/EATest \ + electronicarts:EAThread:e4367a3:EAThread/test/packages/EAThread + +CMAKE_ON= BUILD_SHARED_LIBS do-test: @cd ${BUILD_WRKSRC} && \ diff --git a/devel/eastl/distinfo b/devel/eastl/distinfo index 4dcb7cf846057..09029c2816a6f 100644 --- a/devel/eastl/distinfo +++ b/devel/eastl/distinfo @@ -1,3 +1,15 @@ -TIMESTAMP = 1559399820 -SHA256 (electronicarts-EASTL-3.13.06_GH0.tar.gz) = d3daca9bab7a0c3f56c421a10acd7af8b2c485b9f00c03366c18ce8a2ba5aab3 -SIZE (electronicarts-EASTL-3.13.06_GH0.tar.gz) = 1268953 +TIMESTAMP = 1690389308 +SHA256 (electronicarts-EASTL-3.21.12-9-g089eb20_GH0.tar.gz) = 9898d50426989cfa276566d48ede1f00a71a8f65e4c8da19cef23b1e28383814 +SIZE (electronicarts-EASTL-3.21.12-9-g089eb20_GH0.tar.gz) = 1632921 +SHA256 (electronicarts-EAAssert-e5e1812_GH0.tar.gz) = 8660218682e7712587af0f59dc5826727b56072d3221be20fcaea91fd6726046 +SIZE (electronicarts-EAAssert-e5e1812_GH0.tar.gz) = 15403 +SHA256 (electronicarts-EABase-521cb05_GH0.tar.gz) = 7da80c0b4dce8fe2fee677cacdd257366fcd9b2769a7ca375825f7a44df33e13 +SIZE (electronicarts-EABase-521cb05_GH0.tar.gz) = 105291 +SHA256 (electronicarts-EAMain-24ca8bf_GH0.tar.gz) = 13537f4b20a75c782f32049c6a989abf6e5dc499f2c951475040142a390d20aa +SIZE (electronicarts-EAMain-24ca8bf_GH0.tar.gz) = 34122 +SHA256 (electronicarts-EAStdC-8dc9e31_GH0.tar.gz) = 35417ad9c28237186a1a935191f4a2a90165f9ed4921e6ab819c866cf2c29654 +SIZE (electronicarts-EAStdC-8dc9e31_GH0.tar.gz) = 564039 +SHA256 (electronicarts-EATest-a59b372_GH0.tar.gz) = 0a7f74b727103c8aa8a6fce80435b8647bb0396256388aef1a8d0baac2195389 +SIZE (electronicarts-EATest-a59b372_GH0.tar.gz) = 37119 +SHA256 (electronicarts-EAThread-e4367a3_GH0.tar.gz) = 166bf97bfbd7ff543fe8d6356b308544f14385154dde8859f75efba8f12e3982 +SIZE (electronicarts-EAThread-e4367a3_GH0.tar.gz) = 282041 diff --git a/devel/eastl/files/patch-CMakeLists.txt b/devel/eastl/files/patch-CMakeLists.txt deleted file mode 100644 index d268de39c2419..0000000000000 --- a/devel/eastl/files/patch-CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- CMakeLists.txt.orig 2018-09-01 07:06:11 UTC -+++ CMakeLists.txt -@@ -43,7 +43,7 @@ add_definitions(-DEASTL_OPENSOURCE=1) - # Library definition - #------------------------------------------------------------------------------------------- - file(GLOB EASTL_SOURCES "source/*.cpp" "include/EASTL/*.h" "include/EASTL/bonus/*.h") --add_library(EASTL ${EASTL_SOURCES}) -+add_library(EASTL SHARED ${EASTL_SOURCES}) - include_directories("include") - - #------------------------------------------------------------------------------------------- diff --git a/devel/eastl/files/patch-test_packages_EABase_include_Common_EABase_config_eaplatform.h b/devel/eastl/files/patch-test_packages_EABase_include_Common_EABase_config_eaplatform.h index 23bbbb2718528..1eb9a584c8563 100644 --- a/devel/eastl/files/patch-test_packages_EABase_include_Common_EABase_config_eaplatform.h +++ b/devel/eastl/files/patch-test_packages_EABase_include_Common_EABase_config_eaplatform.h @@ -1,6 +1,6 @@ ---- test/packages/EABase/include/Common/EABase/config/eaplatform.h.orig 2019-10-23 16:31:46 UTC +--- test/packages/EABase/include/Common/EABase/config/eaplatform.h.orig 2022-02-09 23:55:09 UTC +++ test/packages/EABase/include/Common/EABase/config/eaplatform.h -@@ -449,6 +449,11 @@ +@@ -454,6 +454,11 @@ #define EA_PROCESSOR_POWERPC_32 1 #define EA_SYSTEM_BIG_ENDIAN 1 #define EA_PLATFORM_DESCRIPTION "BSD on PowerPC" diff --git a/devel/eastl/files/patch-test_packages_EAThread_source_unix_eathread__pthread__stack__info.cpp b/devel/eastl/files/patch-test_packages_EAThread_source_unix_eathread__pthread__stack__info.cpp new file mode 100644 index 0000000000000..387cbd7fe3c1f --- /dev/null +++ b/devel/eastl/files/patch-test_packages_EAThread_source_unix_eathread__pthread__stack__info.cpp @@ -0,0 +1,10 @@ +--- test/packages/EAThread/source/unix/eathread_pthread_stack_info.cpp.orig 2023-07-26 16:32:58 UTC ++++ test/packages/EAThread/source/unix/eathread_pthread_stack_info.cpp +@@ -5,6 +5,7 @@ + + #include + #include ++#include + + #if defined(EA_PLATFORM_UNIX) || defined(EA_PLATFORM_APPLE) + #include diff --git a/devel/eastl/files/patch-test_packages_EAThread_source_unix_eathread__thread__unix.cpp b/devel/eastl/files/patch-test_packages_EAThread_source_unix_eathread__thread__unix.cpp new file mode 100644 index 0000000000000..a568a10662b23 --- /dev/null +++ b/devel/eastl/files/patch-test_packages_EAThread_source_unix_eathread__thread__unix.cpp @@ -0,0 +1,11 @@ +--- test/packages/EAThread/source/unix/eathread_thread_unix.cpp.orig 2023-07-26 16:30:35 UTC ++++ test/packages/EAThread/source/unix/eathread_thread_unix.cpp +@@ -10,6 +10,8 @@ + #include + #include "eathread/internal/eathread_global.h" + ++#include ++ + + #if defined(EA_PLATFORM_UNIX) || EA_POSIX_THREADS_AVAILABLE + #include diff --git a/devel/eastl/pkg-plist b/devel/eastl/pkg-plist index b488966b40814..f413892055b98 100644 --- a/devel/eastl/pkg-plist +++ b/devel/eastl/pkg-plist @@ -1,6 +1,7 @@ include/EABase/config/eacompiler.h include/EABase/config/eacompilertraits.h include/EABase/config/eaplatform.h +include/EABase/config/eaplatform.h.orig include/EABase/eabase.h include/EABase/eahave.h include/EABase/earesult.h @@ -14,6 +15,8 @@ include/EASTL/allocator.h include/EASTL/allocator_malloc.h include/EASTL/any.h include/EASTL/array.h +include/EASTL/atomic.h +include/EASTL/bit.h include/EASTL/bitset.h include/EASTL/bitvector.h include/EASTL/bonus/adaptors.h @@ -24,15 +27,17 @@ include/EASTL/bonus/fixed_tuple_vector.h include/EASTL/bonus/intrusive_sdlist.h include/EASTL/bonus/intrusive_slist.h include/EASTL/bonus/list_map.h -include/EASTL/bonus/ring_buffer.h include/EASTL/bonus/lru_cache.h +include/EASTL/bonus/overloaded.h +include/EASTL/bonus/ring_buffer.h include/EASTL/bonus/sort_extra.h -include/EASTL/bonus/sparse_matrix.h include/EASTL/bonus/tuple_vector.h include/EASTL/chrono.h +include/EASTL/compare.h include/EASTL/core_allocator.h include/EASTL/core_allocator_adapter.h include/EASTL/deque.h +include/EASTL/finally.h include/EASTL/fixed_allocator.h include/EASTL/fixed_function.h include/EASTL/fixed_hash_map.h @@ -49,8 +54,142 @@ include/EASTL/hash_map.h include/EASTL/hash_set.h include/EASTL/heap.h include/EASTL/initializer_list.h -include/EASTL/internal/allocator_traits.h -include/EASTL/internal/allocator_traits_fwd_decls.h +include/EASTL/internal/atomic/arch/arch.h +include/EASTL/internal/atomic/arch/arch_add_fetch.h +include/EASTL/internal/atomic/arch/arch_and_fetch.h +include/EASTL/internal/atomic/arch/arch_cmpxchg_strong.h +include/EASTL/internal/atomic/arch/arch_cmpxchg_weak.h +include/EASTL/internal/atomic/arch/arch_compiler_barrier.h +include/EASTL/internal/atomic/arch/arch_cpu_pause.h +include/EASTL/internal/atomic/arch/arch_exchange.h +include/EASTL/internal/atomic/arch/arch_fetch_add.h +include/EASTL/internal/atomic/arch/arch_fetch_and.h +include/EASTL/internal/atomic/arch/arch_fetch_or.h +include/EASTL/internal/atomic/arch/arch_fetch_sub.h +include/EASTL/internal/atomic/arch/arch_fetch_xor.h +include/EASTL/internal/atomic/arch/arch_load.h +include/EASTL/internal/atomic/arch/arch_memory_barrier.h +include/EASTL/internal/atomic/arch/arch_or_fetch.h +include/EASTL/internal/atomic/arch/arch_signal_fence.h +include/EASTL/internal/atomic/arch/arch_store.h +include/EASTL/internal/atomic/arch/arch_sub_fetch.h +include/EASTL/internal/atomic/arch/arch_thread_fence.h +include/EASTL/internal/atomic/arch/arch_xor_fetch.h +include/EASTL/internal/atomic/arch/arm/arch_arm.h +include/EASTL/internal/atomic/arch/arm/arch_arm_load.h +include/EASTL/internal/atomic/arch/arm/arch_arm_memory_barrier.h +include/EASTL/internal/atomic/arch/arm/arch_arm_store.h +include/EASTL/internal/atomic/arch/arm/arch_arm_thread_fence.h +include/EASTL/internal/atomic/arch/x86/arch_x86.h +include/EASTL/internal/atomic/arch/x86/arch_x86_add_fetch.h +include/EASTL/internal/atomic/arch/x86/arch_x86_and_fetch.h +include/EASTL/internal/atomic/arch/x86/arch_x86_cmpxchg_strong.h +include/EASTL/internal/atomic/arch/x86/arch_x86_cmpxchg_weak.h +include/EASTL/internal/atomic/arch/x86/arch_x86_exchange.h +include/EASTL/internal/atomic/arch/x86/arch_x86_fetch_add.h +include/EASTL/internal/atomic/arch/x86/arch_x86_fetch_and.h +include/EASTL/internal/atomic/arch/x86/arch_x86_fetch_or.h +include/EASTL/internal/atomic/arch/x86/arch_x86_fetch_sub.h +include/EASTL/internal/atomic/arch/x86/arch_x86_fetch_xor.h +include/EASTL/internal/atomic/arch/x86/arch_x86_load.h +include/EASTL/internal/atomic/arch/x86/arch_x86_memory_barrier.h +include/EASTL/internal/atomic/arch/x86/arch_x86_or_fetch.h +include/EASTL/internal/atomic/arch/x86/arch_x86_store.h +include/EASTL/internal/atomic/arch/x86/arch_x86_sub_fetch.h +include/EASTL/internal/atomic/arch/x86/arch_x86_thread_fence.h +include/EASTL/internal/atomic/arch/x86/arch_x86_xor_fetch.h +include/EASTL/internal/atomic/atomic.h +include/EASTL/internal/atomic/atomic_asserts.h +include/EASTL/internal/atomic/atomic_base_width.h +include/EASTL/internal/atomic/atomic_casts.h +include/EASTL/internal/atomic/atomic_flag.h +include/EASTL/internal/atomic/atomic_flag_standalone.h +include/EASTL/internal/atomic/atomic_integral.h +include/EASTL/internal/atomic/atomic_macros.h +include/EASTL/internal/atomic/atomic_macros/atomic_macros.h +include/EASTL/internal/atomic/atomic_macros/atomic_macros_add_fetch.h +include/EASTL/internal/atomic/atomic_macros/atomic_macros_and_fetch.h +include/EASTL/internal/atomic/atomic_macros/atomic_macros_base.h +include/EASTL/internal/atomic/atomic_macros/atomic_macros_cmpxchg_strong.h +include/EASTL/internal/atomic/atomic_macros/atomic_macros_cmpxchg_weak.h +include/EASTL/internal/atomic/atomic_macros/atomic_macros_compiler_barrier.h +include/EASTL/internal/atomic/atomic_macros/atomic_macros_cpu_pause.h +include/EASTL/internal/atomic/atomic_macros/atomic_macros_exchange.h +include/EASTL/internal/atomic/atomic_macros/atomic_macros_fetch_add.h +include/EASTL/internal/atomic/atomic_macros/atomic_macros_fetch_and.h +include/EASTL/internal/atomic/atomic_macros/atomic_macros_fetch_or.h +include/EASTL/internal/atomic/atomic_macros/atomic_macros_fetch_sub.h +include/EASTL/internal/atomic/atomic_macros/atomic_macros_fetch_xor.h +include/EASTL/internal/atomic/atomic_macros/atomic_macros_load.h +include/EASTL/internal/atomic/atomic_macros/atomic_macros_memory_barrier.h +include/EASTL/internal/atomic/atomic_macros/atomic_macros_or_fetch.h +include/EASTL/internal/atomic/atomic_macros/atomic_macros_signal_fence.h +include/EASTL/internal/atomic/atomic_macros/atomic_macros_store.h +include/EASTL/internal/atomic/atomic_macros/atomic_macros_sub_fetch.h +include/EASTL/internal/atomic/atomic_macros/atomic_macros_thread_fence.h +include/EASTL/internal/atomic/atomic_macros/atomic_macros_xor_fetch.h +include/EASTL/internal/atomic/atomic_memory_order.h +include/EASTL/internal/atomic/atomic_pointer.h +include/EASTL/internal/atomic/atomic_size_aligned.h +include/EASTL/internal/atomic/atomic_standalone.h +include/EASTL/internal/atomic/compiler/compiler.h +include/EASTL/internal/atomic/compiler/compiler_add_fetch.h +include/EASTL/internal/atomic/compiler/compiler_and_fetch.h +include/EASTL/internal/atomic/compiler/compiler_barrier.h +include/EASTL/internal/atomic/compiler/compiler_cmpxchg_strong.h +include/EASTL/internal/atomic/compiler/compiler_cmpxchg_weak.h +include/EASTL/internal/atomic/compiler/compiler_cpu_pause.h +include/EASTL/internal/atomic/compiler/compiler_exchange.h +include/EASTL/internal/atomic/compiler/compiler_fetch_add.h +include/EASTL/internal/atomic/compiler/compiler_fetch_and.h +include/EASTL/internal/atomic/compiler/compiler_fetch_or.h +include/EASTL/internal/atomic/compiler/compiler_fetch_sub.h +include/EASTL/internal/atomic/compiler/compiler_fetch_xor.h +include/EASTL/internal/atomic/compiler/compiler_load.h +include/EASTL/internal/atomic/compiler/compiler_memory_barrier.h +include/EASTL/internal/atomic/compiler/compiler_or_fetch.h +include/EASTL/internal/atomic/compiler/compiler_signal_fence.h +include/EASTL/internal/atomic/compiler/compiler_store.h +include/EASTL/internal/atomic/compiler/compiler_sub_fetch.h +include/EASTL/internal/atomic/compiler/compiler_thread_fence.h +include/EASTL/internal/atomic/compiler/compiler_xor_fetch.h +include/EASTL/internal/atomic/compiler/gcc/compiler_gcc.h +include/EASTL/internal/atomic/compiler/gcc/compiler_gcc_add_fetch.h +include/EASTL/internal/atomic/compiler/gcc/compiler_gcc_and_fetch.h +include/EASTL/internal/atomic/compiler/gcc/compiler_gcc_barrier.h +include/EASTL/internal/atomic/compiler/gcc/compiler_gcc_cmpxchg_strong.h +include/EASTL/internal/atomic/compiler/gcc/compiler_gcc_cmpxchg_weak.h +include/EASTL/internal/atomic/compiler/gcc/compiler_gcc_cpu_pause.h +include/EASTL/internal/atomic/compiler/gcc/compiler_gcc_exchange.h +include/EASTL/internal/atomic/compiler/gcc/compiler_gcc_fetch_add.h +include/EASTL/internal/atomic/compiler/gcc/compiler_gcc_fetch_and.h +include/EASTL/internal/atomic/compiler/gcc/compiler_gcc_fetch_or.h +include/EASTL/internal/atomic/compiler/gcc/compiler_gcc_fetch_sub.h +include/EASTL/internal/atomic/compiler/gcc/compiler_gcc_fetch_xor.h +include/EASTL/internal/atomic/compiler/gcc/compiler_gcc_load.h +include/EASTL/internal/atomic/compiler/gcc/compiler_gcc_or_fetch.h +include/EASTL/internal/atomic/compiler/gcc/compiler_gcc_signal_fence.h +include/EASTL/internal/atomic/compiler/gcc/compiler_gcc_store.h +include/EASTL/internal/atomic/compiler/gcc/compiler_gcc_sub_fetch.h +include/EASTL/internal/atomic/compiler/gcc/compiler_gcc_thread_fence.h +include/EASTL/internal/atomic/compiler/gcc/compiler_gcc_xor_fetch.h +include/EASTL/internal/atomic/compiler/msvc/compiler_msvc.h +include/EASTL/internal/atomic/compiler/msvc/compiler_msvc_add_fetch.h +include/EASTL/internal/atomic/compiler/msvc/compiler_msvc_and_fetch.h +include/EASTL/internal/atomic/compiler/msvc/compiler_msvc_barrier.h +include/EASTL/internal/atomic/compiler/msvc/compiler_msvc_cmpxchg_strong.h +include/EASTL/internal/atomic/compiler/msvc/compiler_msvc_cmpxchg_weak.h +include/EASTL/internal/atomic/compiler/msvc/compiler_msvc_cpu_pause.h +include/EASTL/internal/atomic/compiler/msvc/compiler_msvc_exchange.h +include/EASTL/internal/atomic/compiler/msvc/compiler_msvc_fetch_add.h +include/EASTL/internal/atomic/compiler/msvc/compiler_msvc_fetch_and.h +include/EASTL/internal/atomic/compiler/msvc/compiler_msvc_fetch_or.h +include/EASTL/internal/atomic/compiler/msvc/compiler_msvc_fetch_sub.h +include/EASTL/internal/atomic/compiler/msvc/compiler_msvc_fetch_xor.h +include/EASTL/internal/atomic/compiler/msvc/compiler_msvc_or_fetch.h +include/EASTL/internal/atomic/compiler/msvc/compiler_msvc_signal_fence.h +include/EASTL/internal/atomic/compiler/msvc/compiler_msvc_sub_fetch.h +include/EASTL/internal/atomic/compiler/msvc/compiler_msvc_xor_fetch.h include/EASTL/internal/char_traits.h include/EASTL/internal/config.h include/EASTL/internal/copy_help.h @@ -68,7 +207,6 @@ include/EASTL/internal/integer_sequence.h include/EASTL/internal/intrusive_hashtable.h include/EASTL/internal/mem_fn.h include/EASTL/internal/memory_base.h -include/EASTL/internal/meta.h include/EASTL/internal/move_help.h include/EASTL/internal/pair_fwd_decls.h include/EASTL/internal/piecewise_construct_t.h @@ -77,10 +215,12 @@ include/EASTL/internal/smart_ptr.h include/EASTL/internal/thread_support.h include/EASTL/internal/tuple_fwd_decls.h include/EASTL/internal/type_compound.h +include/EASTL/internal/type_detected.h include/EASTL/internal/type_fundamental.h include/EASTL/internal/type_pod.h include/EASTL/internal/type_properties.h include/EASTL/internal/type_transformations.h +include/EASTL/internal/type_void_t.h include/EASTL/intrusive_hash_map.h include/EASTL/intrusive_hash_set.h include/EASTL/intrusive_list.h