mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-14 22:58:00 +08:00
[nvtt] does not support arm64 osx (#27325)
This commit is contained in:
parent
a251c00247
commit
cd94ec01e4
@ -1,11 +1,11 @@
|
||||
{
|
||||
"name": "nvtt",
|
||||
"version": "2.1.2",
|
||||
"port-version": 6,
|
||||
"port-version": 7,
|
||||
"description": "Texture processing tools with support for Direct3D 10 and 11 formats.",
|
||||
"homepage": "https://github.com/castano/nvidia-texture-tools",
|
||||
"license": "MIT",
|
||||
"supports": "!x86 & !(windows & (arm | uwp))",
|
||||
"supports": "!x86 & !uwp & !arm",
|
||||
"dependencies": [
|
||||
"libsquish",
|
||||
{
|
||||
|
70
ports/open62541/5238.patch
Normal file
70
ports/open62541/5238.patch
Normal file
@ -0,0 +1,70 @@
|
||||
From 9477dbdaf4d125059b0bc6abc6586afeb99f2069 Mon Sep 17 00:00:00 2001
|
||||
From: Nico Sonack <nsonack@herrhotzenplotz.de>
|
||||
Date: Fri, 8 Jul 2022 13:55:26 +0200
|
||||
Subject: [PATCH] (#5236) Portability: Remove usage of pipe2
|
||||
|
||||
Use pipe() instead and mark as non-blocking explicitly by calling
|
||||
fcntl().
|
||||
---
|
||||
arch/eventloop_posix_interrupt.c | 34 +++++++++++++++++++++++++++++++-
|
||||
1 file changed, 33 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/eventloop_posix_interrupt.c b/arch/eventloop_posix_interrupt.c
|
||||
index 6850bb3ba8..badc0e8699 100644
|
||||
--- a/arch/eventloop_posix_interrupt.c
|
||||
+++ b/arch/eventloop_posix_interrupt.c
|
||||
@@ -330,6 +330,23 @@ pair(SOCKET fds[2]) {
|
||||
}
|
||||
#endif
|
||||
|
||||
+#if !defined(UA_HAVE_EPOLL) && !defined(_WIN32)
|
||||
+/* mark fd as non-blocking */
|
||||
+static int
|
||||
+markNonBlock(int fd)
|
||||
+{
|
||||
+ int flags;
|
||||
+
|
||||
+ flags = fcntl(fd, F_GETFL);
|
||||
+ if (flags < 0)
|
||||
+ return flags;
|
||||
+
|
||||
+ flags |= O_NONBLOCK;
|
||||
+
|
||||
+ return fcntl(fd, F_SETFL, flags);
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
static UA_StatusCode
|
||||
startPOSIXInterruptManager(UA_EventSource *es) {
|
||||
/* Check the state */
|
||||
@@ -361,7 +378,7 @@ startPOSIXInterruptManager(UA_EventSource *es) {
|
||||
#ifdef _WIN32
|
||||
int err = pair(pipefd);
|
||||
#else
|
||||
- int err = pipe2(pipefd, O_NONBLOCK);
|
||||
+ int err = pipe(pipefd);
|
||||
#endif
|
||||
if(err != 0) {
|
||||
UA_LOG_SOCKET_ERRNO_WRAP(
|
||||
@@ -371,6 +388,21 @@ startPOSIXInterruptManager(UA_EventSource *es) {
|
||||
return UA_STATUSCODE_BADINTERNALERROR;
|
||||
}
|
||||
|
||||
+#ifndef _WIN32
|
||||
+ /* Mark pipes as non-blocking */
|
||||
+ for (size_t i = 0; i < (sizeof(pipefd) / sizeof(*pipefd)); ++i) {
|
||||
+ err = markNonBlock(pipefd[i]);
|
||||
+ if (err != 0) {
|
||||
+ UA_LOG_SOCKET_ERRNO_WRAP(
|
||||
+ UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
|
||||
+ "Interrupt\t| Could mark pipe for "
|
||||
+ "self-signaling as non-blocking(%s)",
|
||||
+ errno_str));
|
||||
+ return UA_STATUSCODE_BADINTERNALERROR;
|
||||
+ }
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
UA_LOG_DEBUG(es->eventLoop->logger, UA_LOGCATEGORY_EVENTLOOP,
|
||||
"Interrupt\t| Socket pair for the self-pipe: %u,%u",
|
||||
(unsigned)pipefd[0], (unsigned)pipefd[1]);
|
23
ports/open62541/open.patch
Normal file
23
ports/open62541/open.patch
Normal file
@ -0,0 +1,23 @@
|
||||
From 0e051ebb92b8aec588faab37db55fe2844c4092f Mon Sep 17 00:00:00 2001
|
||||
From: akoww <42697142+akoww@users.noreply.github.com>
|
||||
Date: Mon, 29 Aug 2022 14:08:58 +0200
|
||||
Subject: [PATCH] Update open62541Config.cmake.in
|
||||
|
||||
forced cmake to use python3 for the node compiler
|
||||
---
|
||||
tools/cmake/open62541Config.cmake.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tools/cmake/open62541Config.cmake.in b/tools/cmake/open62541Config.cmake.in
|
||||
index 8dfcebd4b8..664ada54fe 100644
|
||||
--- a/tools/cmake/open62541Config.cmake.in
|
||||
+++ b/tools/cmake/open62541Config.cmake.in
|
||||
@@ -6,7 +6,7 @@ set (open62541_TOOLS_DIR @PACKAGE_open62541_install_tools_dir@ CACHE PATH "Path
|
||||
set (UA_NODESET_DIR @PACKAGE_open62541_install_nodeset_dir@ CACHE PATH "Path to the directory that contains the OPC UA schema repository")
|
||||
|
||||
include(CMakeFindDependencyMacro)
|
||||
-find_dependency(PythonInterp REQUIRED)
|
||||
+find_dependency(PythonInterp 3 REQUIRED)
|
||||
|
||||
include("${CMAKE_CURRENT_LIST_DIR}/open62541Macros.cmake")
|
||||
|
@ -5246,7 +5246,7 @@
|
||||
},
|
||||
"nvtt": {
|
||||
"baseline": "2.1.2",
|
||||
"port-version": 6
|
||||
"port-version": 7
|
||||
},
|
||||
"oatpp": {
|
||||
"baseline": "1.3.0",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "9ae29094563f3fa57d20b378d8b3e1fa7fe7e168",
|
||||
"version": "2.1.2",
|
||||
"port-version": 7
|
||||
},
|
||||
{
|
||||
"git-tree": "9dab908526770ce18285ce3713359ca5bdaf0999",
|
||||
"version": "2.1.2",
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "78181e46126a93ba6bbea749a985ba675fb53c03",
|
||||
"git-tree": "f0ea1b9971e39c9a8357a1f7165a1205d4bdd6e1",
|
||||
"version": "1.2.3",
|
||||
"port-version": 1
|
||||
},
|
||||
|
Loading…
x
Reference in New Issue
Block a user