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

[Vc] Update to 1.4.3 #24880

Merged
merged 1 commit into from
May 31, 2022
Merged

[Vc] Update to 1.4.3 #24880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 16 additions & 0 deletions ports/vc/Fix-internal-func-export.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
diff --git a/src/support_x86.cpp b/src/support_x86.cpp
index 0ab9669..d5c17ba 100644
--- a/src/support_x86.cpp
+++ b/src/support_x86.cpp
@@ -58,8 +58,9 @@ static inline bool xgetbvCheck(unsigned int bits)
#endif
}

-Vc_TARGET_NO_SIMD
-bool isImplementationSupported(Implementation impl)
+
+Vc_TARGET_NO_SIMD
+bool Vc_VDECL isImplementationSupported(Vc::Implementation impl)
{
CpuId::init();

17 changes: 0 additions & 17 deletions ports/vc/dont-use-uninit-var.patch
View file
Open in desktop

This file was deleted.

29 changes: 15 additions & 14 deletions ports/vc/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO VcDevel/Vc
REF 1.4.2
SHA512 9a929cd48bdf6b8e94765bd649e7ec42b10dea28e36eff288223d72cffa5f4fc8693e942aa3f780b42d8a0c1824fcabff22ec0622aa8ea5232c9123858b8bbbf
REF 1.4.3
SHA512 7c0c4ccf8c7c4585334482135f2daf1a5bc088114b880093893583bdcea1fbfcec02485da6059304c510c8b1bb1b768ef04fd7ac8ccb21b9ebbad5d0d5babaef
HEAD_REF 1.4
PATCHES
correct_cmake_config_path.patch
dont-use-uninit-var.patch
PATCHES
correct_cmake_config_path.patch
Fix-internal-func-export.patch #remove it in next version
)

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DBUILD_TESTING=OFF
-DBUILD_EXAMPLES=OFF
)
vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Vc/)
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/Vc/")
vcpkg_copy_pdbs()

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

file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
16 changes: 13 additions & 3 deletions ports/vc/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,18 @@
{
"name": "vc",
"version": "1.4.2",
"port-version": 3,
"version": "1.4.3",
"description": "SIMD Vector Classes for C++ .",
"homepage": "https://github.com/VcDevel/Vc",
"supports": "!arm64"
"license": "BSD-3-Clause",
"supports": "!arm64",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}
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 @@ -7329,8 +7329,8 @@
"port-version": 0
},
"vc": {
"baseline": "1.4.2",
"port-version": 3
"baseline": "1.4.3",
"port-version": 0
},
"vcglib": {
"baseline": "1.0.1",
Expand Down
5 changes: 5 additions & 0 deletions versions/v-/vc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "933ac99201b15104edd8037e8bcc7959d36a6d67",
"version": "1.4.3",
"port-version": 0
},
{
"git-tree": "98b96fa582424d700421161838544f1daf738467",
"version": "1.4.2",
Expand Down