Title: [260419] trunk
- Revision
- 260419
- Author
- ph...@webkit.org
- Date
- 2020-04-21 01:41:11 -0700 (Tue, 21 Apr 2020)
Log Message
Source/WebKit:
[CMake] gst-build-backed build fails
https://bugs.webkit.org/show_bug.cgi?id=210742
Reviewed by Xabier Rodriguez-Calvar.
* PlatformWPE.cmake:
Tools:
[CMake][Flatpak SDK] gst-build-backed build fails
https://bugs.webkit.org/show_bug.cgi?id=210742
Reviewed by Xabier Rodriguez-Calvar.
Add non-core GStreamer include-dirs necessary for the compilation
of the GStreamer API test. Usually GSTREAMER_INCLUDE_DIRS is
sufficient because on a GStreamer system-wide installation, all
headers are stored in the same root include dir, the same as the
core GStreamer library.
But when building with gst-build, include-dirs are scattered all
over the place.
* TestWebKitAPI/PlatformGTK.cmake:
* TestWebKitAPI/PlatformWPE.cmake:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (260418 => 260419)
--- trunk/Source/WebKit/ChangeLog 2020-04-21 08:38:23 UTC (rev 260418)
+++ trunk/Source/WebKit/ChangeLog 2020-04-21 08:41:11 UTC (rev 260419)
@@ -1,3 +1,12 @@
+2020-04-21 Philippe Normand <pnorm...@igalia.com>
+
+ [CMake] gst-build-backed build fails
+ https://bugs.webkit.org/show_bug.cgi?id=210742
+
+ Reviewed by Xabier Rodriguez-Calvar.
+
+ * PlatformWPE.cmake:
+
2020-04-21 Adrian Perez de Castro <ape...@igalia.com>
Non-unified build fixes late February 2020 edition
Modified: trunk/Source/WebKit/PlatformWPE.cmake (260418 => 260419)
--- trunk/Source/WebKit/PlatformWPE.cmake 2020-04-21 08:38:23 UTC (rev 260418)
+++ trunk/Source/WebKit/PlatformWPE.cmake 2020-04-21 08:41:11 UTC (rev 260419)
@@ -279,6 +279,9 @@
${GIO_UNIX_INCLUDE_DIRS}
${GLIB_INCLUDE_DIRS}
${GSTREAMER_INCLUDE_DIRS}
+ ${GSTREAMER_AUDIO_INCLUDE_DIRS}
+ ${GSTREAMER_PBUTILS_INCLUDE_DIRS}
+ ${GSTREAMER_VIDEO_INCLUDE_DIRS}
${LIBSECCOMP_INCLUDE_DIRS}
${LIBSOUP_INCLUDE_DIRS}
)
Modified: trunk/Tools/ChangeLog (260418 => 260419)
--- trunk/Tools/ChangeLog 2020-04-21 08:38:23 UTC (rev 260418)
+++ trunk/Tools/ChangeLog 2020-04-21 08:41:11 UTC (rev 260419)
@@ -1,3 +1,22 @@
+2020-04-21 Philippe Normand <pnorm...@igalia.com>
+
+ [CMake][Flatpak SDK] gst-build-backed build fails
+ https://bugs.webkit.org/show_bug.cgi?id=210742
+
+ Reviewed by Xabier Rodriguez-Calvar.
+
+ Add non-core GStreamer include-dirs necessary for the compilation
+ of the GStreamer API test. Usually GSTREAMER_INCLUDE_DIRS is
+ sufficient because on a GStreamer system-wide installation, all
+ headers are stored in the same root include dir, the same as the
+ core GStreamer library.
+
+ But when building with gst-build, include-dirs are scattered all
+ over the place.
+
+ * TestWebKitAPI/PlatformGTK.cmake:
+ * TestWebKitAPI/PlatformWPE.cmake:
+
2020-04-20 Ross Kirsling <ross.kirsl...@sony.com>
Classes marked final should not use protected access specifier
Modified: trunk/Tools/TestWebKitAPI/PlatformGTK.cmake (260418 => 260419)
--- trunk/Tools/TestWebKitAPI/PlatformGTK.cmake 2020-04-21 08:38:23 UTC (rev 260418)
+++ trunk/Tools/TestWebKitAPI/PlatformGTK.cmake 2020-04-21 08:41:11 UTC (rev 260419)
@@ -41,6 +41,9 @@
list(APPEND TestWebCore_SYSTEM_INCLUDE_DIRECTORIES
${GLIB_INCLUDE_DIRS}
${GSTREAMER_INCLUDE_DIRS}
+ ${GSTREAMER_AUDIO_INCLUDE_DIRS}
+ ${GSTREAMER_PBUTILS_INCLUDE_DIRS}
+ ${GSTREAMER_VIDEO_INCLUDE_DIRS}
${LIBSOUP_INCLUDE_DIRS}
)
Modified: trunk/Tools/TestWebKitAPI/PlatformWPE.cmake (260418 => 260419)
--- trunk/Tools/TestWebKitAPI/PlatformWPE.cmake 2020-04-21 08:38:23 UTC (rev 260418)
+++ trunk/Tools/TestWebKitAPI/PlatformWPE.cmake 2020-04-21 08:41:11 UTC (rev 260419)
@@ -37,6 +37,9 @@
list(APPEND TestWebCore_SYSTEM_INCLUDE_DIRECTORIES
${GLIB_INCLUDE_DIRS}
${GSTREAMER_INCLUDE_DIRS}
+ ${GSTREAMER_AUDIO_INCLUDE_DIRS}
+ ${GSTREAMER_PBUTILS_INCLUDE_DIRS}
+ ${GSTREAMER_VIDEO_INCLUDE_DIRS}
${LIBSOUP_INCLUDE_DIRS}
)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
