[7zip] Update to 24.06 (microsoft#38790)

Fixes microsoft#38764, update `7zip` to 24.06. No feature needs to be tested, the usage test passed on `x64-windows`(header files found): ``` 7zip provides CMake targets: # this is heuristically generated, and may not be correct find_package(7zip CONFIG REQUIRED) target_link_libraries(main PRIVATE 7zip::7zip) ```
m-kuhn · Jun 11, 2024 · a193e8f · a193e8f
1 parent b276513
commit a193e8f
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 17 deletions.
diff --git a/ports/7zip/CMakeLists.txt b/ports/7zip/CMakeLists.txt
@@ -65,6 +65,7 @@ target_sources(7zip PRIVATE
     CPP/7zip/Compress/ZDecoder.cpp
     CPP/7zip/Compress/ZlibDecoder.cpp
     CPP/7zip/Compress/ZlibEncoder.cpp
+    CPP/7zip/Compress/ZstdDecoder.cpp
 
     CPP/7zip/Crypto/7zAes.cpp
     CPP/7zip/Crypto/7zAesRegister.cpp
@@ -122,6 +123,8 @@ target_sources(7zip PRIVATE
     C/Aes.c
     C/7zCrc.c
     C/XzCrc64.c
+    C/Xxh64.c
+    C/ZstdDec.c
 
     CPP/Common/CRC.cpp
     CPP/Common/CrcReg.cpp
@@ -144,6 +147,7 @@ target_sources(7zip PRIVATE
     CPP/Common/Wildcard.cpp
     CPP/Common/XzCrc64Init.cpp
     CPP/Common/XzCrc64Reg.cpp
+    CPP/Common/Xxh64Reg.cpp
 
     CPP/Windows/FileDir.cpp
     CPP/Windows/FileFind.cpp
@@ -219,6 +223,7 @@ target_sources(7zip PRIVATE
     CPP/7zip/Archive/ZHandler.cpp
     CPP/7zip/Archive/ArchiveExports.cpp
     CPP/7zip/Archive/DllExports2.cpp
+    CPP/7zip/Archive/ZstdHandler.cpp
 
     CPP/7zip/Archive/Common/CoderMixer2.cpp
     CPP/7zip/Archive/Common/DummyOutStream.cpp

diff --git a/ports/7zip/portfile.cmake b/ports/7zip/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ip7z/7zip
     REF "${VERSION}"
-    SHA512 7c2fb18261ce9185d29b690ccb7694d7926abe3af0619dbe42b7ab43b400ee71c1eb79c31f892aea2fbdb55036225f31ee393287cce91afd17f20cff8f6cb949
+    SHA512 9ce8acdbbb44045c5c9983db1093b6abc78439ee2b0ba57820a44a08d0787cb5ab34e25fd3ff33a93f274cc006684ce6013d4e98b47e7834318898e9d10d2259
     HEAD_REF main
 )
 

diff --git a/ports/7zip/vcpkg.json b/ports/7zip/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "7zip",
-  "version-string": "23.01",
-  "port-version": 2,
+  "version-string": "24.06",
   "description": "Library for archiving file with a high compression ratio.",
   "homepage": "https://www.7-zip.org",
   "license": "LGPL-2.1-or-later",

diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
@@ -40,6 +40,7 @@
 
 7zip:arm-neon-android=fail
 7zip:arm64-android=fail
+7zip:x64-android=fail
 ace:arm-neon-android=fail
 ace:arm64-android=fail
 ace:x64-android=fail

diff --git a/scripts/cmake/vcpkg_find_acquire_program(7Z).cmake b/scripts/cmake/vcpkg_find_acquire_program(7Z).cmake
@@ -1,9 +1,9 @@
 set(program_name 7z)
 if(CMAKE_HOST_WIN32)
-    set(tool_subdirectory "23.01")
+    set(tool_subdirectory "24.06")
     set(paths_to_search "${DOWNLOADS}/tools/7zip_msi-${tool_subdirectory}-windows/Files/7-Zip") # vcpkg fetch 7zip_msi path
     list(APPEND paths_to_search "${DOWNLOADS}/tools/7z/${tool_subdirectory}/Files/7-Zip")
-    set(download_urls "https://github.com/ip7z/7zip/releases/download/23.01/7z2301.msi" "https://7-zip.org/a/7z2301.msi")
-    set(download_filename "7z2301.msi")
-    set(download_sha512 002c8ab30be802fa5fa90896d2bdf710bfbd89e39487af25af9d63821986e6d11c42b1c4f4acc79d325719b10193cd31c38f648403ef16f0580609afa8da9596)
+    set(download_urls "https://github.com/ip7z/7zip/releases/download/24.06/7z2406.msi" "https://7-zip.org/a/7z2406.msi")
+    set(download_filename "7z2406.msi")
+    set(download_sha512 44cac24b4fb9972680e99adfe7cc99baff972007a5803b01e0c96388412456c333ce6f38990673e9338f4af35c0630db6d1cf116eda9895cb2b8d60ed287787f)
 endif()
diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml
@@ -131,18 +131,18 @@
         <archiveName>installer-framework-opensource-src-4.4.0.zip</archiveName>
     </tool>
     <tool name="7zip_msi" os="windows">
-        <version>23.01</version>
+        <version>24.06</version>
         <exeRelativePath>Files\7-Zip\7z.exe</exeRelativePath>
-        <url>https://github.com/ip7z/7zip/releases/download/23.01/7z2301-x64.msi</url>
-        <sha512>09e3ce970ea8383e8c736a51ebb61e3036e655c81d59bc64c5eecb041abdad2cbce2f400fcf4478e22f56fe40f8d912c639f550a5f990e24abfd4e86cdd3755c</sha512>
-        <archiveName>7z2301-x64.msi</archiveName>
+        <url>https://github.com/ip7z/7zip/releases/download/24.06/7z2406-x64.msi</url>
+        <sha512>d5eb068a4a488ca1c6025230be9f9cfbc99bf13a2230c0edc69d014f63f2f15c6582050dcaf11e77b1a13df38e2be324a4590e6ea78852b6fcaa91681729326f</sha512>
+        <archiveName>7z2406-x64.msi</archiveName>
     </tool>
     <tool name="7zip" os="windows">
-        <version>23.01</version>
+        <version>24.06</version>
         <exeRelativePath>7za.exe</exeRelativePath>
-        <url>https://github.com/ip7z/7zip/releases/download/23.01/7z2301-extra.7z</url>
-        <sha512>c849c2cb489cf5b6eeb92bfbc27dcb37d0349c36971e1bc7ef32c7cde1b659e19e8b46d734ba90f47affe07fdfd5b4774cbfa0fdf4b681e9f60bb46bba1f7f9b</sha512>
-        <archiveName>7z2301-extra.7z</archiveName>
+        <url>https://github.com/ip7z/7zip/releases/download/24.06/7z2406-extra.7z</url>
+        <sha512>6b88a761f7cc8b8affc074b24750bcdc65cc3ab18d127c8bfdd1eca953d43e21558eb1137c4b934689990564d7d24cf14e249a773dc1e5ddb7316b10d73682f8</sha512>
+        <archiveName>7z2406-extra.7z</archiveName>
      </tool>
     <tool name="aria2" os="windows">
         <version>1.37.0</version>

diff --git a/versions/7-/7zip.json b/versions/7-/7zip.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "142f1372ed52dd210159c9ae75e6195009451554",
+      "version-string": "24.06",
+      "port-version": 0
+    },
     {
       "git-tree": "23256cddd31991c2df4d96a07fc016fd446c2d2d",
       "version-string": "23.01",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -5,8 +5,8 @@
       "port-version": 4
     },
     "7zip": {
-      "baseline": "23.01",
-      "port-version": 2
+      "baseline": "24.06",
+      "port-version": 0
     },
     "ableton": {
       "baseline": "3.0.6",