Update macOS machines for May 2024 (microsoft#38834)

* Run through the macOS update instructions one more time. I think they're in a pretty good state now since this is the first attempt to rerun them since we dropped Vagrant. * Removed Parallels references for arm64. * Removed references to removing Vagrant because it's no longer on any of the hosts. * Update macOS to 14.5. * Update XCode CLT to 14.3.
azure-sdk · Jun 4, 2024 · a4275b7 · a4275b7
1 parent 9760ce6
commit a4275b7
Show file tree

Hide file tree

Showing 29 changed files with 169 additions and 372 deletions.
diff --git a/ports/clockutils/add-missing-thread-header.patch b/ports/clockutils/add-missing-thread-header.patch
@@ -0,0 +1,24 @@
+diff --git a/include/clockUtils/sockets/TcpSocket.h b/include/clockUtils/sockets/TcpSocket.h
+index 3bb97a9..cdd7810 100644
+--- a/include/clockUtils/sockets/TcpSocket.h
++++ b/include/clockUtils/sockets/TcpSocket.h
+@@ -33,6 +33,7 @@
+ #include <sstream>
+ #include <string>
+ #include <vector>
++#include <thread>
+
+ #include "clockUtils/errors.h"
+
+diff --git a/include/clockUtils/sockets/UdpSocket.h b/include/clockUtils/sockets/UdpSocket.h
+index c5da451..ea0a518 100644
+--- a/include/clockUtils/sockets/UdpSocket.h
++++ b/include/clockUtils/sockets/UdpSocket.h
+@@ -33,6 +33,7 @@
+ #include <queue>
+ #include <string>
+ #include <vector>
++#include <thread>
+
+ #include "clockUtils/errors.h"
+
diff --git a/ports/clockutils/portfile.cmake b/ports/clockutils/portfile.cmake
@@ -6,6 +6,7 @@ vcpkg_from_github(
     HEAD_REF dev-1.2
     PATCHES
         fix-warningC4643.patch
+        add-missing-thread-header.patch
 )
 
 set(SHARED_FLAG OFF)

diff --git a/ports/clockutils/vcpkg.json b/ports/clockutils/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "clockutils",
   "version": "1.1.1",
-  "port-version": 1,
+  "port-version": 2,
   "description": "A lightweight c++ library for commonly needed tasks. Optimized for simplicity and speed.",
   "homepage": "https://github.com/ClockworkOrigins/clockUtils",
   "license": "MIT",

diff --git a/ports/ffmpeg/0041-add-const-for-opengl-definition.patch b/ports/ffmpeg/0041-add-const-for-opengl-definition.patch
@@ -0,0 +1,13 @@
+diff --git a/libavdevice/opengl_enc.c b/libavdevice/opengl_enc.c
+index b2ac6eb..6351614 100644
+--- a/libavdevice/opengl_enc.c
++++ b/libavdevice/opengl_enc.c
+@@ -116,7 +116,7 @@ typedef void   (APIENTRY *FF_PFNGLATTACHSHADERPROC) (GLuint program, GLuint shad
+ typedef GLuint (APIENTRY *FF_PFNGLCREATESHADERPROC) (GLenum type);
+ typedef void   (APIENTRY *FF_PFNGLDELETESHADERPROC) (GLuint shader);
+ typedef void   (APIENTRY *FF_PFNGLCOMPILESHADERPROC) (GLuint shader);
+-typedef void   (APIENTRY *FF_PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const char* *string, const GLint *length);
++typedef void   (APIENTRY *FF_PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const char* const *string, const GLint *length);
+ typedef void   (APIENTRY *FF_PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params);
+ typedef void   (APIENTRY *FF_PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, char *infoLog);
+
diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake
@@ -20,6 +20,7 @@ vcpkg_from_github(
         0020-fix-aarch64-libswscale.patch
         0022-fix-iconv.patch
         0040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch # Do not remove this patch. It is required by chromium
+        0041-add-const-for-opengl-definition.patch
 )
 
 if(SOURCE_PATH MATCHES " ")

diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "ffmpeg",
   "version": "6.1.1",
-  "port-version": 5,
+  "port-version": 6,
   "description": [
     "a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.",
     "FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations."

diff --git a/ports/geogram/portfile.cmake b/ports/geogram/portfile.cmake
@@ -1,10 +1,17 @@
+vcpkg_download_distfile(FIX_IMPLICIT_INT_PATCH
+    URLS https://github.com/BrunoLevy/geogram/commit/382da2d2f0d39bf8df2f65051c338e7e827e31db.patch?full_index=1
+    FILENAME geogram-implicit-ini-382da2d2f0d39bf8df2f65051c338e7e827e31db.patch
+    SHA512 1a85195b76cd7140fe890893bf1f57a1f9c30dbc2865bab28b7eda9d97b9bab5be7cbc638b24d8da489aee1e25e0e7289655ade13893bdc225d1b332f1d845a0
+)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO BrunoLevy/geogram
     REF "v${VERSION}"
     SHA512 ae3d95be1c5061ace92921b3fcfb0027d23c595b131b0d31f1788adbe0d8f92367bef71736d6c936504bd37eba5fcdae658369f03734e233bf3eab14bca6f9e5
     PATCHES
         fix-vcpkg-install.patch
+        "${FIX_IMPLICIT_INT_PATCH}"
 )
 
 #third_party: amgcl

diff --git a/ports/geogram/vcpkg.json b/ports/geogram/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "geogram",
   "version": "1.8.3",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Geogram is a programming library of geometric algorithms.",
   "homepage": "https://github.com/BrunoLevy/geogram",
   "license": "BSD-3-Clause",

diff --git a/ports/qt5-location/disable-enum-warning.patch b/ports/qt5-location/disable-enum-warning.patch
@@ -0,0 +1,14 @@
+diff --git a/src/3rdparty/mapbox-gl-native/mapbox-gl-native.pro b/src/3rdparty/mapbox-gl-native/mapbox-gl-native.pro
+index ed974db..f17d45a 100644
+--- a/src/3rdparty/mapbox-gl-native/mapbox-gl-native.pro
++++ b/src/3rdparty/mapbox-gl-native/mapbox-gl-native.pro
+@@ -34,6 +34,9 @@ android|gcc {
+ }
+
+ darwin {
++    QMAKE_CXXFLAGS += \
++        -Wno-enum-constexpr-conversion
++
+     LIBS += \
+         -framework Foundation
+ }
diff --git a/ports/qt5-location/portfile.cmake b/ports/qt5-location/portfile.cmake
@@ -1,3 +1,3 @@
 message(STATUS "${PORT} has a spurious failure in which it is unable to create a parent directory! Just retry.")
 include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
-qt_submodule_installation(PATCHES missing-include.patch)
+qt_submodule_installation(PATCHES missing-include.patch disable-enum-warning.patch)
diff --git a/ports/qt5-location/vcpkg.json b/ports/qt5-location/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "qt5-location",
   "version": "5.15.14",
+  "port-version": 1,
   "description": "The Qt Location API helps you create viable mapping solutions using the data available from some of the popular location services.",
   "license": null,
   "dependencies": [

diff --git a/ports/qtinterfaceframework/requirements_minimal.txt b/ports/qtinterfaceframework/requirements_minimal.txt
@@ -3,10 +3,9 @@ argh==0.26.2
 click==6.7
 coloredlogs==10.0
 humanfriendly==4.15.1
-Jinja2==2.11.3
-MarkupSafe==1.1
+Jinja2==3.1.4
+MarkupSafe==2.1.5
 path.py==11.0.1
-pathtools==0.1.2
 PyYAML==6.0.1
 six==1.11.0
 watchdog==2.1.7

diff --git a/ports/qtinterfaceframework/vcpkg.json b/ports/qtinterfaceframework/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "qtinterfaceframework",
   "version": "6.7.0",
+  "port-version": 1,
   "description": "The Qt Interface Framework module provides both the tools and the core APIs, for you to implement Middleware APIs, Middleware Back ends, and Middleware Services.",
   "homepage": "https://www.qt.io/",
   "license": null,