Skip to content

Commit

Permalink
Update 3 packages
Browse files Browse the repository at this point in the history
mingw-w64-i686-zstd (1.5.5-1 -> 1.5.6-1)
mingw-w64-x86_64-libdeflate (1.19-2 -> 1.20-1)
mingw-w64-x86_64-zstd (1.5.5-1 -> 1.5.6-1)

Signed-off-by: Git for Windows Build Agent <[email protected]>
  • Loading branch information
Git for Windows Build Agent committed Mar 28, 2024
1 parent 5661ee8 commit 488cb73
Show file tree
Hide file tree
Showing 59 changed files with 634 additions and 274 deletions.
Binary file modified mingw32/bin/libzstd.dll
Binary file not shown.
Binary file modified mingw32/bin/pzstd.exe
Binary file not shown.
Binary file modified mingw32/bin/zstd.exe
Binary file not shown.
189 changes: 129 additions & 60 deletions mingw32/include/zstd.h

Large diffs are not rendered by default.

35 changes: 34 additions & 1 deletion mingw32/lib/cmake/zstd/zstdConfig.cmake
Original file line number Diff line number Diff line change
@@ -1 +1,34 @@
include("${CMAKE_CURRENT_LIST_DIR}/zstdTargets.cmake")

####### Expanded from @PACKAGE_INIT@ by configure_package_config_file() #######
####### Any changes to this file will be overwritten by the next CMake run ####
####### The input file was zstdConfig.cmake.in ########

get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE)

macro(set_and_check _var _file)
set(${_var} "${_file}")
if(NOT EXISTS "${_file}")
message(FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !")
endif()
endmacro()

macro(check_required_components _NAME)
foreach(comp ${${_NAME}_FIND_COMPONENTS})
if(NOT ${_NAME}_${comp}_FOUND)
if(${_NAME}_FIND_REQUIRED_${comp})
set(${_NAME}_FOUND FALSE)
endif()
endif()
endforeach()
endmacro()

####################################################################################

include(CMakeFindDependencyMacro)
if(ON AND "")
find_dependency(Threads)
endif()

include("${CMAKE_CURRENT_LIST_DIR}/zstdTargets.cmake")

check_required_components("zstd")
6 changes: 3 additions & 3 deletions mingw32/lib/cmake/zstd/zstdConfigVersion.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@
# The variable CVF_VERSION must be set before calling configure_file().


set(PACKAGE_VERSION "1.5.5")
set(PACKAGE_VERSION "1.5.6")

if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
set(PACKAGE_VERSION_COMPATIBLE FALSE)
else()

if("1.5.5" MATCHES "^([0-9]+)\\.")
if("1.5.6" MATCHES "^([0-9]+)\\.")
set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0)
string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}")
endif()
else()
set(CVF_VERSION_MAJOR "1.5.5")
set(CVF_VERSION_MAJOR "1.5.6")
endif()

if(PACKAGE_FIND_VERSION_RANGE)
Expand Down
2 changes: 1 addition & 1 deletion mingw32/lib/cmake/zstd/zstdTargets-release.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ list(APPEND _cmake_import_check_files_for_zstd::libzstd_shared "${_IMPORT_PREFIX
# Import target "zstd::libzstd_static" for configuration "Release"
set_property(TARGET zstd::libzstd_static APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
set_target_properties(zstd::libzstd_static PROPERTIES
IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C"
IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "ASM;C"
IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libzstd.a"
)

Expand Down
30 changes: 21 additions & 9 deletions mingw32/lib/cmake/zstd/zstdTargets.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.8)
message(FATAL_ERROR "CMake >= 2.8.0 required")
endif()
if(CMAKE_VERSION VERSION_LESS "2.8.3")
message(FATAL_ERROR "CMake >= 2.8.3 required")
if(CMAKE_VERSION VERSION_LESS "3.0.0")
message(FATAL_ERROR "CMake >= 3.0.0 required")
endif()
cmake_policy(PUSH)
cmake_policy(VERSION 2.8.3...3.24)
cmake_policy(VERSION 3.0.0...3.27)
#----------------------------------------------------------------
# Generated CMake target import file.
#----------------------------------------------------------------
Expand All @@ -19,7 +19,7 @@ set(CMAKE_IMPORT_FILE_VERSION 1)
set(_cmake_targets_defined "")
set(_cmake_targets_not_defined "")
set(_cmake_expected_targets "")
foreach(_cmake_expected_target IN ITEMS zstd::libzstd_shared zstd::libzstd_static)
foreach(_cmake_expected_target IN ITEMS zstd::libzstd_shared zstd::libzstd_static zstd::libzstd)
list(APPEND _cmake_expected_targets "${_cmake_expected_target}")
if(TARGET "${_cmake_expected_target}")
list(APPEND _cmake_targets_defined "${_cmake_expected_target}")
Expand Down Expand Up @@ -69,6 +69,14 @@ set_target_properties(zstd::libzstd_static PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
)

# Create imported target zstd::libzstd
add_library(zstd::libzstd INTERFACE IMPORTED)

set_target_properties(zstd::libzstd PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
INTERFACE_LINK_LIBRARIES "zstd::libzstd_static"
)

# Load information for each installed configuration.
file(GLOB _cmake_config_files "${CMAKE_CURRENT_LIST_DIR}/zstdTargets-*.cmake")
foreach(_cmake_config_file IN LISTS _cmake_config_files)
Expand All @@ -82,9 +90,12 @@ set(_IMPORT_PREFIX)

# Loop over all imported files and verify that they actually exist
foreach(_cmake_target IN LISTS _cmake_import_check_targets)
foreach(_cmake_file IN LISTS "_cmake_import_check_files_for_${_cmake_target}")
if(NOT EXISTS "${_cmake_file}")
message(FATAL_ERROR "The imported target \"${_cmake_target}\" references the file
if(CMAKE_VERSION VERSION_LESS "3.28"
OR NOT DEFINED _cmake_import_check_xcframework_for_${_cmake_target}
OR NOT IS_DIRECTORY "${_cmake_import_check_xcframework_for_${_cmake_target}}")
foreach(_cmake_file IN LISTS "_cmake_import_check_files_for_${_cmake_target}")
if(NOT EXISTS "${_cmake_file}")
message(FATAL_ERROR "The imported target \"${_cmake_target}\" references the file
\"${_cmake_file}\"
but this file does not exist. Possible reasons include:
* The file was deleted, renamed, or moved to another location.
Expand All @@ -93,8 +104,9 @@ but this file does not exist. Possible reasons include:
\"${CMAKE_CURRENT_LIST_FILE}\"
but not all the files it references.
")
endif()
endforeach()
endif()
endforeach()
endif()
unset(_cmake_file)
unset("_cmake_import_check_files_for_${_cmake_target}")
endforeach()
Expand Down
Binary file modified mingw32/lib/libzstd.a
Binary file not shown.
Binary file modified mingw32/lib/libzstd.dll.a
Binary file not shown.
2 changes: 1 addition & 1 deletion mingw32/lib/pkgconfig/libzstd.pc
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ libdir=${exec_prefix}/lib
Name: zstd
Description: fast lossless compression algorithm library
URL: https://facebook.github.io/zstd/
Version: 1.5.5
Version: 1.5.6
Libs: -L${libdir} -lzstd
Libs.private:
Cflags: -I${includedir}
Loading

0 comments on commit 488cb73

Please sign in to comment.