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

[libimobiledevice/libideviceactivation] update to latest version #19962

Merged
merged 16 commits into from
Sep 24, 2021
Merged

[libimobiledevice/libideviceactivation] update to latest version #19962

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
edcb510
[libimobiledevice/libideviceactivation/libzen] update to latest version
JonLiu1993 Sep 3, 2021
2c3f275
update version
JonLiu1993 Sep 3, 2021
81feaa8
update vcpkg.json format
JonLiu1993 Sep 3, 2021
2d97d3a
update version
JonLiu1993 Sep 3, 2021
92223d3
fix export target
JonLiu1993 Sep 3, 2021
d212b01
update version
JonLiu1993 Sep 3, 2021
2a148d9
handle conflicting files
JonLiu1993 Sep 17, 2021
d463310
update version
JonLiu1993 Sep 17, 2021
1122b30
revert port libzen
JonLiu1993 Sep 17, 2021
2db5624
update version
JonLiu1993 Sep 17, 2021
89e58ee
handle conflict files
JonLiu1993 Sep 17, 2021
f83c86e
handle libzen conflict files
JonLiu1993 Sep 17, 2021
39448c0
delete vcpkg_cmake_config_fixup
JonLiu1993 Sep 18, 2021
818cd36
update version
JonLiu1993 Sep 18, 2021
d60d56b
Merge branch 'master' of https://github.com/Microsoft/vcpkg into dev/…
JonLiu1993 Sep 18, 2021
3a25be6
Merge branch 'master' of https://github.com/Microsoft/vcpkg into dev/…
JonLiu1993 Sep 22, 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
4 changes: 0 additions & 4 deletions ports/libideviceactivation/CONTROL
View file
Open in desktop

This file was deleted.

15 changes: 7 additions & 8 deletions ports/libideviceactivation/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libimobiledevice-win32/libideviceactivation
REF fbe0476cfeddc2fc317ceb900eec12302c1d4c11 # v1.2.235
REF fbe0476cfeddc2fc317ceb900eec12302c1d4c11 # v1.3.17
SHA512 18fdf1b42744da33e0f0f037e83a72b76cc0b63a0b712e78d9736adcde113582327f3712bc2bfa7b6fdb692465700a9106286f383fd7d11f9351ca7939b20e24
HEAD_REF msvc-master
)

configure_file(${CURRENT_PORT_DIR}/CMakeLists.txt ${SOURCE_PATH}/CMakeLists.txt COPYONLY)
configure_file("${CURRENT_PORT_DIR}/CMakeLists.txt" "${SOURCE_PATH}/CMakeLists.txt" COPYONLY)

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
)

vcpkg_install_cmake()
vcpkg_cmake_install()
vcpkg_copy_pdbs()

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

# Handle copyright
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
19 changes: 19 additions & 0 deletions ports/libideviceactivation/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"name": "libideviceactivation",
"version-semver": "1.3.17",
"description": "A library to handle the activation process of iOS devices",
"dependencies": [
"curl",
"libimobiledevice",
"libplist",
"libxml2",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
NancyLi1013 marked this conversation as resolved.
Show resolved Hide resolved
}
]
}
6 changes: 0 additions & 6 deletions ports/libimobiledevice/CONTROL
View file
Open in desktop

This file was deleted.

17 changes: 8 additions & 9 deletions ports/libimobiledevice/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libimobiledevice-win32/libimobiledevice
REF 348aec1f714f77c717141f70869ac7c996c3c6fb # v1.3.6 + patches
SHA512 fc7924667c3cb07025fd25ff94610ae57a90a8fd4502393e89993bfcd13c5e0c609efbf0343f344f59a8520ba4f7805925fea4c06d20ac1680f63f16aac12542
REF 0d4a7e905baeadafa098e629a5241fac6fbf7d24 # v1.3.7
SHA512 db6369b2fa8e7b659948602ac8c4cd568bf37c0f73e58150f61f1af7000de95aa1a6a9ae546d6a37de4cb08a8059127fe5ed067351c4092c01a45350586f755a
HEAD_REF msvc-master
)

configure_file(${CURRENT_PORT_DIR}/CMakeLists.txt ${SOURCE_PATH}/CMakeLists.txt COPYONLY)
configure_file("${CURRENT_PORT_DIR}/CMakeLists.txt" "${SOURCE_PATH}/CMakeLists.txt" COPYONLY)

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
)

vcpkg_install_cmake()
vcpkg_cmake_install()
vcpkg_copy_pdbs()
vcpkg_fixup_pkgconfig()

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

# Handle copyright
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
21 changes: 21 additions & 0 deletions ports/libimobiledevice/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"name": "libimobiledevice",
"version-semver": "1.3.17",
"description": "A cross-platform protocol library to communicate with iOS devices",
"homepage": "http://www.libimobiledevice.org",
"dependencies": [
"dirent",
"getopt",
"libplist",
"libusbmuxd",
"openssl",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
NancyLi1013 marked this conversation as resolved.
Show resolved Hide resolved
}
]
}
3 changes: 0 additions & 3 deletions ports/libzen/CONTROL
View file
Open in desktop

This file was deleted.

20 changes: 9 additions & 11 deletions ports/libzen/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,19 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO MediaArea/ZenLib
REF v0.4.38
SHA512 92c3fc3994bd7110021adbfa3ce48ed6e80f162946b912e9e06ed58edc224600e56e3aab3203ad3fa8759dab9790cb5536475f070f0c060b00585911a6cc0661
REF v0.4.39
SHA512 f36c07b7780d9ac6d65198e52a370f0c7bf931e00aa9ae17c198851d6047e55fffa4642f070ccfe348a041604b63d8710b84f2a1de96135ee9e5be1405c9bcd7
HEAD_REF master
)

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}/Project/CMake
PREFER_NINJA
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}/Project/CMake"
)

vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH share/zenlib TARGET_PATH share/zenlib)
vcpkg_cmake_install()
vcpkg_fixup_pkgconfig()
vcpkg_cmake_config_fixup(PACKAGE_NAME zenlib CONFIG_PATH share/zenlib)

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/libzen RENAME copyright)
file(INSTALL "${SOURCE_PATH}/License.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libzen" RENAME copyright)
15 changes: 15 additions & 0 deletions ports/libzen/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"name": "libzen",
"version-semver": "0.4.39",
"description": "ZenLib is a C++ utility library for easiest cross-platform development",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}
8 changes: 4 additions & 4 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3321,7 +3321,7 @@
"port-version": 0
},
"libideviceactivation": {
"baseline": "1.2.235",
"baseline": "1.3.17",
"port-version": 0
},
"libidn2": {
Expand All @@ -3337,8 +3337,8 @@
"port-version": 0
},
"libimobiledevice": {
"baseline": "1.3.6",
"port-version": 1
"baseline": "1.3.17",
"port-version": 0
},
"libirecovery": {
"baseline": "1.0.25-2",
Expand Down Expand Up @@ -3845,7 +3845,7 @@
"port-version": 0
},
"libzen": {
"baseline": "0.4.38",
"baseline": "0.4.39",
"port-version": 0
},
"libzip": {
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libideviceactivation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "0cb55ce6f88465536a3351cbf8175f9c091948e2",
"version-semver": "1.3.17",
"port-version": 0
},
{
"git-tree": "43967cb5db0fb8ca318d04639a77ae89026605b6",
"version-string": "1.2.235",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libimobiledevice.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "8bcb12f08b4bd0d36b76c3d096ef4b656d78d21d",
"version-semver": "1.3.17",
"port-version": 0
},
{
"git-tree": "7af0cdbc3aa310e494be7c17efc198be75593e92",
"version-string": "1.3.6",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libzen.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "f8032150101fe2169a64cafe88a9daaf8f3961e7",
"version-semver": "0.4.39",
"port-version": 0
},
{
"git-tree": "53a1b657b1e2647f28f64618a7322b51ac85be93",
"version-string": "0.4.38",
Expand Down