Skip to content
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

Jump to bottom

[libzip] update to rel-1-6-1 #10784

Merged
merged 5 commits into from
Apr 24, 2020
Merged

[libzip] update to rel-1-6-1 #10784

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bfd4309
Libzip updated to rel-1-6-1
mitzal Apr 13, 2020
def96f4
[libzip] Add windows_crypto feature
janisozaur Apr 14, 2020
db7e8a9
Merge pull request #1 from janisozaur/libzip-windows-crypto
mitzal Apr 14, 2020
e63de28
Additional options added.
mitzal Apr 18, 2020
9000ccd
Common Crypto supported as an option for encryption backend.
mitzal Apr 23, 2020
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
2 changes: 1 addition & 1 deletion ports/libzip/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: libzip
Version: rel-1-5-2--1
Version: rel-1-6-1
Homepage: https://github.com/nih-at/libzip
Build-Depends: zlib
Default-Features: openssl, bzip2
Expand Down
13 changes: 0 additions & 13 deletions ports/libzip/avoid_computation_on_void_pointer.patch
View file
Open in desktop

This file was deleted.

24 changes: 8 additions & 16 deletions ports/libzip/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,26 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO nih-at/libzip
REF rel-1-5-2
SHA512 5ba765c5d4ab47dff24bfa5e73b798046126fcc88b29d5d9ce9d77d035499ae91d90cc526f1f73bbefa07b7b68ff6cf77e912e5793859f801caaf2061cb20aee
REF rel-1-6-1
SHA512 7ee414c063f9f76bec7d96ff9dadbc4be8d37a7b907b977882bf40f8ab66f0e46d3b8f70083c7bd272cc298d855d0d72b494b5772f26e1f4ff7ffeefe780adaf
HEAD_REF master
PATCHES avoid_computation_on_void_pointer.patch
)

# AES encryption
set(USE_OPENSSL OFF)
if("openssl" IN_LIST FEATURES)
set(USE_OPENSSL ON)
endif()

set(USE_BZIP2 OFF)
if("bzip2" IN_LIST FEATURES)
set(USE_BZIP2 ON)
endif()
vcpkg_check_features(
OUT_FEATURE_OPTIONS FEATURE_OPTIONS
openssl OPENSSL
bzip2 BZIP2
)

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
${FEATURE_OPTIONS}
mitzal marked this conversation as resolved.
Show resolved Hide resolved
-DBUILD_DOC=OFF
-DBUILD_EXAMPLES=OFF
-DBUILD_REGRESS=OFF
-DBUILD_TOOLS=OFF
# see https://github.com/nih-at/libzip/blob/rel-1-5-2/INSTALL.md
-DENABLE_OPENSSL=${USE_OPENSSL}
-DENABLE_BZIP2=${USE_BZIP2}
)

vcpkg_install_cmake()
Expand Down