From 7dc1ff072e89e12ca2bba2072a4b0da00b786764 Mon Sep 17 00:00:00 2001
From: Billy O'Neal <bion@microsoft.com>
Date: Tue, 12 Aug 2025 08:48:47 -0700
Subject: [PATCH] Update baselines 2025-08-11. (#46871)

---
 ports/elfio/portfile.cmake      |  1 +
 ports/elfio/vcpkg.json          |  1 +
 scripts/ci.baseline.txt         | 15 ++++-----------
 scripts/ci.feature.baseline.txt |  5 +++--
 versions/baseline.json          |  2 +-
 versions/e-/elfio.json          |  5 +++++
 6 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/ports/elfio/portfile.cmake b/ports/elfio/portfile.cmake
index 4268db0d40..2fcd028051 100644
--- a/ports/elfio/portfile.cmake
+++ b/ports/elfio/portfile.cmake
@@ -7,6 +7,7 @@ vcpkg_from_github(
 
 vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}
+    OPTIONS -DELFIO_BUILD_EXAMPLES=OFF
 )
 
 vcpkg_cmake_install()
diff --git a/ports/elfio/vcpkg.json b/ports/elfio/vcpkg.json
index f28702a234..887aa0185e 100644
--- a/ports/elfio/vcpkg.json
+++ b/ports/elfio/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "elfio",
   "version": "3.12",
+  "port-version": 1,
   "description": "A header-only C++ library intended for reading and generating files in the ELF binary format.",
   "homepage": "https://github.com/serge1/ELFIO",
   "license": "MIT",
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 6a49510f0f..4a2ff8e4b1 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -287,9 +287,6 @@ eathread:x64-android=fail
 ecal:arm-neon-android=fail
 ecal:arm64-android=fail
 ecal:x64-android=fail
-elfio:arm-neon-android=fail
-elfio:arm64-android=fail
-elfio:x64-android=fail
 faker-cxx:x64-linux=fail # requires gcc13 or later
 # variable length arrays in C++ are a Clang extension
 fbbgemmerror:arm-neon-android=fail
@@ -779,11 +776,11 @@ orange-math:x64-linux=fail
 orc:arm-neon-android=fail
 orc:arm64-android=fail
 orc:x64-android=fail
-paho-mqtt:arm-neon-android=fail # std::string issue, https://github.com/microsoft/vcpkg/pull/41293#issuecomment-2942853561
-paho-mqtt:arm64-android=fail
 paho-mqtt:arm64-uwp=fail
-paho-mqtt:x64-android=fail
 paho-mqtt:x64-uwp=fail
+paho-mqttpp3:arm-neon-android=fail
+paho-mqttpp3:arm64-android=fail
+paho-mqttpp3:x64-android=fail
 platform-folders:arm64-uwp=fail
 platform-folders:x64-uwp=fail
 plib:arm-neon-android=fail
@@ -792,11 +789,7 @@ plib:x64-android=fail
 pmdk:x64-android=fail
 pmdk:x64-osx=fail
 pmdk:x64-windows-static=fail
-poppler:arm-neon-android=fail # std::string issue, https://github.com/microsoft/vcpkg/pull/41293#issuecomment-2942853561
-poppler:arm64-android=fail
-poppler:x64-android=fail
-# popsift is broken with CUDA 12.6 and later, and we test with 12.8, see https://github.com/alicevision/popsift/issues/161
-popsift:x64-windows-release=fail
+popsift:x64-windows-release=fail # popsift is broken with CUDA 12.6 and later, and we test with 12.8, see https://github.com/alicevision/popsift/issues/161
 popsift:x64-windows-static-md=fail
 popsift:x64-windows-static=fail
 popsift:x64-windows=fail
diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt
index 5b86a1b268..bc9112fe1b 100644
--- a/scripts/ci.feature.baseline.txt
+++ b/scripts/ci.feature.baseline.txt
@@ -390,8 +390,10 @@ openvr:x64-uwp=fail
 openvr:x64-windows-static=fail
 opusfile:arm-uwp=fail
 opusfile:x64-uwp=fail
-paho-mqtt(android)=fail
 paho-mqtt(uwp)=fail
+paho-mqttpp3:arm-neon-android=fail
+paho-mqttpp3:arm64-android=fail
+paho-mqttpp3:x64-android=fail
 pfring:arm64-osx=fail
 pfring:x64-osx=fail
 pixman:arm-uwp=fail
@@ -408,7 +410,6 @@ pmdk:x64-osx=fail
 pmdk:x64-uwp=fail
 pmdk:x64-windows-static=fail
 pmdk:x86-windows=fail
-poppler(android)=fail
 popsift:x64-windows-static-md=fail
 portable-snippets:arm-uwp=fail
 qbittorrent:x64-linux=fail # Not yet ready for these platforms.
diff --git a/versions/baseline.json b/versions/baseline.json
index 09f2943848..e728cf62cc 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2666,7 +2666,7 @@
     },
     "elfio": {
       "baseline": "3.12",
-      "port-version": 0
+      "port-version": 1
     },
     "elfutils": {
       "baseline": "0.193",
diff --git a/versions/e-/elfio.json b/versions/e-/elfio.json
index c5a2e01444..ff9c184178 100644
--- a/versions/e-/elfio.json
+++ b/versions/e-/elfio.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8674d98920045ac30ab5534830e519df5a9f3609",
+      "version": "3.12",
+      "port-version": 1
+    },
     {
       "git-tree": "96b9160e3d2440526fac5a7630d4fec4d26c49e5",
       "version": "3.12",