[vcpkg baseline][libao] Disable dlfcn check under windows (#23235)

* [libao] Add parameter to control whether to detect dlfcn * Use Cache variables instead of patch file * Avoid using undefined variable Co-authored-by: Cheney-Wang <[email protected]>
microsoft · Feb 23, 2022 · b23242b · b23242b
1 parent 4015784
commit b23242b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/ports/libao/portfile.cmake b/ports/libao/portfile.cmake
@@ -1,5 +1,7 @@
+set(NO_DLFCN )
 if(VCPKG_TARGET_IS_WINDOWS)
   list(APPEND PATCHES "0001-windows-build-patch.patch")
+  set(NO_DLFCN "ac_cv_header_dlfcn_h=no")
 endif()
 
 vcpkg_from_github(
@@ -18,7 +20,8 @@ endif()
 vcpkg_configure_make(
   SOURCE_PATH ${SOURCE_PATH}
   AUTOCONFIG
-  OPTIONS  --disable-binaries 
+  OPTIONS  --disable-binaries
+           ${NO_DLFCN}
 )
 vcpkg_install_make()
 

diff --git a/ports/libao/vcpkg.json b/ports/libao/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libao",
   "version": "1.2.2",
-  "port-version": 3,
+  "port-version": 4,
   "description": "libao - A Cross-platform Audio Library",
   "homepage": "https://github.com/xiph/libao",
   "license": "GPL-2.0",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -3334,7 +3334,7 @@
     },
     "libao": {
       "baseline": "1.2.2",
-      "port-version": 3
+      "port-version": 4
     },
     "libarchive": {
       "baseline": "3.5.2",

diff --git a/versions/l-/libao.json b/versions/l-/libao.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "11240d91b73e6a968da37b8053a8a64a6d9ea55f",
+      "version": "1.2.2",
+      "port-version": 4
+    },
     {
       "git-tree": "931d3ed363323bdc4de00c91165f3a09e23fb6b1",
       "version": "1.2.2",