The-Homebrew-Cloud/cemu-vcpkg
2
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-23 02:57:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

[usd] Fix build error on Linux (#11440)

Browse Source 
* [usd] Fix build error on Linux

* Add supports field and update baseline
This commit is contained in:
NancyLi1013 2020-06-11 15:29:20 +08:00 committed by GitHub
parent 31aea25728
commit e9e744175b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ports/usd/CONTROL
View File

@ -1,4 +1,5 @@
Source: usd 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 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. 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

13
ports/usd/fix-build-error.patch Normal file
View File

@ -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

6
ports/usd/portfile.cmake
View File

@ -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. # Don't file if the bin folder exists. We need exe and custom files.
SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) SET(VCPKG_POLICY_EMPTY_PACKAGE enabled)
include(vcpkg_common_functions)
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO PixarAnimationStudios/USD REPO PixarAnimationStudios/USD
REF be1a80f8cb91133ac75e1fc2a2e1832cd10d91c8 # v20.02 REF be1a80f8cb91133ac75e1fc2a2e1832cd10d91c8 # v20.02
SHA512 12c7cf7e5320b168ddde870b1a68b482515b33bd29206c4f6cbb248b9071b866c47353bf496890e01950abb5f725157eca576f9dc403e15020474f9a653b43fe SHA512 12c7cf7e5320b168ddde870b1a68b482515b33bd29206c4f6cbb248b9071b866c47353bf496890e01950abb5f725157eca576f9dc403e15020474f9a653b43fe
HEAD_REF master HEAD_REF master
PATCHES
fix-build-error.patch
) )
vcpkg_find_acquire_program(PYTHON2) vcpkg_find_acquire_program(PYTHON2)

1
scripts/ci.baseline.txt
View File

@ -1891,7 +1891,6 @@ unrar:x64-osx=fail
unrar:x64-uwp=fail unrar:x64-uwp=fail
unrar:x64-windows-static=fail unrar:x64-windows-static=fail
urdfdom:x64-windows-static=fail urdfdom:x64-windows-static=fail
usd:x64-linux=ignore
usd:x86-windows=fail usd:x86-windows=fail
usrsctp:arm-uwp=fail usrsctp:arm-uwp=fail
usrsctp:x64-uwp=fail usrsctp:x64-uwp=fail