git: 67f94fc870e0 - main - devel/corrade: update 2020.06-1214 → 2020.06-1783
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 09 Nov 2024 15:43:23 UTC
The branch main has been updated by yuri:
URL: https://cgit.FreeBSD.org/ports/commit/?id=67f94fc870e062588b8cfd585b06a9a7d2be5851
commit 67f94fc870e062588b8cfd585b06a9a7d2be5851
Author: Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2024-11-09 07:54:46 +0000
Commit: Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2024-11-09 15:43:10 +0000
devel/corrade: update 2020.06-1214 → 2020.06-1783
---
devel/corrade/Makefile | 12 ++++---
devel/corrade/distinfo | 10 +++---
devel/corrade/files/patch-src_Corrade_Cpu.cpp | 34 -------------------
devel/corrade/files/patch-src_Corrade_Cpu.h | 38 ----------------------
..._Corrade_Utility_Implementation_ErrorString.cpp | 11 -------
.../files/patch-src_Corrade_Utility_Path.cpp | 33 -------------------
devel/corrade/pkg-plist | 9 +++--
7 files changed, 19 insertions(+), 128 deletions(-)
diff --git a/devel/corrade/Makefile b/devel/corrade/Makefile
index 63fd1de88131..9056df1e2867 100644
--- a/devel/corrade/Makefile
+++ b/devel/corrade/Makefile
@@ -1,13 +1,13 @@
PORTNAME= corrade
DISTVERSIONPREFIX= v
-DISTVERSION= 2020.06-1214
-DISTVERSIONSUFFIX= -g3bf6057d
-PORTREVISION= 1
+DISTVERSION= 2020.06-1783
+DISTVERSIONSUFFIX= -gd83e30e5
CATEGORIES= devel
MAINTAINER= yuri@FreeBSD.org
COMMENT= C++11/C++14 multiplatform utility library
-WWW= https://magnum.graphics/corrade/
+WWW= https://magnum.graphics/corrade/ \
+ https://github.com/mosra/corrade
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
@@ -20,7 +20,7 @@ USE_LDCONFIG= yes
USE_GITHUB= yes
GH_ACCOUNT= mosra
-GH_TUPLE= mosra:toolchains:65568a9:toolchains/toolchains
+GH_TUPLE= mosra:toolchains:2243706:toolchains/toolchains
CMAKE_ARGS= -DLIB_SUFFIX:STRING=""
@@ -36,4 +36,6 @@ post-patch:
${WRKSRC}/src/Corrade/Utility/StlForwardTuple.h
.endif
+# tests: 97% tests passed, 5 tests failed out of 143, see https://github.com/mosra/corrade/issues/189
+
.include <bsd.port.post.mk>
diff --git a/devel/corrade/distinfo b/devel/corrade/distinfo
index 36de5d026fc8..29d8975d851f 100644
--- a/devel/corrade/distinfo
+++ b/devel/corrade/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1673825651
-SHA256 (mosra-corrade-v2020.06-1214-g3bf6057d_GH0.tar.gz) = ba3b5700e7a55d5cc8eb95f2dce3c4ce51cd768eed35e154d17e9161247e422c
-SIZE (mosra-corrade-v2020.06-1214-g3bf6057d_GH0.tar.gz) = 1217362
-SHA256 (mosra-toolchains-65568a9_GH0.tar.gz) = 5b2b519c288d4148c9b9d6c9141d520b70360ba6b4606d0542ed7d63c81ba681
-SIZE (mosra-toolchains-65568a9_GH0.tar.gz) = 7978
+TIMESTAMP = 1731137069
+SHA256 (mosra-corrade-v2020.06-1783-gd83e30e5_GH0.tar.gz) = 2cfa651604a1e0d33f6efaeab5ea1655d83db6161cd9da66688e51b6a3de9f28
+SIZE (mosra-corrade-v2020.06-1783-gd83e30e5_GH0.tar.gz) = 1449790
+SHA256 (mosra-toolchains-2243706_GH0.tar.gz) = 4103ccdf4cdebb35acf8671e40aeb49e204456523acfaf8510473d3c200dc12b
+SIZE (mosra-toolchains-2243706_GH0.tar.gz) = 12312
diff --git a/devel/corrade/files/patch-src_Corrade_Cpu.cpp b/devel/corrade/files/patch-src_Corrade_Cpu.cpp
deleted file mode 100644
index aab22a1bb3fd..000000000000
--- a/devel/corrade/files/patch-src_Corrade_Cpu.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
---- src/Corrade/Cpu.cpp.orig 2023-05-22 11:59:16 UTC
-+++ src/Corrade/Cpu.cpp
-@@ -34,7 +34,7 @@
- /** @todo these are indented to work around acme.py extracting them to the top,
- fix properly */
- /* getauxval() for ARM on Linux and Android with API level 18+ */
--#if defined(CORRADE_TARGET_ARM) && defined(__linux__) && !(defined(CORRADE_TARGET_ANDROID) && __ANDROID_API__ < 18)
-+#if defined(CORRADE_TARGET_ARM) && (defined(__linux__) && !(defined(CORRADE_TARGET_ANDROID) && __ANDROID_API__ < 18) || defined(__FreeBSD__))
- #include <sys/auxv.h>
- /* sysctlbyname() for ARM on macOS / iOS */
- #elif defined(CORRADE_TARGET_ARM) && defined(CORRADE_TARGET_APPLE)
-@@ -80,7 +80,7 @@ int appleSysctlByName(const char* name) {
- }
- #endif
-
--#if defined(CORRADE_TARGET_ARM) && ((defined(__linux__) && !(defined(CORRADE_TARGET_ANDROID) && __ANDROID_API__ < 18)) || defined(CORRADE_TARGET_APPLE))
-+#if defined(CORRADE_TARGET_ARM) && ((defined(__linux__) && !(defined(CORRADE_TARGET_ANDROID) && __ANDROID_API__ < 18)) || defined(CORRADE_TARGET_APPLE) || defined(__FreeBSD__))
- Features runtimeFeatures() {
- /* Use getauxval() on ARM on Linux and Android */
- #if defined(CORRADE_TARGET_ARM) && defined(__linux__) && !(defined(CORRADE_TARGET_ANDROID) && __ANDROID_API__ < 18)
-@@ -130,6 +130,13 @@ Features runtimeFeatures() {
- /* No other (deinlined) implementation at the moment. The function should
- not be even defined here in that case -- it's inlined in the header
- instead, including the x86 implementation. */
-+ #elif defined(CORRADE_TARGET_ARM) && defined(__FreeBSD__)
-+ /* use elf_aux_info() on ARM on FreeBSD */
-+ unsigned long hwcap = 0;
-+
-+ elf_aux_info(AT_HWCAP, &hwcap, sizeof hwcap);
-+
-+ return Implementation::runtimeFeatures(hwcap);
- #else
- #error
- #endif
diff --git a/devel/corrade/files/patch-src_Corrade_Cpu.h b/devel/corrade/files/patch-src_Corrade_Cpu.h
deleted file mode 100644
index 7cb1c95f83db..000000000000
--- a/devel/corrade/files/patch-src_Corrade_Cpu.h
+++ /dev/null
@@ -1,38 +0,0 @@
---- src/Corrade/Cpu.h.orig 2023-05-22 12:04:59 UTC
-+++ src/Corrade/Cpu.h
-@@ -1357,7 +1357,7 @@ equivalent:
- */
- template<class T> constexpr T tag() { return T{Implementation::Init}; }
-
--#if defined(CORRADE_TARGET_ARM) && defined(__linux__) && !(defined(CORRADE_TARGET_ANDROID) && __ANDROID_API__ < 18)
-+#if defined(CORRADE_TARGET_ARM) && (defined(__linux__) && !(defined(CORRADE_TARGET_ANDROID) && __ANDROID_API__ < 18) || defined(__FreeBSD__))
- namespace Implementation {
- /* Needed for a friend declaration, implementation is at the very end of
- the header */
-@@ -1496,7 +1496,7 @@ class Features {
- #endif
- Features runtimeFeatures();
- #endif
-- #if defined(CORRADE_TARGET_ARM) && defined(__linux__) && !(defined(CORRADE_TARGET_ANDROID) && __ANDROID_API__ < 18)
-+ #if defined(CORRADE_TARGET_ARM) && (defined(__linux__) && !(defined(CORRADE_TARGET_ANDROID) && __ANDROID_API__ < 18) || defined(__FreeBSD__))
- friend Features Implementation::runtimeFeatures(unsigned long);
- #endif
-
-@@ -1775,7 +1775,7 @@ value is equal to @ref Scalar, which in turn is equiva
- default-constructed) @ref Features.
- @see @ref DefaultBase, @ref DefaultExtra, @ref Default
- */
--#if (defined(CORRADE_TARGET_X86) && (defined(CORRADE_TARGET_MSVC) || defined(CORRADE_TARGET_GCC))) || (defined(CORRADE_TARGET_ARM) && ((defined(__linux__) && !(defined(CORRADE_TARGET_ANDROID) && __ANDROID_API__ < 18)) || defined(CORRADE_TARGET_APPLE))) || defined(DOXYGEN_GENERATING_OUTPUT)
-+#if (defined(CORRADE_TARGET_X86) && (defined(CORRADE_TARGET_MSVC) || defined(CORRADE_TARGET_GCC))) || (defined(CORRADE_TARGET_ARM) && ((defined(__linux__) && !(defined(CORRADE_TARGET_ANDROID) && __ANDROID_API__ < 18)) || defined(CORRADE_TARGET_APPLE) || defined(__FreeBSD__))) || defined(DOXYGEN_GENERATING_OUTPUT)
- #ifdef CORRADE_TARGET_ARM
- CORRADE_UTILITY_EXPORT /* Inlined on x86 at the very end of the header */
- #endif
-@@ -3214,7 +3214,7 @@ inline Features runtimeFeatures() {
- /** @todo If AT_HWCAP2 or other bits are needed, it's passed to ifunc resolvers
- only since glibc 2.30 (and Android API 30+, which is the same as before):
- https://github.com/bminor/glibc/commit/2b8a3c86e7606cf1b0a997dad8af2d45ae8989c3 */
--#if defined(CORRADE_TARGET_ARM) && defined(__linux__) && !(defined(CORRADE_TARGET_ANDROID) && __ANDROID_API__ < 18)
-+#if defined(CORRADE_TARGET_ARM) && (defined(__linux__) && !(defined(CORRADE_TARGET_ANDROID) && __ANDROID_API__ < 18) || defined(__FreeBSD__))
- namespace Implementation {
- inline Features runtimeFeatures(const unsigned long caps) {
- unsigned int out = 0;
diff --git a/devel/corrade/files/patch-src_Corrade_Utility_Implementation_ErrorString.cpp b/devel/corrade/files/patch-src_Corrade_Utility_Implementation_ErrorString.cpp
deleted file mode 100644
index bde5390753b2..000000000000
--- a/devel/corrade/files/patch-src_Corrade_Utility_Implementation_ErrorString.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Corrade/Utility/Implementation/ErrorString.cpp.orig 2023-01-16 01:30:29 UTC
-+++ src/Corrade/Utility/Implementation/ErrorString.cpp
-@@ -60,7 +60,7 @@ void printErrnoErrorString(Debug& debug, const int err
- idea. The POSIX variant returns int(0) on success, while the GNU variant
- may return a pointer to a statically allocated string instead of filling
- the buffer. Sigh. */
-- #if ((_POSIX_C_SOURCE >= 200112L) && !_GNU_SOURCE) || defined(CORRADE_TARGET_EMSCRIPTEN) || defined(CORRADE_TARGET_APPLE)
-+ #if ((_POSIX_C_SOURCE >= 200112L) && !_GNU_SOURCE) || defined(CORRADE_TARGET_EMSCRIPTEN) || defined(CORRADE_TARGET_APPLE) || defined(__FreeBSD__)
- char string[256];
- CORRADE_INTERNAL_ASSERT_OUTPUT(strerror_r(error, string, Containers::arraySize(string)) == 0);
- #else
diff --git a/devel/corrade/files/patch-src_Corrade_Utility_Path.cpp b/devel/corrade/files/patch-src_Corrade_Utility_Path.cpp
deleted file mode 100644
index a60703fdb2b6..000000000000
--- a/devel/corrade/files/patch-src_Corrade_Utility_Path.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
---- src/Corrade/Utility/Path.cpp.orig 2023-01-12 11:52:02 UTC
-+++ src/Corrade/Utility/Path.cpp
-@@ -89,6 +89,11 @@
- #include <io.h>
- #endif
-
-+#ifdef __FreeBSD__
-+#include <sys/types.h>
-+#include <sys/sysctl.h>
-+#endif
-+
- #include "Corrade/configure.h"
- #include "Corrade/Containers/Array.h"
- #include "Corrade/Containers/GrowableArray.h"
-@@ -540,6 +545,18 @@ Containers::Optional<Containers::String> executableLoc
- /* hardcoded for Emscripten */
- #elif defined(CORRADE_TARGET_EMSCRIPTEN)
- return Containers::String{"/app.js"_s};
-+
-+ #elif defined(__FreeBSD__)
-+ Containers::Array<char> path;
-+ size_t size;
-+ const int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
-+
-+ sysctl(mib, 4, nullptr, &size, NULL, 0);
-+ arrayResize(path, NoInit, size + 1);
-+ sysctl(mib, 4, path, &size, NULL, 0);
-+ path[size] = '\0';
-+ const auto deleter = path.deleter();
-+ return Containers::String{path.release(), size, deleter};
-
- /* Not implemented */
- #else
diff --git a/devel/corrade/pkg-plist b/devel/corrade/pkg-plist
index 014e7735394f..1b3b14bd1538 100644
--- a/devel/corrade/pkg-plist
+++ b/devel/corrade/pkg-plist
@@ -12,6 +12,7 @@ include/Corrade/Containers/BitArrayView.h
include/Corrade/Containers/Containers.h
include/Corrade/Containers/EnumSet.h
include/Corrade/Containers/EnumSet.hpp
+include/Corrade/Containers/Function.h
include/Corrade/Containers/GrowableArray.h
include/Corrade/Containers/Iterable.h
include/Corrade/Containers/LinkedList.h
@@ -27,6 +28,7 @@ include/Corrade/Containers/ScopeGuard.h
include/Corrade/Containers/StaticArray.h
include/Corrade/Containers/StridedArrayView.h
include/Corrade/Containers/StridedArrayViewStl.h
+include/Corrade/Containers/StridedBitArrayView.h
include/Corrade/Containers/StridedDimensions.h
include/Corrade/Containers/String.h
include/Corrade/Containers/StringIterable.h
@@ -34,6 +36,7 @@ include/Corrade/Containers/StringStl.h
include/Corrade/Containers/StringStlHash.h
include/Corrade/Containers/StringStlView.h
include/Corrade/Containers/StringView.h
+include/Corrade/Containers/StructuredBindings.h
include/Corrade/Containers/Tags.h
include/Corrade/Containers/Triple.h
include/Corrade/Containers/TripleStl.h
@@ -74,6 +77,7 @@ include/Corrade/Utility/AbstractHash.h
include/Corrade/Utility/Algorithms.h
include/Corrade/Utility/Arguments.h
include/Corrade/Utility/Assert.h
+include/Corrade/Utility/BitAlgorithms.h
include/Corrade/Utility/Configuration.h
include/Corrade/Utility/ConfigurationGroup.h
include/Corrade/Utility/ConfigurationValue.h
@@ -106,6 +110,7 @@ include/Corrade/Utility/Sha1.h
include/Corrade/Utility/StlForwardArray.h
include/Corrade/Utility/StlForwardString.h
include/Corrade/Utility/StlForwardTuple.h
+include/Corrade/Utility/StlForwardTupleSizeElement.h
include/Corrade/Utility/StlForwardVector.h
include/Corrade/Utility/StlMath.h
include/Corrade/Utility/String.h
@@ -136,5 +141,5 @@ share/cmake/Corrade/CorradeConfig.cmake
share/cmake/Corrade/CorradeLibSuffix.cmake
share/cmake/Corrade/FindCorrade.cmake
share/cmake/Corrade/UseCorrade.cmake
-%%DATADIR%%/debuggers/gdb/__init__.py
-%%DATADIR%%/debuggers/gdb/printers.py
+share/gdb/python/corrade/__init__.py
+share/gdb/python/corrade/printers.py