diff --git a/ports/cpuid/fix-MSVC-warning.patch b/ports/cpuid/fix-MSVC-warning.patch deleted file mode 100644 index d3e2fc01ce..0000000000 --- a/ports/cpuid/fix-MSVC-warning.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/libcpuid/cpuid_main.c b/libcpuid/cpuid_main.c -index ed3db36..b082caa 100644 ---- a/libcpuid/cpuid_main.c -+++ b/libcpuid/cpuid_main.c -@@ -1452,7 +1452,7 @@ int cpuid_get_raw_data_core(struct cpu_raw_data_t* data, logical_cpu_t logical_c - } - # endif /* PLATFORM_AARCH64 */ - #else --# warning This CPU architecture is not supported by libcpuid -+#pragma message("Warning: This CPU architecture is not supported by libcpuid") - UNUSED(data); - #endif - diff --git a/ports/cpuid/fix-build.patch b/ports/cpuid/fix-build.patch index 2edb36c639..5b56a9736f 100644 --- a/ports/cpuid/fix-build.patch +++ b/ports/cpuid/fix-build.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index a8f9f25..21e2c37 100644 +index 4f5ff50..3d62dba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -66,7 +66,6 @@ endif(UNIX) +@@ -61,7 +61,6 @@ endif(UNIX) # Include subdirectories add_subdirectory(libcpuid) diff --git a/ports/cpuid/portfile.cmake b/ports/cpuid/portfile.cmake index ecc135571b..0b2116ea6b 100644 --- a/ports/cpuid/portfile.cmake +++ b/ports/cpuid/portfile.cmake @@ -2,12 +2,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO anrieff/libcpuid REF "v${VERSION}" - SHA512 26353763461cbbe664ddaa6933cbd9016e3b11d8a056bc8c2b92818dfe3a43fcda76a92270f716eeb00ae61b75288c7079add8d7ac2290a0a0d5c3bd7d898d44 + SHA512 6b642418bef40848fa0b61a6798c90121e1d31dceee815946bde621e01f50a8353d4cd22bce864af080e4342e036bab9bfe1f61f99083620885f9e252ce11895 HEAD_REF master PATCHES fix-build.patch fix-LNK2019.patch - fix-MSVC-warning.patch ) vcpkg_cmake_configure( diff --git a/ports/cpuid/vcpkg.json b/ports/cpuid/vcpkg.json index 748be11ba0..4bc4a3ee23 100644 --- a/ports/cpuid/vcpkg.json +++ b/ports/cpuid/vcpkg.json @@ -1,7 +1,6 @@ { "name": "cpuid", - "version": "0.7.0", - "port-version": 1, + "version": "0.8.1", "description": "Provides CPU identification for the x86 (and x86_64)", "homepage": "https://github.com/anrieff/libcpuid", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index cc70cf3005..cf7b740a76 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2125,8 +2125,8 @@ "port-version": 0 }, "cpuid": { - "baseline": "0.7.0", - "port-version": 1 + "baseline": "0.8.1", + "port-version": 0 }, "cpuinfo": { "baseline": "2022-07-19", diff --git a/versions/c-/cpuid.json b/versions/c-/cpuid.json index b465d365fd..c1fa2e43c9 100644 --- a/versions/c-/cpuid.json +++ b/versions/c-/cpuid.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b90d34b2f1c0beb99267cb7ad58ffe81b90cd471", + "version": "0.8.1", + "port-version": 0 + }, { "git-tree": "12033f70664a516b6f698d62ee473395daba302b", "version": "0.7.0",