From 621c1fdb1b0cfed61478767098e640072f2f9f7d Mon Sep 17 00:00:00 2001 From: Jon Date: Tue, 4 Mar 2025 00:29:05 -0800 Subject: [PATCH 1/4] [libogg] Upgrade CMake 3.5 --- ports/libogg/portfile.cmake | 3 +++ ports/libogg/vcpkg.json | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ports/libogg/portfile.cmake b/ports/libogg/portfile.cmake index be9f519a1dce9d..b394b41be238f8 100644 --- a/ports/libogg/portfile.cmake +++ b/ports/libogg/portfile.cmake @@ -14,9 +14,12 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DINSTALL_DOCS=OFF -DINSTALL_PKG_CONFIG_MODULE=ON -DBUILD_TESTING=OFF + MAYBE_UNUSED_VARIABLES + CMAKE_POLICY_VERSION_MINIMUM ) vcpkg_cmake_install() diff --git a/ports/libogg/vcpkg.json b/ports/libogg/vcpkg.json index dba3d701fbc9ee..72011acb4e1236 100644 --- a/ports/libogg/vcpkg.json +++ b/ports/libogg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libogg", "version": "1.3.5", - "port-version": 1, + "port-version": 2, "description": "Ogg is a multimedia container format, and the native file and stream format for the Xiph.org multimedia codecs.", "homepage": "https://www.xiph.org/ogg", "license": "BSD-3-Clause", From 8e9dd33d405d96bc6f86c7d9bf37d5fbeaa196b1 Mon Sep 17 00:00:00 2001 From: Jon Date: Tue, 4 Mar 2025 00:29:27 -0800 Subject: [PATCH 2/4] update version --- versions/baseline.json | 2 +- versions/l-/libogg.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 49ac1161c681a0..b61ba845506db9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4942,7 +4942,7 @@ }, "libogg": { "baseline": "1.3.5", - "port-version": 1 + "port-version": 2 }, "libopenmpt": { "baseline": "0.7.13", diff --git a/versions/l-/libogg.json b/versions/l-/libogg.json index 164c84e05964a2..5788894d69beed 100644 --- a/versions/l-/libogg.json +++ b/versions/l-/libogg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "455877c88aeb81bcdba4c915abfe15096ff3430e", + "version": "1.3.5", + "port-version": 2 + }, { "git-tree": "98e27727c32704393494d32615c25b7b16eb3067", "version": "1.3.5", From 154d97925c35b55c381c7aa44c1930bdc5e93b80 Mon Sep 17 00:00:00 2001 From: "zhao liu (BEYONDSOFT CONSULTING INC)" Date: Fri, 7 Mar 2025 01:56:58 -0800 Subject: [PATCH 3/4] Add a link --- ports/libogg/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/libogg/portfile.cmake b/ports/libogg/portfile.cmake index b394b41be238f8..079aca00ea8cb7 100644 --- a/ports/libogg/portfile.cmake +++ b/ports/libogg/portfile.cmake @@ -14,7 +14,7 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DCMAKE_POLICY_VERSION_MINIMUM=3.5 + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 #https://gitlab.xiph.org/xiph/ogg/-/issues/2304 -DINSTALL_DOCS=OFF -DINSTALL_PKG_CONFIG_MODULE=ON -DBUILD_TESTING=OFF From 427fe646ad083cd726164e7c734b81c7a8e8d838 Mon Sep 17 00:00:00 2001 From: "zhao liu (BEYONDSOFT CONSULTING INC)" Date: Fri, 7 Mar 2025 01:58:09 -0800 Subject: [PATCH 4/4] update version --- versions/l-/libogg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/libogg.json b/versions/l-/libogg.json index 5788894d69beed..ade5c39a0a7c8f 100644 --- a/versions/l-/libogg.json +++ b/versions/l-/libogg.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "455877c88aeb81bcdba4c915abfe15096ff3430e", + "git-tree": "7de72b080f4e8596980840f33de0a62394d99e6b", "version": "1.3.5", "port-version": 2 },