Skip to content

[zstd] update to 1.4.9 #16865

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vicroms merged 8 commits into from
Mar 31, 2021
Merged

[zstd] update to 1.4.9 #16865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
88315f1
[zstd] update to 1.4.9
Thieum Mar 24, 2021
29b9277
update baseline / version
Thieum Mar 24, 2021
a224b1d
Update vcpkg.json
Thieum Mar 24, 2021
31a05fc
Update vcpkg.json
Thieum Mar 24, 2021
36e9051
attempt to fix build errors (missing file libzstd?)
Thieum Mar 25, 2021
58f2894
Update zstd.json
Thieum Mar 25, 2021
16a7c67
Update portfile.cmake
JonLiu1993 Mar 30, 2021
720a5b8
fix version
Thieum Mar 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions ports/zstd/0002-crosscompile-windows.patch
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions ports/zstd/CONTROL
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions ports/zstd/fix_assert.patch
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions ports/zstd/install_dll.patch
View file
Open in desktop

This file was deleted.

9 changes: 5 additions & 4 deletions ports/zstd/install_pkgpc.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
diff --git a/build/cmake/lib/CMakeLists.txt b/build/cmake/lib/CMakeLists.txt
index 666da60c1..4274cbdd3 100644
index 179c9762..f86efdbc 100644
--- a/build/cmake/lib/CMakeLists.txt
+++ b/build/cmake/lib/CMakeLists.txt
@@ -134,7 +134,7 @@ if (ZSTD_BUILD_STATIC)
OUTPUT_NAME ${STATIC_LIBRARY_BASE_NAME})
endif ()
-if (UNIX)

-if (UNIX OR MINGW)
+if (1)
# pkg-config
set(PREFIX "${CMAKE_INSTALL_PREFIX}")
set(LIBDIR "${CMAKE_INSTALL_LIBDIR}")
set(EXEC_PREFIX "\${prefix}")

7 changes: 2 additions & 5 deletions ports/zstd/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebook/zstd
REF b706286adbba780006a47ef92df0ad7a785666b6 # v1.4.5
SHA512 1be43e8cc1dad9dd59036f86a7dd579b8fcbf16b3ebae62f38aa0397f45ab0eab2e97e924cede40428fa9125a2e5e567694bb04a0c9ec0c4275a79cd2ef8eb11
REF v1.4.9
SHA512 f529db9c094f9ae26428bf1fdfcc91c6d783d400980e0f0d802d2cf13c2be2931465ef568907e03841ff76a369a1447e7371f8799d8526edb9a513ba5c6db133
HEAD_REF dev
PATCHES
0002-crosscompile-windows.patch
fix_assert.patch
install_pkgpc.patch
install_dll.patch
)

if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
Expand Down
6 changes: 6 additions & 0 deletions ports/zstd/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"name": "zstd",
"version": "1.4.9",
"description": "Zstandard - Fast real-time compression algorithm",
"homepage": "https://facebook.github.io/zstd/"
}
4 changes: 2 additions & 2 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6473,8 +6473,8 @@
"port-version": 0
},
"zstd": {
"baseline": "1.4.5",
"port-version": 1
"baseline": "1.4.9",
"port-version": 0
},
"zstr": {
"baseline": "1.0.4",
Expand Down
5 changes: 5 additions & 0 deletions versions/z-/zstd.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "3a0ffa2a8fe8246a3937d9f6a77d577e351dd445",
"version": "1.4.9",
"port-version": 0
},
{
"git-tree": "b592e9dd5ab7aa6c1b46e0d23e0d31093edd73ca",
"version-string": "1.4.5",
Expand Down