From e9e744175b2b4a37adcc7f2d415e1af4466226a5 Mon Sep 17 00:00:00 2001
From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Date: Thu, 11 Jun 2020 15:29:20 +0800
Subject: [PATCH] [usd] Fix build error on Linux (#11440)

* [usd] Fix build error on Linux

* Add supports field and update baseline
---
 ports/usd/CONTROL               |  3 ++-
 ports/usd/fix-build-error.patch | 13 +++++++++++++
 ports/usd/portfile.cmake        |  6 ++++--
 scripts/ci.baseline.txt         |  1 -
 4 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 ports/usd/fix-build-error.patch

diff --git a/ports/usd/CONTROL b/ports/usd/CONTROL
index 89a63301c..59df24ec3 100644
--- a/ports/usd/CONTROL
+++ b/ports/usd/CONTROL
@@ -1,4 +1,5 @@
 Source: usd
-Version: 20.02
+Version: 20.02-1
 Build-Depends: boost-assign, boost-crc, boost-date-time, boost-filesystem, boost-format, boost-multi-index, boost-program-options, boost-regex, boost-system, boost-vmd, tbb, zlib
 Description: Universal Scene Description (USD) is an efficient, scalable system for authoring, reading, and streaming time-sampled scene description for interchange between graphics applications.
+Supports: !x86
diff --git a/ports/usd/fix-build-error.patch b/ports/usd/fix-build-error.patch
new file mode 100644
index 000000000..b13fa6972
--- /dev/null
+++ b/ports/usd/fix-build-error.patch
@@ -0,0 +1,13 @@
+diff --git a/pxr/usd/ar/packageUtils.cpp b/pxr/usd/ar/packageUtils.cpp
+index d497587..ed3df29 100644
+--- a/pxr/usd/ar/packageUtils.cpp
++++ b/pxr/usd/ar/packageUtils.cpp
+@@ -29,6 +29,8 @@
+ #include "pxr/base/tf/pathUtils.h"
+ #include "pxr/base/tf/stringUtils.h"
+ 
++#include <algorithm>
++
+ PXR_NAMESPACE_OPEN_SCOPE
+ 
+ namespace
diff --git a/ports/usd/portfile.cmake b/ports/usd/portfile.cmake
index 8719dd05d..e6cbfaba8 100644
--- a/ports/usd/portfile.cmake
+++ b/ports/usd/portfile.cmake
@@ -1,14 +1,16 @@
+vcpkg_fail_port_install(ON_ARCH "x86")
+
 # Don't file if the bin folder exists. We need exe and custom files.
 SET(VCPKG_POLICY_EMPTY_PACKAGE enabled)
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO PixarAnimationStudios/USD
     REF be1a80f8cb91133ac75e1fc2a2e1832cd10d91c8 # v20.02
     SHA512 12c7cf7e5320b168ddde870b1a68b482515b33bd29206c4f6cbb248b9071b866c47353bf496890e01950abb5f725157eca576f9dc403e15020474f9a653b43fe
     HEAD_REF master
+    PATCHES
+        fix-build-error.patch
 )
 
 vcpkg_find_acquire_program(PYTHON2)
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 41f3f2f2f..b002f9f22 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -1891,7 +1891,6 @@ unrar:x64-osx=fail
 unrar:x64-uwp=fail
 unrar:x64-windows-static=fail
 urdfdom:x64-windows-static=fail
-usd:x64-linux=ignore
 usd:x86-windows=fail
 usrsctp:arm-uwp=fail
 usrsctp:x64-uwp=fail