Title: [262288] trunk/Tools
- Revision
- 262288
- Author
- [email protected]
- Date
- 2020-05-29 04:41:02 -0700 (Fri, 29 May 2020)
Log Message
[Flatpak SDK] Update OpenXR
https://bugs.webkit.org/show_bug.cgi?id=212518
Patch by Philippe Normand <[email protected]> on 2020-05-29
Reviewed by Žan Doberšek.
Upstream now builds fine with GCC 9.3.0. Removing downstream patch.
* buildstream/elements/sdk/openxr.bst:
* buildstream/patches/openxr-0001-cmake-Check-for-C-17-and-conditionally-enable-it.patch: Removed.
Modified Paths
Removed Paths
Diff
Modified: trunk/Tools/ChangeLog (262287 => 262288)
--- trunk/Tools/ChangeLog 2020-05-29 09:47:16 UTC (rev 262287)
+++ trunk/Tools/ChangeLog 2020-05-29 11:41:02 UTC (rev 262288)
@@ -1,3 +1,15 @@
+2020-05-29 Philippe Normand <[email protected]>
+
+ [Flatpak SDK] Update OpenXR
+ https://bugs.webkit.org/show_bug.cgi?id=212518
+
+ Reviewed by Žan Doberšek.
+
+ Upstream now builds fine with GCC 9.3.0. Removing downstream patch.
+
+ * buildstream/elements/sdk/openxr.bst:
+ * buildstream/patches/openxr-0001-cmake-Check-for-C-17-and-conditionally-enable-it.patch: Removed.
+
2020-05-29 Wenson Hsieh <[email protected]>
REGRESSION (r261812): editing/async-clipboard/clipboard-item-get-type-basic.html is flaky
Modified: trunk/Tools/buildstream/elements/sdk/openxr.bst (262287 => 262288)
--- trunk/Tools/buildstream/elements/sdk/openxr.bst 2020-05-29 09:47:16 UTC (rev 262287)
+++ trunk/Tools/buildstream/elements/sdk/openxr.bst 2020-05-29 11:41:02 UTC (rev 262288)
@@ -15,9 +15,7 @@
- kind: git_tag
url: github_com:KhronosGroup/OpenXR-SDK-Source.git
track: master
- ref: release-1.0.8-26-g3e40561410c72a56c1b55a5f421a6bd5f9c1b490
-- kind: patch
- path: patches/openxr-0001-cmake-Check-for-C-17-and-conditionally-enable-it.patch
+ ref: release-1.0.8-47-g38c25761c6ecdcbf16fbcae7953b3421a6b268ac
variables:
cmake-local: >-
Deleted: trunk/Tools/buildstream/patches/openxr-0001-cmake-Check-for-C-17-and-conditionally-enable-it.patch (262287 => 262288)
--- trunk/Tools/buildstream/patches/openxr-0001-cmake-Check-for-C-17-and-conditionally-enable-it.patch 2020-05-29 09:47:16 UTC (rev 262287)
+++ trunk/Tools/buildstream/patches/openxr-0001-cmake-Check-for-C-17-and-conditionally-enable-it.patch 2020-05-29 11:41:02 UTC (rev 262288)
@@ -1,66 +0,0 @@
-From 4071543a9b783e9711aab268e8024a112ae7dcd2 Mon Sep 17 00:00:00 2001
-From: Philippe Normand <[email protected]>
-Date: Wed, 6 May 2020 09:10:15 +0100
-Subject: [PATCH] cmake: Check for C++-17 and conditionally enable it
-
-In GCC __cplusplus will be 201703 only if the -std=c++17 option is passed to the
-compiler. Without this option the filesystem_utils.cpp won't compile under GCC
-9.3.0, giving the following error:
-
-src/common/filesystem_utils.cpp:74:10: fatal error: experimental/filesystem: No
-such file or directory
----
- src/CMakeLists.txt | 7 +++++++
- src/loader/CMakeLists.txt | 18 +++++++++++++-----
- 2 files changed, 20 insertions(+), 5 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index b7c18cb..0ed5839 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -22,6 +22,13 @@ set(CMAKE_CXX_STANDARD 14)
- set(CMAKE_POSITION_INDEPENDENT_CODE ON)
- set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-
-+include(CheckCXXCompilerFlag)
-+
-+check_cxx_compiler_flag(-std=c++17 HAVE_FLAG_STD_CXX17)
-+if(HAVE_FLAG_STD_CXX17)
-+ set(CMAKE_CXX_STANDARD 17)
-+endif()
-+
- include(GNUInstallDirs)
-
- ### Dependencies
-diff --git a/src/loader/CMakeLists.txt b/src/loader/CMakeLists.txt
-index ca395af..38f7ab1 100644
---- a/src/loader/CMakeLists.txt
-+++ b/src/loader/CMakeLists.txt
-@@ -143,11 +143,19 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
- endif()
-
- set_target_properties(openxr_loader PROPERTIES SOVERSION "${MAJOR}" VERSION "${MAJOR}.${MINOR}.${PATCH}")
-- target_link_libraries(
-- openxr_loader
-- PRIVATE stdc++fs
-- PUBLIC m
-- )
-+
-+ if(HAVE_FLAG_STD_CXX17)
-+ target_link_libraries(
-+ openxr_loader
-+ PUBLIC m
-+ )
-+ else()
-+ target_link_libraries(
-+ openxr_loader
-+ PRIVATE stdc++fs
-+ PUBLIC m
-+ )
-+ endif()
-
- add_custom_target(
- libopenxr_loader.so.${MAJOR}.${MINOR} ALL
---
-2.26.2
-
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
