From 0c8201b26a12d971d8a5f909ab5af13a94884b42 Mon Sep 17 00:00:00 2001
From: Dale Glass <dale@daleglass.net>
Date: Tue, 22 Jun 2021 20:55:23 +0200
Subject: [PATCH] Fix nvtt on x86

This uses a repository at https://github.com/vircadia/nvidia-texture-tools
with the existing patches already integrated into it, and an additional fix
on top.
---
 cmake/ports/nvtt/0001-Build-on-aarch64.patch  | 37 -------------------
 ...include-sysctl.h-to-build-on-linux-a.patch | 25 -------------
 cmake/ports/nvtt/portfile.cmake               | 11 +-----
 3 files changed, 2 insertions(+), 71 deletions(-)
 delete mode 100644 cmake/ports/nvtt/0001-Build-on-aarch64.patch
 delete mode 100644 cmake/ports/nvtt/0002-Hack-remove-include-sysctl.h-to-build-on-linux-a.patch

diff --git a/cmake/ports/nvtt/0001-Build-on-aarch64.patch b/cmake/ports/nvtt/0001-Build-on-aarch64.patch
deleted file mode 100644
index 4f737f78c4..0000000000
--- a/cmake/ports/nvtt/0001-Build-on-aarch64.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-commit 8909ba06ea1893a6e028836fbade28fd115ee1cc
-Author: Julian Groß <julian.g@posteo.de>
-Date:   Wed Feb 17 04:51:49 2021 +0100
-
-    Enable building on aarch64 according to https://github.com/castano/nvidia-texture-tools/pull/309 and https://github.com/castano/nvidia-texture-tools/pull/322
-
-diff --git a/src/nvcore/Debug.cpp b/src/nvcore/Debug.cpp
-index 9ab4525..e335f97 100644
---- a/src/nvcore/Debug.cpp
-+++ b/src/nvcore/Debug.cpp
-@@ -1008,6 +1008,13 @@ void debug::dumpInfo()
- #endif
- }
- 
-+static va_list getEmptyVAList(va_list list, ...)
-+{
-+    va_start(list, list);
-+    va_end(list);
-+    return list;
-+}
-+
- /// Dump callstack using the specified handler.
- void debug::dumpCallstack(MessageHandler *messageHandler, int callstackLevelsToSkip /*= 0*/)
- {
-@@ -1020,8 +1027,11 @@ void debug::dumpCallstack(MessageHandler *messageHandler, int callstackLevelsToS
-         Array<const char *> lines;
-         writeStackTrace(trace, size, callstackLevelsToSkip + 1, lines);     // + 1 to skip the call to dumpCallstack
- 
-+        va_list empty;
-+        empty = getEmptyVAList(empty);
-+
-         for (uint i = 0; i < lines.count(); i++) {
--            messageHandler->log(lines[i], NULL);
-+            messageHandler->log(lines[i], empty);
-             delete lines[i];
-         }
-     }
diff --git a/cmake/ports/nvtt/0002-Hack-remove-include-sysctl.h-to-build-on-linux-a.patch b/cmake/ports/nvtt/0002-Hack-remove-include-sysctl.h-to-build-on-linux-a.patch
deleted file mode 100644
index 78e92d38b8..0000000000
--- a/cmake/ports/nvtt/0002-Hack-remove-include-sysctl.h-to-build-on-linux-a.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 84dc6af45b1176a2b82d089239665cb3dc1584de Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Julian=20Gro=C3=9F?= <firedefender1@googlemail.com>
-Date: Wed, 23 Dec 2020 07:33:39 +0100
-Subject: [PATCH] Hack: remove #include <sys/sysctl.h> to build on
- linux-aarch64
-
----
- src/nvthread/nvthread.cpp | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/nvthread/nvthread.cpp b/src/nvthread/nvthread.cpp
-index 2b3abe6..cec9f4f 100644
---- a/src/nvthread/nvthread.cpp
-+++ b/src/nvthread/nvthread.cpp
-@@ -11,7 +11,6 @@
- #include <unistd.h>
- #elif NV_OS_UNIX
- #include <sys/types.h>
--#include <sys/sysctl.h>
- #include <unistd.h>
- #elif NV_OS_DARWIN
- #import <stdio.h>
--- 
-2.17.1
-
diff --git a/cmake/ports/nvtt/portfile.cmake b/cmake/ports/nvtt/portfile.cmake
index 9088b62046..a6971941ac 100644
--- a/cmake/ports/nvtt/portfile.cmake
+++ b/cmake/ports/nvtt/portfile.cmake
@@ -10,18 +10,11 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO vircadia/nvidia-texture-tools
-    REF 330c4d56274a0f602a5c70596e2eb670a4ed56c2
-    SHA512 4c0bc2f369120d696cc27710b6d33086b27eef55f537ec66b9a5c8b1839bc2426c0413670b0f65be52c5d353468f0126dfe024be1f0690611d4d7e33ac530127
+    REF 26b65cd105f0d2f425b5152b460a8d5eaa44b514
+    SHA512 27c68e2b4cfbc78c11903ecb47a58dde99ecbbed0447817b9463fb80835ce9e502a0c93c12d82c0dbf02d6592e0e5adb805b9acc03b53c9a1cb118ed147a7706
     HEAD_REF master
 )
 
-if(VCPKG_TARGET_ARCHITECTURE STREQUAL arm64)
-    vcpkg_apply_patches(
-        SOURCE_PATH ${SOURCE_PATH}
-        PATCHES "${CMAKE_CURRENT_LIST_DIR}/0001-Build-on-aarch64.patch" "${CMAKE_CURRENT_LIST_DIR}/0002-Hack-remove-include-sysctl.h-to-build-on-linux-a.patch"
-    )
-endif()
-
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     OPTIONS