[Bf-blender-cvs] [af00df34694] soc-2019-openxr: Update OpenXR SDK dependency to version 1.0.6

Julian Eisel noreply at git.blender.org
Wed Feb 26 21:20:18 CET 2020


Commit: af00df346943bf831c7ef2373e94b2aaefc88dfd
Author: Julian Eisel
Date:   Wed Feb 26 21:17:44 2020 +0100
Branches: soc-2019-openxr
https://developer.blender.org/rBaf00df346943bf831c7ef2373e94b2aaefc88dfd

Update OpenXR SDK dependency to version 1.0.6

Also fix a merge error in install_deps.sh

===================================================================

M	build_files/build_environment/cmake/openxr.cmake
M	build_files/build_environment/cmake/versions.cmake
M	build_files/build_environment/install_deps.sh

===================================================================

diff --git a/build_files/build_environment/cmake/openxr.cmake b/build_files/build_environment/cmake/openxr.cmake
index 3b827683a14..a90ad54cb8b 100644
--- a/build_files/build_environment/cmake/openxr.cmake
+++ b/build_files/build_environment/cmake/openxr.cmake
@@ -17,12 +17,21 @@
 # ***** END GPL LICENSE BLOCK *****
 
 
+# Keep flags in sync with install_deps.sh ones in compile_OpenXR_SDK()
 set(OPENXR_SDK_EXTRA_ARGS
   -DBUILD_FORCE_GENERATION=OFF
   -DBUILD_LOADER=ON
   -DDYNAMIC_LOADER=OFF
 )
 
+if(UNIX AND NOT APPLE)
+  list(APPEND OPENXR_SDK_EXTRA_ARGS
+    -DBUILD_WITH_WAYLAND_HEADERS=OFF
+    -DBUILD_WITH_XCB_HEADERS=OFF
+    -DBUILD_WITH_XLIB_HEADERS=ON
+  )
+endif()
+
 ExternalProject_Add(external_openxr_sdk
   URL ${OPENXR_SDK_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake
index f725ddb0621..5801fd84c75 100644
--- a/build_files/build_environment/cmake/versions.cmake
+++ b/build_files/build_environment/cmake/versions.cmake
@@ -319,6 +319,6 @@ set(MESA_VERSION 18.3.1)
 set(MESA_URI ftp://ftp.freedesktop.org/pub/mesa//mesa-${MESA_VERSION}.tar.xz)
 set(MESA_HASH d60828056d77bfdbae0970f9b15fb1be)
 
-set(OPENXR_SDK_VERSION 1.0.3)
+set(OPENXR_SDK_VERSION 1.0.6)
 set(OPENXR_SDK_URI https://github.com/KhronosGroup/OpenXR-SDK/archive/release-${OPENXR_SDK_VERSION}.tar.gz)
-set(OPENXR_SDK_HASH df0d1547e7355c4b4c0cdae028a00d78)
+set(OPENXR_SDK_HASH 21daea7c3bfec365298d779a0e19caa1)
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh
index c6b0974cde7..fd5cba99e9a 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -349,7 +349,7 @@ ARGUMENTS_INFO="\"COMMAND LINE ARGUMENTS:
         Unconditionally skip FFMpeg installation/building.
 
     --skip-usd
-        Unconditionally skip Universal Scene Description installation/building.\""
+        Unconditionally skip Universal Scene Description installation/building.
 
     --skip-openxr
         Unconditionally skip OpenXR-SDK installation/building.\""
@@ -469,7 +469,7 @@ FFMPEG_FORCE_REBUILD=false
 FFMPEG_SKIP=false
 _ffmpeg_list_sep=";"
 
-OPENXR_VERSION="1.0.3"
+OPENXR_VERSION="1.0.6"
 OPENXR_FORCE_BUILD=false
 OPENXR_FORCE_REBUILD=false
 OPENXR_SKIP=false
@@ -979,7 +979,7 @@ FFMPEG_SOURCE=( "http://ffmpeg.org/releases/ffmpeg-$FFMPEG_VERSION.tar.bz2" )
 OPENXR_USE_REPO=false
 OPENXR_SOURCE=("https://github.com/KhronosGroup/OpenXR-SDK/archive/release-${OPENXR_VERSION}.tar.gz")
 #~ OPENXR_SOURCE_REPO=("https://github.com/KhronosGroup/OpenXR-SDK-Source.git")
-#~ OPENXR_REPO_UID="2bcc4fe291100728e7b78b91f0621961787a8c58"
+#~ OPENXR_REPO_UID="5292e57fda47561e672fba0a4b6e545c0f25dd8d"
 #~ OPENXR_REPO_BRANCH="master"
 
 # C++11 is required now
@@ -3170,6 +3170,10 @@ compile_OpenXR_SDK() {
     cmake_d="$cmake_d -D CMAKE_INSTALL_PREFIX=$_inst"
     cmake_d="$cmake_d -D BUILD_FORCE_GENERATION=OFF"
     cmake_d="$cmake_d -D BUILD_LOADER=ON"
+    cmake_d="$cmake_d -D DYNAMIC_LOADER=OFF"
+    cmake_d="$cmake_d -D BUILD_WITH_WAYLAND_HEADERS=OFF"
+    cmake_d="$cmake_d -D BUILD_WITH_XCB_HEADERS=OFF"
+    cmake_d="$cmake_d -D BUILD_WITH_XLIB_HEADERS=ON"
 
     cmake $cmake_d ..



More information about the Bf-blender-cvs mailing list