From f7f6dbb0834e1d5b625db78ae65f725c243787c4 Mon Sep 17 00:00:00 2001
From: Matthew Oliver <protogonoi@gmail.com>
Date: Thu, 29 Dec 2022 07:59:44 +1100
Subject: [PATCH] [aubio] Update to latest master. (#28491)

* [aubio] Update to latest master.

This is required to support using newer versions of ffmpeg (5.0+)

* Update versions.
---
 ports/aubio/CMakeLists.txt |  1 +
 ports/aubio/portfile.cmake | 10 +++++++---
 ports/aubio/vcpkg.json     |  3 +--
 versions/a-/aubio.json     |  5 +++++
 versions/baseline.json     |  4 ++--
 5 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/ports/aubio/CMakeLists.txt b/ports/aubio/CMakeLists.txt
index b711c9f39c..790a04685e 100644
--- a/ports/aubio/CMakeLists.txt
+++ b/ports/aubio/CMakeLists.txt
@@ -56,6 +56,7 @@ if(WITH_DEPENDENCIES)
 endif()
 
 if(WIN32)
+    target_compile_definitions(aubio PRIVATE -DHAVE_WIN_HACKS=1)
     target_link_libraries(aubio PUBLIC ws2_32)
 endif()
 
diff --git a/ports/aubio/portfile.cmake b/ports/aubio/portfile.cmake
index f7ab0f1abf..26d4fa9bf7 100644
--- a/ports/aubio/portfile.cmake
+++ b/ports/aubio/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO aubio/aubio
-    REF 0.4.9
-    SHA512 a22c7c581ce1f428270021591649273396e6dc222b3c7b3d46f5c4abf94a98be1ab89320cdbf1b6b60d4330eef23976439e3fc9e0f8d3cdd867dac4542fa48c9
+    REF 8a05420e5dd8c7b8b2447f82dc919765876511b3
+    SHA512 080775d7b972d31d88671b4a2917e926bc933b7bdc50fc56a4a8e3174b4544fd6fd416c06b064488cea777cbdd4eea63d0b35eca0025f53ab71da0ba8b64824f
     HEAD_REF master
 )
 
@@ -31,6 +31,10 @@ vcpkg_cmake_config_fixup()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
 
 vcpkg_copy_pdbs()
-vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}")
+if("tools" IN_LIST FEATURES)
+    vcpkg_copy_tools(TOOL_NAMES aubiomfcc aubionotes aubioonset aubiopitch aubioquiet aubiotrack
+        SEARCH_DIR ${CURRENT_PACKAGES_DIR}/tools/aubio
+        AUTO_CLEAN)
+endif()
 
 file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/aubio/vcpkg.json b/ports/aubio/vcpkg.json
index e774045343..b7007a8bdb 100644
--- a/ports/aubio/vcpkg.json
+++ b/ports/aubio/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "aubio",
-  "version-semver": "0.4.9",
-  "port-version": 9,
+  "version-date": "2022-01-26",
   "description": "Aubio is a tool designed for the extraction of annotations from audio signals. Its features include segmenting a sound file before each of its attacks, performing pitch detection, tapping the beat and producing midi streams from live audio.",
   "homepage": "https://github.com/aubio/aubio",
   "license": "GPL-3.0-or-later",
diff --git a/versions/a-/aubio.json b/versions/a-/aubio.json
index 11156e198e..8117a0dce9 100644
--- a/versions/a-/aubio.json
+++ b/versions/a-/aubio.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2e15f362018acee6d200577e41252e911eef35f0",
+      "version-date": "2022-01-26",
+      "port-version": 0
+    },
     {
       "git-tree": "511a11ecdc92221bcde518ad98f22512788a07a4",
       "version-semver": "0.4.9",
diff --git a/versions/baseline.json b/versions/baseline.json
index 1379bbfb08..533051239a 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -253,8 +253,8 @@
       "port-version": 0
     },
     "aubio": {
-      "baseline": "0.4.9",
-      "port-version": 9
+      "baseline": "2022-01-26",
+      "port-version": 0
     },
     "audiofile": {
       "baseline": "1.1.0",