Skip to content

Commit 2626652

Browse files
BillyONealBillyONeal
authored
Patch Tuesday for September 2025 + macOS 15.6.1 (#47326)
1 parent a3476c7 commit 2626652

130 files changed

Lines changed: 1094 additions & 400 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎ports/awlib/fix-mac-build.patch‎

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/io/include/aw/io/mmap_file.h b/io/include/aw/io/mmap_file.h
2-
index 98469732..65e82aac 100644
2+
index 9846973..65e82aa 100644
33
--- a/io/include/aw/io/mmap_file.h
44
+++ b/io/include/aw/io/mmap_file.h
55
@@ -83,18 +83,18 @@ using win32::file_mapping;
@@ -30,8 +30,26 @@ index 98469732..65e82aac 100644
3030
return file_mode::read|file_mode::write;
3131
}
3232

33+
diff --git a/types/include/aw/types/bits/variant_dispatch.h b/types/include/aw/types/bits/variant_dispatch.h
34+
index 9d5dc3b..95a9394 100644
35+
--- a/types/include/aw/types/bits/variant_dispatch.h
36+
+++ b/types/include/aw/types/bits/variant_dispatch.h
37+
@@ -71,11 +71,11 @@ struct vh_recursive {
38+
if constexpr (Length_left > 0)
39+
{
40+
if (index < Mid)
41+
- return vh_recursive<Start,Mid,Ts...>::template dispatch(index, storage, f);
42+
+ return vh_recursive<Start,Mid,Ts...>::dispatch(index, storage, f);
43+
}
44+
45+
if constexpr (Length_right > 1)
46+
- return vh_recursive<Mid+1,End,Ts...>::template dispatch(index, storage, f);
47+
+ return vh_recursive<Mid+1,End,Ts...>::dispatch(index, storage, f);
48+
49+
_unreachable();
50+
}
3351
diff --git a/types/include/aw/types/byte_buffer.h b/types/include/aw/types/byte_buffer.h
34-
index 82f46934..b38c46a9 100644
52+
index 82f4693..b38c46a 100644
3553
--- a/types/include/aw/types/byte_buffer.h
3654
+++ b/types/include/aw/types/byte_buffer.h
3755
@@ -8,6 +8,7 @@
@@ -42,3 +60,16 @@ index 82f46934..b38c46a9 100644
4260
#include <memory>
4361
namespace aw {
4462
/**
63+
diff --git a/types/include/aw/types/containers/queue.h b/types/include/aw/types/containers/queue.h
64+
index af8f13b..8398e8c 100644
65+
--- a/types/include/aw/types/containers/queue.h
66+
+++ b/types/include/aw/types/containers/queue.h
67+
@@ -96,7 +96,7 @@ protected:
68+
queue_base(queue_base&& other, Allocator const& alloc) noexcept
69+
: impl(alloc)
70+
{
71+
- if (alloc == other.alloc)
72+
+ if (alloc == static_cast<Allocator&>(other.impl))
73+
impl.swap(other.impl);
74+
else
75+
create_storage(other.allocated_size());

‎ports/awlib/vcpkg.json‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "awlib",
33
"version-date": "2024-04-06",
4-
"port-version": 1,
4+
"port-version": 2,
55
"description": "Cross-platform utility library",
66
"homepage": "https://github.com/absurdworlds/awlib",
77
"license": "LGPL-3.0-or-later",
@@ -21,6 +21,13 @@
2121
"description": "Build graphics library",
2222
"supports": "!uwp",
2323
"dependencies": [
24+
{
25+
"name": "awlib",
26+
"default-features": false,
27+
"features": [
28+
"hudf"
29+
]
30+
},
2431
"glfw3",
2532
"libpng"
2633
]

‎ports/clblas/fix-cmake-4.diff‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
2+
index 75df37a..4e31cd3 100644
3+
--- a/src/CMakeLists.txt
4+
+++ b/src/CMakeLists.txt
5+
@@ -103,19 +103,19 @@ else( )
6+
endif( )
7+
8+
# Define a version for the code
9+
-if( NOT DEFINED clBLAS_VERSION_MAJOR )
10+
- set( clBLAS_VERSION_MAJOR 2 )
11+
+if( NOT DEFINED CLBLAS_VERSION_MAJOR )
12+
+ set( CLBLAS_VERSION_MAJOR 2 )
13+
endif( )
14+
15+
-if( NOT DEFINED clBLAS_VERSION_MINOR )
16+
- set( clBLAS_VERSION_MINOR 12 )
17+
+if( NOT DEFINED CLBLAS_VERSION_MINOR )
18+
+ set( CLBLAS_VERSION_MINOR 12 )
19+
endif( )
20+
21+
-if( NOT DEFINED clBLAS_VERSION_PATCH )
22+
- set( clBLAS_VERSION_PATCH 0 )
23+
+if( NOT DEFINED CLBLAS_VERSION_PATCH )
24+
+ set( CLBLAS_VERSION_PATCH 0 )
25+
endif( )
26+
27+
-set( clBLAS_VERSION "${clBLAS_VERSION_MAJOR}.${clBLAS_VERSION_MINOR}.${clBLAS_VERSION_PATCH}")
28+
+set( clBLAS_VERSION "${CLBLAS_VERSION_MAJOR}.${CLBLAS_VERSION_MINOR}.${CLBLAS_VERSION_PATCH}")
29+
30+
# Increment this if we break backward compatibility.
31+
set( clBLAS_SOVERSION 2 )
32+
@@ -425,9 +425,9 @@ endif( )
33+
34+
set( CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${clBLAS_VERSION}-${CMAKE_HOST_SYSTEM_NAME}-Source")
35+
36+
-set( CPACK_PACKAGE_VERSION_MAJOR ${clBLAS_VERSION_MAJOR} )
37+
-set( CPACK_PACKAGE_VERSION_MINOR ${clBLAS_VERSION_MINOR} )
38+
-set( CPACK_PACKAGE_VERSION_PATCH ${clBLAS_VERSION_PATCH} )
39+
+set( CPACK_PACKAGE_VERSION_MAJOR ${CLBLAS_VERSION_MAJOR} )
40+
+set( CPACK_PACKAGE_VERSION_MINOR ${CLBLAS_VERSION_MINOR} )
41+
+set( CPACK_PACKAGE_VERSION_PATCH ${CLBLAS_VERSION_PATCH} )
42+
set( CPACK_PACKAGE_DESCRIPTION_SUMMARY "OpenCL implementation of a BLAS library")
43+
set( CPACK_PACKAGE_VENDOR "Neutral")
44+
set( CPACK_SOURCE_IGNORE_FILES "/\\\\.hg/;/\\\\.svn/;/\\\\.git/" )
45+
diff --git a/src/clBLAS.version.h.in b/src/clBLAS.version.h.in
46+
index a05cbce..ab22a87 100644
47+
--- a/src/clBLAS.version.h.in
48+
+++ b/src/clBLAS.version.h.in
49+
@@ -17,6 +17,6 @@
50+
51+
/* the configured version and settings for clblas
52+
*/
53+
-#define clblasVersionMajor @clBLAS_VERSION_MAJOR@
54+
-#define clblasVersionMinor @clBLAS_VERSION_MINOR@
55+
-#define clblasVersionPatch @clBLAS_VERSION_PATCH@
56+
+#define clblasVersionMajor @CLBLAS_VERSION_MAJOR@
57+
+#define clblasVersionMinor @CLBLAS_VERSION_MINOR@
58+
+#define clblasVersionPatch @CLBLAS_VERSION_PATCH@

‎ports/clblas/portfile.cmake‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ vcpkg_from_github(
88
cmake.patch
99
Fix-BuildDLL.patch
1010
abs-arm.patch
11+
fix-cmake-4.diff # https://github.com/clMathLibraries/clBLAS/pull/364
1112
)
1213

1314
# v2.12 has a very old FindOpenCL.cmake using OPENCL_ vs. OpenCL_ var names

‎ports/clblas/vcpkg.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "clblas",
33
"version": "2.12",
4-
"port-version": 7,
4+
"port-version": 8,
55
"description": "clBLAS is an OpenCL 1.2 accelerated BLAS (Basic Linear Algebra Subsystem) library.",
66
"license": "Apache-2.0",
77
"supports": "!(windows & arm)",

‎ports/clockutils/disable-werror.diff‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index 5c77383..0c8029b 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -64,13 +64,13 @@ set (CLANG_FLAGS "-Wstring-plus-int")
6+
IF(${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
7+
set (CMAKE_CXX_FLAGS_DEBUG "${CXX_FLAGS} ${CLANG_FLAGS} -g")
8+
set (CMAKE_CXX_FLAGS_MINSIZEREL "${CXX_FLAGS} ${CLANG_FLAGS} -0s -DNDEBUG")
9+
- set (CMAKE_CXX_FLAGS_RELEASE "${CXX_FLAGS} ${CLANG_FLAGS} -O3 -DNDEBUG -Werror")
10+
- set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CXX_FLAGS} ${CLANG_FLAGS} -O2 -g -Werror")
11+
+ set (CMAKE_CXX_FLAGS_RELEASE "${CXX_FLAGS} ${CLANG_FLAGS} -O3 -DNDEBUG")
12+
+ set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CXX_FLAGS} ${CLANG_FLAGS} -O2 -g")
13+
ELSEIF(${CMAKE_CXX_COMPILER_ID} STREQUAL GNU)
14+
set (CMAKE_CXX_FLAGS_DEBUG "${CXX_FLAGS} -g")
15+
set (CMAKE_CXX_FLAGS_MINSIZEREL "${CXX_FLAGS} -0s -DNDEBUG")
16+
- set (CMAKE_CXX_FLAGS_RELEASE "${CXX_FLAGS} -O3 -DNDEBUG -Werror")
17+
- set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CXX_FLAGS} -O2 -g -Werror")
18+
+ set (CMAKE_CXX_FLAGS_RELEASE "${CXX_FLAGS} -O3 -DNDEBUG")
19+
+ set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CXX_FLAGS} -O2 -g")
20+
ELSEIF(${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC)
21+
set (CXX_FLAGS "/MP /W4 /wd4127 /D_WINSOCK_DEPRECATED_NO_WARNINGS /DNOMINMAX")
22+
set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${CXX_FLAGS}")

‎ports/clockutils/portfile.cmake‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ vcpkg_from_github(
88
fix-warningC4643.patch
99
add-missing-thread-header.patch
1010
cmake4.patch
11+
disable-werror.diff
1112
)
1213

1314
set(SHARED_FLAG OFF)

‎ports/clockutils/vcpkg.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "clockutils",
33
"version": "1.1.1",
4-
"port-version": 3,
4+
"port-version": 4,
55
"description": "A lightweight c++ library for commonly needed tasks. Optimized for simplicity and speed.",
66
"homepage": "https://github.com/ClockworkOrigins/clockUtils",
77
"license": "MIT",

‎ports/colmap/fix-variable-names.diff‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
diff --git a/src/thirdparty/PoissonRecon/Ply.h b/src/thirdparty/PoissonRecon/Ply.h
2+
index 699381f..6cb07d6 100644
3+
--- a/src/thirdparty/PoissonRecon/Ply.h
4+
+++ b/src/thirdparty/PoissonRecon/Ply.h
5+
@@ -340,7 +340,7 @@ public:
6+
PlyOrientedVertex( void ) { ; }
7+
PlyOrientedVertex( Point3D< Real > p , Point3D< Real > n ) : point(p) , normal(n) { ; }
8+
PlyOrientedVertex operator + ( PlyOrientedVertex p ) const { return PlyOrientedVertex( point+p.point , normal+p.normal ); }
9+
- PlyOrientedVertex operator - ( PlyOrientedVertex p ) const { return PlyOrientedVertex( point-p.value , normal-p.normal ); }
10+
+ PlyOrientedVertex operator - ( PlyOrientedVertex p ) const { return PlyOrientedVertex( point-p.point , normal-p.normal ); }
11+
template< class _Real > PlyOrientedVertex operator * ( _Real s ) const { return PlyOrientedVertex( point*s , normal*s ); }
12+
template< class _Real > PlyOrientedVertex operator / ( _Real s ) const { return PlyOrientedVertex( point/s , normal/s ); }
13+
PlyOrientedVertex& operator += ( PlyOrientedVertex p ) { point += p.point , normal += p.normal ; return *this; }
14+
@@ -386,7 +386,7 @@ public:
15+
}
16+
17+
_PlyColorVertex operator + ( _PlyColorVertex p ) const { return _PlyColorVertex( point+p.point , color+p.color ); }
18+
- _PlyColorVertex operator - ( _PlyColorVertex p ) const { return _PlyColorVertex( point-p.value , color-p.color ); }
19+
+ _PlyColorVertex operator - ( _PlyColorVertex p ) const { return _PlyColorVertex( point-p.point , color-p.color ); }
20+
template< class _Real > _PlyColorVertex operator * ( _Real s ) const { return _PlyColorVertex( point*s , color*s ); }
21+
template< class _Real > _PlyColorVertex operator / ( _Real s ) const { return _PlyColorVertex( point/s , color/s ); }
22+
_PlyColorVertex& operator += ( _PlyColorVertex p ) { point += p.point , color += p.color ; return *this; }
23+
diff --git a/src/thirdparty/PoissonRecon/SparseMatrix.inl b/src/thirdparty/PoissonRecon/SparseMatrix.inl
24+
index c181d82..0a5e59e 100755
25+
--- a/src/thirdparty/PoissonRecon/SparseMatrix.inl
26+
+++ b/src/thirdparty/PoissonRecon/SparseMatrix.inl
27+
@@ -195,7 +195,7 @@ void SparseMatrix< T >::SetRowSize( int row , int count )
28+
template<class T>
29+
void SparseMatrix<T>::SetZero()
30+
{
31+
- Resize(this->m_N, this->m_M);
32+
+ Resize(this->rows, this->_maxEntriesPerRow);
33+
}
34+
35+
template<class T>

‎ports/colmap/portfile.cmake‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ vcpkg_from_github(
1010
PATCHES
1111
no-glu.diff
1212
fix-flann.patch
13+
fix-variable-names.diff # from https://github.com/colmap/colmap/commit/203bf36c2d5e805f0eb26d8b7a2b8572e7b134e1
1314
)
1415

1516
if (NOT TRIPLET_SYSTEM_ARCH STREQUAL "x64" AND ("cuda" IN_LIST FEATURES OR "cuda-redist" IN_LIST FEATURES))

0 commit comments

Comments
 (0)