Patch Tuesday for February 2025

ports/bcg729/portfile.cmake

@@ -8,6 +8,9 @@ vcpkg_from_github(
         disable-alt-packaging.patch
 )
 
+# Already removed upstream: https://github.com/BelledonneCommunications/bcg729/pull/19
+file(REMOVE "${SOURCE_PATH}/include/MSVC/stdint.h")
+
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ENABLE_STATIC)
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ENABLE_SHARED)
 

ports/bcg729/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "bcg729",
   "version": "1.1.1",
-  "port-version": 3,
+  "port-version": 4,
   "description": "Bcg729 is an open source implementation of the ITU G.729 Annex A and B codec.",
   "homepage": "https://github.com/BelledonneCommunications/bcg729",
   "dependencies": [

ports/graphviz/portfile.cmake

@@ -15,6 +15,7 @@ vcpkg_from_gitlab(
         select-plugins.patch
         static-linkage.patch
         webp-install.patch
+        workaround-insufficiently-ugly-wchar-h.patch # Avoids conflict between #define S and VS2022 17.13's <wchar.h>
 )
 
 vcpkg_list(SET OPTIONS)

ports/graphviz/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "graphviz",
   "version-semver": "10.0.1",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Graph Visualization Tools",
   "homepage": "https://graphviz.org/",
   "license": "EPL-1.0",

ports/graphviz/workaround-insufficiently-ugly-wchar-h.patch

@@ -0,0 +1,12 @@
+diff --git a/lib/expr/expr.h b/lib/expr/expr.h
+index 3d7fbd6..d6cfb53 100644
+--- a/lib/expr/expr.h
++++ b/lib/expr/expr.h
+@@ -36,6 +36,7 @@ extern "C" {
+ #include <stddef.h>
+ #include <stdio.h>
+ #include <vmalloc/vmalloc.h>
++#include <wchar.h>
+
+ #define EX_VERSION	20000101L
+

ports/lcm/avoid-fake-stdint-h.patch

@@ -0,0 +1,24 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 90833e3..2b7cff8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -17,7 +17,6 @@ include(lcm-cmake/version.cmake)
+ set(CMAKE_INCLUDE_CURRENT_DIR ON)
+ if (WIN32)
+   add_definitions(-DWIN32 -D_CRT_SECURE_NO_WARNINGS)
+-  include_directories(${lcm_SOURCE_DIR}/WinSpecific/include)
+   include_directories(${lcm_SOURCE_DIR}/WinSpecific/getopt)
+   include_directories(${lcm_SOURCE_DIR})
+   add_subdirectory(WinSpecific)
+diff --git a/lcm-python/setup.py b/lcm-python/setup.py
+index e015d20..2528d9f 100644
+--- a/lcm-python/setup.py
++++ b/lcm-python/setup.py
+@@ -47,7 +47,6 @@ if os.name == 'nt':
+         sys.exit('GLIB_PATH environment variable not set.')
+
+     include_dirs += [ \
+-            os.path.join("..", "WinSpecific\include"),
+             os.path.join("..", "WinSpecific"),
+             os.path.join(glibPath, "include", "glib-2.0"),
+             os.path.join(glibPath, "lib", "glib-2.0", "include") ]

ports/lcm/portfile.cmake

@@ -9,8 +9,12 @@ vcpkg_from_github(
         fix-build-error.patch
         glib.link.patch
         disable-docs.patch
+        avoid-fake-stdint-h.patch # https://github.com/lcm-proj/lcm/pull/563
 )
 
+# Remove fake stdint.h that conficts with the real one in VS2022 17.13 targeting arm64
+file(REMOVE "${SOURCE_PATH}/WinSpecific/include/inttypes.h" "${SOURCE_PATH}/WinSpecific/include/stdint.h")
+
 vcpkg_cmake_configure(
      SOURCE_PATH "${SOURCE_PATH}"
      OPTIONS

ports/lcm/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "lcm",
   "version": "1.4.0",
-  "port-version": 6,
+  "port-version": 7,
   "description": [
     "Lightweight Communications and Marshalling (LCM)",
     "LCM is a set of libraries and tools for message passing and data marshalling, targeted at real-time systems where high-bandwidth and low latency are critical. It provides a publish/subscribe message passing model and automatic marshalling/unmarshalling code generation with bindings for applications in a variety of programming languages."

scripts/azure-pipelines/android/Dockerfile

@@ -3,6 +3,11 @@
 FROM ubuntu:noble-20241118.1
 
 ADD https://packages.microsoft.com/config/ubuntu/24.04/packages-microsoft-prod.deb /packages-microsoft-prod.deb
+ADD https://builds.openlogic.com/downloadJDK/openlogic-openjdk/11.0.25+9/openlogic-openjdk-11.0.25+9-linux-x64.tar.gz /openlogic-openjdk-11.0.25+9-linux-x64.tar.gz
+ADD https://dl.google.com/android/repository/commandlinetools-linux-10406996_latest.zip /sdk-commandlinetools-linux-10406996_latest.zip
+ADD https://dl.google.com/android/repository/build-tools_r34-linux.zip /build-tools_r34-linux.zip
+ADD https://dl.google.com/android/repository/platform-34-ext7_r03.zip /platform-34-ext7_r03.zip
+ADD https://dl.google.com/android/repository/platform-tools_r35.0.1-linux.zip /platform-tools_r35.0.1-linux.zip
 ADD https://dl.google.com/android/repository/android-ndk-r27c-linux.zip /android-ndk-r27c-linux.zip
 
 # Add apt packages
@@ -59,11 +64,34 @@ apt-get -y dist-upgrade
 
 apt-get -y --no-install-recommends install $APT_PACKAGES
 
+# OpenJDK
+tar xzf openlogic-openjdk-11.0.25+9-linux-x64.tar.gz
+rm openlogic-openjdk-11.0.25+9-linux-x64.tar.gz
+
+# Android SDK
+unzip -q sdk-commandlinetools-linux-10406996_latest.zip -d android-sdk
+rm sdk-commandlinetools-linux-10406996_latest.zip
+
+unzip -q build-tools_r34-linux.zip -d android-sdk/build-tools
+mv android-sdk/build-tools/android-14 android-sdk/build-tools/34.0.0
+rm build-tools_r34-linux.zip
+
+unzip -q platform-34-ext7_r03.zip -d android-sdk/platforms
+rm platform-34-ext7_r03.zip
+
+unzip -q platform-tools_r35.0.1-linux.zip -d android-sdk
+rm platform-tools_r35.0.1-linux.zip
+
 # Android NDK
 unzip /android-ndk-r27c-linux.zip
 rm -f android-ndk-r27c-linux.zip
+
 END_OF_SCRIPT
 
+ENV JAVA_HOME /openlogic-openjdk-11.0.25+9-linux-x64
+
+ENV ANDROID_HOME /android-sdk
+
 ENV ANDROID_NDK_HOME /android-ndk-r27c
 
 WORKDIR /vcpkg

scripts/azure-pipelines/android/azure-pipelines.yml

@@ -27,7 +27,7 @@ jobs:
   - name: ANDROID_NDK_HOME
     value: /android-ndk-r27c
   - name: ANDROID_DOCKER_IMAGE
-    value: 'vcpkgandroidwus.azurecr.io/vcpkg-android:2025-01-20'
+    value: 'vcpkgandroidwus.azurecr.io/vcpkg-android:2025-02-14'
   steps:
     # Note: /mnt is the Azure machines' temporary disk.
   - bash: |

scripts/azure-pipelines/azure-pipelines.yml

@@ -1,102 +1,102 @@
-# Copyright (c) Microsoft Corporation.
-# SPDX-License-Identifier: MIT
-#
-parameters:
-  - name: vcpkgToolSha
-    displayName: 'Custom SHA of vcpkg-tool to use rather than bootstrap'
-    type: string
-    default:  'use default'
-  - name: tripletPattern
-    displayName: 'Enable triplets which contain this substring'
-    type: string
-    default: '-'
-
-jobs:
-- template: windows/azure-pipelines.yml
-  parameters:
-    jobName: x86_windows
-    vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
-    tripletPattern: ${{ parameters.tripletPattern }}
-
-- template: windows/azure-pipelines.yml
-  parameters:
-    jobName: x64_windows
-    vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
-    tripletPattern: ${{ parameters.tripletPattern }}
-
-- template: windows/azure-pipelines.yml
-  parameters:
-    jobName: x64_windows_release
-    vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
-    tripletPattern: ${{ parameters.tripletPattern }}
-
-- template: windows/azure-pipelines.yml
-  parameters:
-    jobName: x64_windows_static
-    vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
-    tripletPattern: ${{ parameters.tripletPattern }}
-
-- template: windows/azure-pipelines.yml
-  parameters:
-    jobName: x64_windows_static_md
-    vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
-    tripletPattern: ${{ parameters.tripletPattern }}
-
-- template: windows/azure-pipelines.yml
-  parameters:
-    jobName: x64_uwp
-    vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
-    tripletPattern: ${{ parameters.tripletPattern }}
-
-- template: windows/azure-pipelines.yml
-  parameters:
-    jobName: arm64_windows
-    vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
-    tripletPattern: ${{ parameters.tripletPattern }}
-
-- template: windows/azure-pipelines.yml
-  parameters:
-    jobName: arm64_windows_static_md
-    vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
-    tripletPattern: ${{ parameters.tripletPattern }}
-
-- template: windows/azure-pipelines.yml
-  parameters:
-    jobName: arm64_uwp
-    vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
-    tripletPattern: ${{ parameters.tripletPattern }}
-
-- template: osx/azure-pipelines.yml
-  parameters:
-    jobName: x64_osx
-    poolName: 'PrOsx-2025-01-24'
-    vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
-    tripletPattern: ${{ parameters.tripletPattern }}
-
-- template: osx/azure-pipelines.yml
-  parameters:
-    jobName: arm64_osx
-    poolName: 'PrOsx-2025-01-24-arm64'
-    vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
-    tripletPattern: ${{ parameters.tripletPattern }}
-
-- template: linux/azure-pipelines.yml
-  parameters:
-    jobName: x64_linux
-    vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
-    tripletPattern: ${{ parameters.tripletPattern }}
-
-- template: android/azure-pipelines.yml
-  parameters:
-    jobName: arm_neon_android
-    tripletPattern: ${{ parameters.tripletPattern }}
-
-- template: android/azure-pipelines.yml
-  parameters:
-    jobName: x64_android
-    tripletPattern: ${{ parameters.tripletPattern }}
-
-- template: android/azure-pipelines.yml
-  parameters:
-    jobName: arm64_android
-    tripletPattern: ${{ parameters.tripletPattern }}
+# Copyright (c) Microsoft Corporation.
+# SPDX-License-Identifier: MIT
+#
+parameters:
+  - name: vcpkgToolSha
+    displayName: 'Custom SHA of vcpkg-tool to use rather than bootstrap'
+    type: string
+    default:  'use default'
+  - name: tripletPattern
+    displayName: 'Enable triplets which contain this substring'
+    type: string
+    default: '-'
+
+jobs:
+- template: windows/azure-pipelines.yml
+  parameters:
+    jobName: x86_windows
+    vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
+    tripletPattern: ${{ parameters.tripletPattern }}
+
+- template: windows/azure-pipelines.yml
+  parameters:
+    jobName: x64_windows
+    vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
+    tripletPattern: ${{ parameters.tripletPattern }}
+
+- template: windows/azure-pipelines.yml
+  parameters:
+    jobName: x64_windows_release
+    vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
+    tripletPattern: ${{ parameters.tripletPattern }}
+
+- template: windows/azure-pipelines.yml
+  parameters:
+    jobName: x64_windows_static
+    vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
+    tripletPattern: ${{ parameters.tripletPattern }}
+
+- template: windows/azure-pipelines.yml
+  parameters:
+    jobName: x64_windows_static_md
+    vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
+    tripletPattern: ${{ parameters.tripletPattern }}
+
+- template: windows/azure-pipelines.yml
+  parameters:
+    jobName: x64_uwp
+    vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
+    tripletPattern: ${{ parameters.tripletPattern }}
+
+- template: windows/azure-pipelines.yml
+  parameters:
+    jobName: arm64_windows
+    vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
+    tripletPattern: ${{ parameters.tripletPattern }}
+
+- template: windows/azure-pipelines.yml
+  parameters:
+    jobName: arm64_windows_static_md
+    vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
+    tripletPattern: ${{ parameters.tripletPattern }}
+
+- template: windows/azure-pipelines.yml
+  parameters:
+    jobName: arm64_uwp
+    vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
+    tripletPattern: ${{ parameters.tripletPattern }}
+
+- template: osx/azure-pipelines.yml
+  parameters:
+    jobName: x64_osx
+    poolName: 'PrOsx-2025-01-24'
+    vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
+    tripletPattern: ${{ parameters.tripletPattern }}
+
+- template: osx/azure-pipelines.yml
+  parameters:
+    jobName: arm64_osx
+    poolName: 'PrOsx-2025-01-24-arm64'
+    vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
+    tripletPattern: ${{ parameters.tripletPattern }}
+
+- template: linux/azure-pipelines.yml
+  parameters:
+    jobName: x64_linux
+    vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
+    tripletPattern: ${{ parameters.tripletPattern }}
+
+- template: android/azure-pipelines.yml
+  parameters:
+    jobName: arm_neon_android
+    tripletPattern: ${{ parameters.tripletPattern }}
+
+- template: android/azure-pipelines.yml
+  parameters:
+    jobName: x64_android
+    tripletPattern: ${{ parameters.tripletPattern }}
+
+- template: android/azure-pipelines.yml
+  parameters:
+    jobName: arm64_android
+    tripletPattern: ${{ parameters.tripletPattern }}