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.

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

Merge from microsoft-master #1816

Merged
merged 9 commits into from
Nov 29, 2024
12 changes: 12 additions & 0 deletions ports/concurrencpp/add-include-chrono.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/include/concurrencpp/results/impl/shared_result_state.h b/include/concurrencpp/results/impl/shared_result_state.h
index 6c96f4b..1433e74 100644
--- a/include/concurrencpp/results/impl/shared_result_state.h
+++ b/include/concurrencpp/results/impl/shared_result_state.h
@@ -5,6 +5,7 @@
#include "concurrencpp/results/impl/result_state.h"

#include <atomic>
+#include <chrono>
#include <semaphore>

#include <cassert>
1 change: 1 addition & 0 deletions ports/concurrencpp/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ vcpkg_from_github(
PATCHES
fix-include-path.patch
add-include-string.patch
add-include-chrono.patch # https://github.com/David-Haim/concurrencpp/pull/170
)

vcpkg_cmake_configure(
Expand Down
2 changes: 1 addition & 1 deletion ports/concurrencpp/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "concurrencpp",
"version": "0.1.7",
"port-version": 1,
"port-version": 2,
"description": "concurrencpp is a tasking library for C++ allowing developers to write highly concurrent applications easily and safely by using tasks, executors and coroutines.",
"homepage": "https://github.com/David-Haim/concurrencpp/",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion ports/dav1d/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ vcpkg_from_gitlab(
OUT_SOURCE_PATH SOURCE_PATH
REPO videolan/dav1d
REF "${VERSION}"
SHA512 1a7ed31a5c56362d7e62a7b96eeb13d636309cef892fab7bedee2421e1c6cea8676abb640318a2eb5c7bb597110c53cac1b4583ba3b844581d96a54cad3dbd9e
SHA512 8a9c8079ef8dd32bec2df626db68829ac2210c7754e72e18c74afcff5fa3d4aecfd55c54078c57669a86949b2ce7be803e75f1b8279959e0427661bb7302052d
)

if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
Expand Down
2 changes: 1 addition & 1 deletion ports/dav1d/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dav1d",
"version": "1.4.3",
"version": "1.5.0",
"description": "dav1d is a new open-source AV1 decoder developed by the VideoLAN and FFmpeg communities and sponsored by the Alliance for Open Media.",
"homepage": "https://code.videolan.org/videolan/dav1d",
"license": "BSD-2-Clause",
Expand Down
12 changes: 12 additions & 0 deletions ports/iceoryx/add-include-chrono.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/iceoryx_hoofs/platform/win/source/time.cpp b/iceoryx_hoofs/platform/win/source/time.cpp
index 4c2ab2d..4a7074b 100644
--- a/iceoryx_hoofs/platform/win/source/time.cpp
+++ b/iceoryx_hoofs/platform/win/source/time.cpp
@@ -16,6 +16,7 @@
// SPDX-License-Identifier: Apache-2.0

#include "iceoryx_hoofs/platform/time.hpp"
+#include <chrono>

static std::chrono::nanoseconds getNanoSeconds(const timespec& value)
{
1 change: 1 addition & 0 deletions ports/iceoryx/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ vcpkg_from_github(
HEAD_REF master
PATCHES
acl.patch
add-include-chrono.patch # https://github.com/eclipse-iceoryx/iceoryx/pull/2378
)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
Expand Down
1 change: 1 addition & 0 deletions ports/iceoryx/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "iceoryx",
"version": "2.0.6",
"port-version": 1,
"description": "True zero-copy inter-process-communication",
"homepage": "https://iceoryx.io",
"license": "Apache-2.0",
Expand Down
51 changes: 51 additions & 0 deletions ports/libiconv/0005-iOS-missing-symbol-fix.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
From 2a1216b603b5eb592c5f313df9e79a81997ad13c Mon Sep 17 00:00:00 2001
From: Cosmin Mihai <ionut.cosmin.mihai@gmail.com>
Date: Mon, 11 Nov 2024 22:43:30 +0200
Subject: [PATCH] iOS missing symbol fix

---
build-aux/install-reloc | 1 +
srclib/relocwrapper.c | 1 +
srcm4/gnulib-comp.m4 | 2 ++
3 files changed, 4 insertions(+)

diff --git a/build-aux/install-reloc b/build-aux/install-reloc
index 63aeb9a..570b211 100755
--- a/build-aux/install-reloc
+++ b/build-aux/install-reloc
@@ -236,6 +236,7 @@ func_create_wrapper ()
"$srcdir"/allocator.c \
"$srcdir"/readlink.c \
"$srcdir"/stat.c \
+ "$srcdir"/stat-time.c \
"$srcdir"/canonicalize-lgpl.c \
"$srcdir"/malloc/scratch_buffer_dupfree.c \
"$srcdir"/malloc/scratch_buffer_grow.c \
diff --git a/srclib/relocwrapper.c b/srclib/relocwrapper.c
index ff0ad41..0304e12 100644
--- a/srclib/relocwrapper.c
+++ b/srclib/relocwrapper.c
@@ -44,6 +44,7 @@
-> realloc-posix
-> free-posix
-> pathmax
+ -> stat-time
-> mempcpy
-> rawmemchr
-> readlink
diff --git a/srcm4/gnulib-comp.m4 b/srcm4/gnulib-comp.m4
index b511e8a..832a8e7 100644
--- a/srcm4/gnulib-comp.m4
+++ b/srcm4/gnulib-comp.m4
@@ -730,6 +730,8 @@ AC_DEFUN([gl_FILE_LIST], [
lib/stat-w32.c
lib/stat-w32.h
lib/stat.c
+ lib/stat-time.h
+ lib/stat-time.c
lib/stdalign.in.h
lib/stdbool.in.h
lib/stddef.in.h
--
2.39.5 (Apple Git-154)

1 change: 1 addition & 0 deletions ports/libiconv/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ vcpkg_extract_source_archive(SOURCE_PATH
0003-Add-export.patch
0004-ModuleFileName.patch
clang-fortify.patch # ported from https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=522aea1093a598246346b3e1c426505c344fe19a
0005-iOS-missing-symbol-fix.patch
)

vcpkg_list(SET OPTIONS)
Expand Down
2 changes: 1 addition & 1 deletion ports/libiconv/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "libiconv",
"version": "1.17",
"port-version": 4,
"port-version": 5,
"description": "GNU Unicode text conversion",
"homepage": "https://www.gnu.org/software/libiconv/",
"license": null
Expand Down
12 changes: 12 additions & 0 deletions ports/nrf-ble-driver/add-include-chrono.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/src/common/transport/serialization_transport.cpp b/src/common/transport/serialization_transport.cpp
index f916961..5ab0f3a 100644
--- a/src/common/transport/serialization_transport.cpp
+++ b/src/common/transport/serialization_transport.cpp
@@ -43,6 +43,7 @@

#include "ble_common.h"

+#include <chrono>
#include <iterator>
#include <memory>
#include <sstream>
1 change: 1 addition & 0 deletions ports/nrf-ble-driver/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ vcpkg_from_github(
001-arm64-support.patch
support-arm64-osx.diff # from https://github.com/NordicSemiconductor/pc-ble-driver/pull/271
gcc-11.2.0-compilation.patch # from https://github.com/NordicSemiconductor/pc-ble-driver/pull/272
add-include-chrono.patch
)

# Ensure that git is found within CMakeLists.txt by appending vcpkg's git executable dirpath to $PATH.
Expand Down
2 changes: 1 addition & 1 deletion ports/nrf-ble-driver/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "nrf-ble-driver",
"version": "4.1.4",
"port-version": 1,
"port-version": 2,
"description": "BLE driver is a library for Bluetooth Low Energy communication using Nordic Semiconductor development kits.",
"homepage": "https://github.com/NordicSemiconductor/pc-ble-driver",
"license": "BSD-3-Clause",
Expand Down
12 changes: 12 additions & 0 deletions ports/nsync/add-include-chrono.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/platform/c++11/platform.h b/platform/c++11/platform.h
index 2c80e0b..1468fab 100644
--- a/platform/c++11/platform.h
+++ b/platform/c++11/platform.h
@@ -16,6 +16,7 @@
#define NSYNC_PLATFORM_CPP11_PLATFORM_H_

/* These C header files are in "C compatibility headers" in C++11. */
+#include <chrono>
#include <string.h>
#include <errno.h>
#include <stdlib.h>
5 changes: 3 additions & 2 deletions ports/nsync/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ vcpkg_from_github(
HEAD_REF master
PATCHES
fix-install.patch
add-include-chrono.patch # https://github.com/google/nsync/pull/25
)

vcpkg_cmake_configure(
Expand All @@ -24,5 +25,5 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/nsync)
vcpkg_copy_pdbs()

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(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
1 change: 1 addition & 0 deletions ports/nsync/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "nsync",
"version": "1.29.2",
"port-version": 1,
"description": "nsync is a C library that exports various synchronization primitives, such as mutexes",
"homepage": "https://github.com/google/nsync",
"license": "Apache-2.0",
Expand Down
12 changes: 12 additions & 0 deletions ports/ogdf/add-include-chrono.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/src/ogdf/cluster/HananiTutteCPlanarity.cpp b/src/ogdf/cluster/HananiTutteCPlanarity.cpp
index 2cec55b..ac2672e 100644
--- a/src/ogdf/cluster/HananiTutteCPlanarity.cpp
+++ b/src/ogdf/cluster/HananiTutteCPlanarity.cpp
@@ -37,6 +37,7 @@
#include <ogdf/basic/extended_graph_alg.h>
#include <ogdf/cluster/CconnectClusterPlanar.h>
#include <ogdf/cluster/ClusterPlanarity.h>
+#include <chrono>
#include <unordered_map>
#include <map>

4 changes: 3 additions & 1 deletion ports/ogdf/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ vcpkg_from_github(
REF 214105da97863e1d0a066157e5cc573b65b433a9
SHA512 8ab9f266fef224ce600cec418d5de56761714fbaa2d509ba89d55700c1d27d02a5fc93fab8eb8e10325a42c7d2fa8e251e2a18ece9a9565e215bf39672bff92d
HEAD_REF master
PATCHES
add-include-chrono.patch # https://github.com/ogdf/ogdf/pull/254
)

vcpkg_cmake_configure(
Expand All @@ -20,6 +22,6 @@ vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/OGDF)

# Handle copyright
file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/minisat/doc" "${CURRENT_PACKAGES_DIR}/include/ogdf/lib/minisat/doc")
1 change: 1 addition & 0 deletions ports/ogdf/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "ogdf",
"version-date": "2022-06-30",
"port-version": 1,
"description": "Open Graph Drawing Framework",
"homepage": "https://github.com/ogdf/ogdf",
"license": null,
Expand Down
40 changes: 0 additions & 40 deletions ports/openal-soft/187ed2df39ab1f5ea92b97d4d3e0894da87e297b.patch

This file was deleted.

89 changes: 0 additions & 89 deletions ports/openal-soft/96f62e37e9ae015ee104e568cb57ea0d8964a84b.patch

This file was deleted.

5 changes: 1 addition & 4 deletions ports/openal-soft/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,8 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO kcat/openal-soft
REF ${VERSION}
SHA512 6fdb5e02f4d4e2d483bccf69121dda9b691170e88d301f53b5e3b3ab196541d7b0b23a868acdf85f6dacac9d8508079f67cb7d733e186a13a66ee70ecdd813f0
SHA512 a60e1969bb5678219d8a7ae036d7081d61faa176689ac444802a45f4081aff07a6315575c02784bfce2ec6149c160270082ae076be668f32d79a6fac06513be0
HEAD_REF master
PATCHES
96f62e37e9ae015ee104e568cb57ea0d8964a84b.patch # Merged upstream, remove in next version
187ed2df39ab1f5ea92b97d4d3e0894da87e297b.patch # Fix CppWinRT for UWP
)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
Expand Down
Loading
Loading