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

[Many ports] Update to the latest version or commit #13560

Merged
merged 4 commits into from
Sep 22, 2020
Merged

[Many ports] Update to the latest version or commit #13560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7cb517f
[Many ports] Update to the latest version or commit
Sep 16, 2020
f437a42
[libplist] Update version
Sep 16, 2020
d892e6c
Update as review suggestions
Sep 21, 2020
e89be50
[libplist] Revert changes
Sep 22, 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
4 changes: 2 additions & 2 deletions ports/liblinear/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ add_library(blas OBJECT

add_library(liblinear
linear.cpp
tron.cpp
newton.cpp
$<TARGET_OBJECTS:blas>
)
target_include_directories(liblinear PRIVATE .)
Expand Down Expand Up @@ -42,6 +42,6 @@ endif()

if(NOT DISABLE_INSTALL_HEADERS)
install(
FILES linear.h tron.h
FILES linear.h newton.h
DESTINATION include/liblinear)
endif()
4 changes: 3 additions & 1 deletion ports/liblinear/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Source: liblinear
Version: 230
Version: 241
Homepage: https://github.com/cjlin1/liblinear
Description: A Library for Large Linear Classification
Supports: !uwp
15 changes: 9 additions & 6 deletions ports/liblinear/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
include(vcpkg_common_functions)
vcpkg_fail_port_install(ON_TARGET "uwp")

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO cjlin1/liblinear
REF v230
SHA512 c8acdd9f5cfcf7ef1ff9b9fac658ff51ac4677801fdb9ce6a210ccca7fb136a7957d0edaf45e83269c1928de1926de0200d669cd94e09371c06821d42ba539bc
REF 2381122d05bbb1e4ee24b522298dd548f0ec0d24 #v241
SHA512 ee784b6325681b3d9e3dc0b59f4a703d87be35fb898cc16df93e4a814a959d530736a8451be4f0f2c856769d81e3f5acbcd6f0f8677425e700597e3502f9f36d
HEAD_REF master
)

Expand All @@ -20,7 +20,10 @@ vcpkg_configure_cmake(

vcpkg_install_cmake()
vcpkg_copy_pdbs()
vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/liblinear)

file(INSTALL ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/liblinear RENAME copyright)
file(INSTALL ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/liblinear)
if(NOT DISABLE_INSTALL_TOOLS)
vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/liblinear)
endif()

file(INSTALL ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
3 changes: 2 additions & 1 deletion ports/libmaxminddb/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
Source: libmaxminddb
Version: 1.3.2-2
Version: 1.4.3
Homepage: https://github.com/maxmind/libmaxminddb
Description: C library for the MaxMind DB file format
6 changes: 3 additions & 3 deletions ports/libmaxminddb/fix-linux-build.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
diff --git a/include/maxminddb.h b/include/maxminddb.h
index de1fdf8..1d17bc3 100644
index 13b276f..6c70e49 100644
--- a/include/maxminddb.h
+++ b/include/maxminddb.h
@@ -24,11 +24,12 @@ extern "C" {
#include <stdio.h>
#include <sys/types.h>

+/* libmaxminddb package version from configure */
+#define PACKAGE_VERSION "1.3.2"
+#define PACKAGE_VERSION "1.4.3"
+
#ifdef _WIN32
#include <winsock2.h>
#include <ws2tcpip.h>
-/* libmaxminddb package version from configure */
-#define PACKAGE_VERSION "1.3.2"
-#define PACKAGE_VERSION "1.4.3"

typedef ADDRESS_FAMILY sa_family_t;

8 changes: 3 additions & 5 deletions ports/libmaxminddb/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
include(vcpkg_common_functions)

vcpkg_check_linkage(ONLY_STATIC_LIBRARY)

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO maxmind/libmaxminddb
REF 1.3.2
SHA512 43ff5f4e3a413772cd315412afc1070fb80280405d8845dc9d94a795265a71007c6c182dc01da8e14bf7b8ab8defe05714bec543faa956e7fb0f0a7756e7df48
REF 07797e9dfb6771190f9fa41a33babe19425ef552 #1.4.3
SHA512 94f7fbd46a7846c804edad9759ceedf2f7c4b2085430322f74bea5c89f6c3fa0824f154f551119a8c69becec5120650efef89c6d7f5a2ef3df476086070c8c7e
HEAD_REF master
PATCHES fix-linux-build.patch
)
Expand All @@ -24,4 +22,4 @@ vcpkg_install_cmake()
vcpkg_copy_pdbs()

# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libmaxminddb RENAME copyright)
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
2 changes: 1 addition & 1 deletion ports/libqrencode/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: libqrencode
Version: 4.0.2-1
Version: 4.1.0
Build-Depends: libpng, libiconv
Homepage: https://github.com/fukuchi/libqrencode
Description: libqrencode - a fast and compact QR Code encoding library
Expand Down
13 changes: 0 additions & 13 deletions ports/libqrencode/fix-found-wingetopt.patch
View file
Open in desktop

This file was deleted.

15 changes: 5 additions & 10 deletions ports/libqrencode/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
include(vcpkg_common_functions)

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO fukuchi/libqrencode
REF v4.0.2
SHA512 847e32bd13358319f3beabde103b5335a6e11c3f9275425b74e89a00b0ee4d67af8a428f12acc8b80a0419382480e5aeb02e58602a69ee750c21b28f357af6bc
REF 0f6149e41533a34029e72ff9234a18e0f22ab992 #v4.1.0
SHA512 7aa215d1a9b06df19bcc0178d241af285d5215f6df994f9e2cf64cde716c7451252380a17e60ef27899bf9039e91306c8eb1948b40ede188d49a25555a94c22a
HEAD_REF master
PATCHES
fix-found-wingetopt.patch
)

if("tool" IN_LIST FEATURES)
Expand All @@ -32,7 +28,7 @@ vcpkg_configure_cmake(

vcpkg_install_cmake()

if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") # Windows
if(VCPKG_TARGET_IS_WINDOWS) # Windows
set(EXECUTABLE_SUFFIX ".exe")
else()
set(EXECUTABLE_SUFFIX "")
Expand All @@ -54,9 +50,8 @@ endif()

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libqrencode)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/libqrencode/COPYING ${CURRENT_PACKAGES_DIR}/share/libqrencode/copyright)
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

vcpkg_copy_pdbs()

file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
13 changes: 0 additions & 13 deletions ports/librsync/001-enable-static-libs.patch
View file
Open in desktop

This file was deleted.

4 changes: 3 additions & 1 deletion ports/librsync/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Source: librsync
Version: 2.0.2-1
Version: 2020-09-16
Description: librsync is a library for calculating and applying network deltas, with an interface designed to ease integration into diverse network applications.
Homepage: http://librsync.sourcefrog.net/
Supports: !uwp
19 changes: 9 additions & 10 deletions ports/librsync/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
include(vcpkg_common_functions)
vcpkg_fail_port_install(ON_TARGET "uwp")

vcpkg_check_linkage(ONLY_STATIC_LIBRARY)

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO librsync/librsync
REF v2.0.2
SHA512 5d2bc1d62b37e9ed7416203615d0a0e3c05c4c884b5da63eda10dd5c985845b500331bce226e4d45676729382c85b41528282e25d491afda31ba434ac0fefad7
REF d1938c387e86ab5bbf7cb2e84244229c5bbd5ebf # commit 2020-06-04
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should use the latest release: https://github.com/librsync/librsync/releases/tag/v2.3.1

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are some errors in the latest release, so I used the latest commit to update this port.
Such as

CMake Error at C:/Program Files/CMake/share/cmake-3.17/Modules/TestBigEndian.cmake:50 (message):
  no suitable type found
Call Stack (most recent call first):
  CMakeLists.txt:115 (TEST_BIG_ENDIAN)

Please see librsync/librsync#207

error C2491: 'rs_trace_to': definition of dllimport function not allowed

These two issues have been fixed in the latest commit.

SHA512 2afb844f20e6d74d8874b2022db5c4c4befa09f2cfcf5360ffcdd4fd3ef56270d3ab8de6be76fc68f8648d871c28f3bbe15e4f6f417c0776b542f86ac6a910cb
HEAD_REF master
PATCHES
001-enable-static-libs.patch
)

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS -DBUILD_RDIFF:BOOL=OFF
-DENABLE_COMPRESSION:BOOL=OFF
-DENABLE_TRACE:BOOL=OFF
OPTIONS
-DBUILD_RDIFF:BOOL=OFF
-DENABLE_COMPRESSION:BOOL=OFF
-DENABLE_TRACE:BOOL=OFF
)

vcpkg_install_cmake()
Expand All @@ -36,7 +35,7 @@ endif()

file(INSTALL
${SOURCE_PATH}/COPYING
DESTINATION ${CURRENT_PACKAGES_DIR}/share/librsync RENAME copyright
DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright
)

vcpkg_copy_pdbs()
vcpkg_copy_pdbs()
4 changes: 0 additions & 4 deletions scripts/ci.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -715,8 +715,6 @@ libigl:arm-uwp=fail
libigl:x64-uwp=fail
liblemon:arm-uwp=fail
liblemon:x64-uwp=fail
liblinear:arm-uwp=fail
liblinear:x64-uwp=fail
liblo:arm-uwp=fail
liblo:x64-linux=fail
liblo:x64-osx=fail
Expand Down Expand Up @@ -834,8 +832,6 @@ libressl:x64-uwp = skip
libressl:x64-windows = skip
libressl:x64-windows-static = skip
libressl:x86-windows = skip
librsync:arm-uwp=fail
librsync:x64-uwp=fail
libsamplerate:arm64-windows=fail
libsamplerate:arm-uwp=fail
libsamplerate:x64-osx=fail
Expand Down