Commit: 0cb565047f60a946b90533ff6eec640b59169c33 Author: Sybren A. Stüvel Date: Fri Nov 29 12:27:45 2019 +0100 Branches: temp-sybren-usd-patch-02 https://developer.blender.org/rB0cb565047f60a946b90533ff6eec640b59169c33
USD: fixed paths in usd.diff I made the previous diff with `git diff` in the USD source, which produced paths incompatible with the patch command we use to apply it. =================================================================== M build_files/build_environment/patches/usd.diff =================================================================== diff --git a/build_files/build_environment/patches/usd.diff b/build_files/build_environment/patches/usd.diff index edc0815f414..2ceb483d3f7 100644 --- a/build_files/build_environment/patches/usd.diff +++ b/build_files/build_environment/patches/usd.diff @@ -1,8 +1,7 @@ -diff --git a/cmake/defaults/Options.cmake b/cmake/defaults/Options.cmake -index bcda89885..3cb541885 100644 ---- a/cmake/defaults/Options.cmake -+++ b/cmake/defaults/Options.cmake -@@ -25,6 +25,7 @@ option(PXR_STRICT_BUILD_MODE "Turn on additional warnings. Enforce all warnings +diff -x .git -ur usd.orig/cmake/defaults/Options.cmake external_usd/cmake/defaults/Options.cmake +--- usd.orig/cmake/defaults/Options.cmake 2019-11-29 12:10:36.860162516 +0100 ++++ external_usd/cmake/defaults/Options.cmake 2019-11-28 13:00:33.197957712 +0100 +@@ -25,6 +25,7 @@ option(PXR_VALIDATE_GENERATED_CODE "Validate script generated code" OFF) option(PXR_HEADLESS_TEST_MODE "Disallow GUI based tests, useful for running under headless CI systems." OFF) option(PXR_BUILD_TESTS "Build tests" ON) @@ -10,11 +9,10 @@ index bcda89885..3cb541885 100644 option(PXR_BUILD_IMAGING "Build imaging components" ON) option(PXR_BUILD_EMBREE_PLUGIN "Build embree imaging plugin" OFF) option(PXR_BUILD_OPENIMAGEIO_PLUGIN "Build OpenImageIO plugin" OFF) -diff --git a/cmake/defaults/Packages.cmake b/cmake/defaults/Packages.cmake -index 9be215b36..0ce6e6fd5 100644 ---- a/cmake/defaults/Packages.cmake -+++ b/cmake/defaults/Packages.cmake -@@ -64,7 +64,7 @@ else() +diff -x .git -ur usd.orig/cmake/defaults/Packages.cmake external_usd/cmake/defaults/Packages.cmake +--- usd.orig/cmake/defaults/Packages.cmake 2019-11-29 12:10:36.860162516 +0100 ++++ external_usd/cmake/defaults/Packages.cmake 2019-11-28 13:00:33.185957483 +0100 +@@ -64,7 +64,7 @@ endif() # --TBB @@ -23,10 +21,9 @@ index 9be215b36..0ce6e6fd5 100644 add_definitions(${TBB_DEFINITIONS}) # --math -diff --git a/pxr/base/lib/plug/initConfig.cpp b/pxr/base/lib/plug/initConfig.cpp -index 91d01cadc..61bb6de84 100644 ---- a/pxr/base/lib/plug/initConfig.cpp -+++ b/pxr/base/lib/plug/initConfig.cpp +diff -x .git -ur usd.orig/pxr/base/lib/plug/initConfig.cpp external_usd/pxr/base/lib/plug/initConfig.cpp +--- usd.orig/pxr/base/lib/plug/initConfig.cpp 2019-11-29 12:10:36.860162516 +0100 ++++ external_usd/pxr/base/lib/plug/initConfig.cpp 2019-11-29 11:16:29.716256692 +0100 @@ -33,6 +33,7 @@ #include "pxr/base/arch/symbols.h" @@ -35,7 +32,7 @@ index 91d01cadc..61bb6de84 100644 PXR_NAMESPACE_OPEN_SCOPE -@@ -83,6 +84,20 @@ ARCH_CONSTRUCTOR(Plug_InitConfig, 2, void) +@@ -83,6 +84,20 @@ sharedLibPath = TfGetPathName(sharedLibPath); @@ -56,7 +53,7 @@ index 91d01cadc..61bb6de84 100644 // Environment locations. _AppendPathList(&result, TfGetenv(pathEnvVarName), sharedLibPath); -@@ -94,6 +109,13 @@ ARCH_CONSTRUCTOR(Plug_InitConfig, 2, void) +@@ -94,6 +109,13 @@ _AppendPathList(&result, installLocation, sharedLibPath); #endif // PXR_INSTALL_LOCATION @@ -70,10 +67,9 @@ index 91d01cadc..61bb6de84 100644 Plug_SetPaths(result); } -diff --git a/pxr/usd/CMakeLists.txt b/pxr/usd/CMakeLists.txt -index c894cca37..df087a418 100644 ---- a/pxr/usd/CMakeLists.txt -+++ b/pxr/usd/CMakeLists.txt +diff -x .git -ur usd.orig/pxr/usd/CMakeLists.txt external_usd/pxr/usd/CMakeLists.txt +--- usd.orig/pxr/usd/CMakeLists.txt 2019-11-29 12:10:36.860162516 +0100 ++++ external_usd/pxr/usd/CMakeLists.txt 2019-11-28 13:00:33.197957712 +0100 @@ -1,6 +1,5 @@ set(DIRS lib @@ -81,7 +77,7 @@ index c894cca37..df087a418 100644 plugin ) -@@ -8,3 +7,8 @@ foreach(d ${DIRS}) +@@ -8,3 +7,8 @@ add_subdirectory(${d}) endforeach() _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs