Title: [292053] trunk/Source/ThirdParty/ANGLE
- Revision
- 292053
- Author
- commit-qu...@webkit.org
- Date
- 2022-03-29 12:08:10 -0700 (Tue, 29 Mar 2022)
Log Message
Handle pkg_config and declare_args statements in gni-to-cmake.py
https://bugs.webkit.org/show_bug.cgi?id=238490
Remove these statements, since they currently must be deleted from
the resulting CMake files by hand.
Regenerate the CMake files from current ANGLE sources, to minimize
changes during the next roll.
Patch by Kenneth Russell <k...@chromium.org> on 2022-03-29
Reviewed by Dean Jackson.
* GL.cmake:
* gni-to-cmake.py:
Modified Paths
Diff
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (292052 => 292053)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2022-03-29 19:07:50 UTC (rev 292052)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2022-03-29 19:08:10 UTC (rev 292053)
@@ -1,3 +1,19 @@
+2022-03-29 Kenneth Russell <k...@chromium.org>
+
+ Handle pkg_config and declare_args statements in gni-to-cmake.py
+ https://bugs.webkit.org/show_bug.cgi?id=238490
+
+ Remove these statements, since they currently must be deleted from
+ the resulting CMake files by hand.
+
+ Regenerate the CMake files from current ANGLE sources, to minimize
+ changes during the next roll.
+
+ Reviewed by Dean Jackson.
+
+ * GL.cmake:
+ * gni-to-cmake.py:
+
2022-03-23 Kenneth Russell <k...@chromium.org>
Roll ANGLE to 2022-03-22 (e7f29440f02514126f30350dcd7132b68f7954d7)
Modified: trunk/Source/ThirdParty/ANGLE/GL.cmake (292052 => 292053)
--- trunk/Source/ThirdParty/ANGLE/GL.cmake 2022-03-29 19:07:50 UTC (rev 292052)
+++ trunk/Source/ThirdParty/ANGLE/GL.cmake 2022-03-29 19:08:10 UTC (rev 292053)
@@ -10,8 +10,14 @@
+if(angle_has_build AND ozone_platform_gbm)
+endif()
+
+
+
+
set(_gl_backend_sources
"src/libANGLE/renderer/gl/BlitGL.cpp"
"src/libANGLE/renderer/gl/BlitGL.h"
@@ -163,6 +169,8 @@
"src/libANGLE/renderer/gl/egl/gbm/SurfaceGbm.cpp"
"src/libANGLE/renderer/gl/egl/gbm/SurfaceGbm.h"
)
+
+
endif()
Modified: trunk/Source/ThirdParty/ANGLE/gni-to-cmake.py (292052 => 292053)
--- trunk/Source/ThirdParty/ANGLE/gni-to-cmake.py 2022-03-29 19:07:50 UTC (rev 292052)
+++ trunk/Source/ThirdParty/ANGLE/gni-to-cmake.py 2022-03-29 19:08:10 UTC (rev 292053)
@@ -36,6 +36,15 @@
file,
flags=re.MULTILINE | re.DOTALL)
+ # Remove pkg_config and declare_args statements after removing import statements.
+ # Import statements can refer to pkg_config, necessating handling this separately,
+ # and the regexps are slightly different.
+ file = re.sub(
+ r'(^\s*(pkg_config|declare_args)\([^)]*\)\s+{.*?}$)*',
+ r'',
+ file,
+ flags=re.MULTILINE | re.DOTALL)
+
# Translate gn single line list declaration:
file = re.sub(r'\[ ((?:"[^"]*",? )*)\]$', r' \1)', file, flags=re.MULTILINE)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
