[webkit-changes] [WebKit/WebKit] 6af38f: [GTK] Build broken with USE_GBM=OFF

[Adrian Perez]

  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 6af38ff932848db2eb8f1ad168c9ce9cfdc5cb96
      https://github.com/WebKit/WebKit/commit/6af38ff932848db2eb8f1ad168c9ce9cfdc5cb96
  Author: Adrian Perez de Castro <aperez at igalia.com>
  Date:   2024-03-24 (Sun, 24 Mar 2024)

  Changed paths:
    M Source/WebCore/PlatformGTK.cmake
    M Source/WebCore/PlatformWPE.cmake
    M Source/WebKit/PlatformGTK.cmake
    M Source/WebKit/PlatformWPE.cmake
    M Source/WebKit/WPEPlatform/CMakeLists.txt
    M Source/WebKit/WebProcess/WebPage/dmabuf/AcceleratedSurfaceDMABuf.cpp
    M Source/WebKit/WebProcess/WebPage/dmabuf/AcceleratedSurfaceDMABuf.h
    M Source/cmake/FindGBM.cmake
    M Source/cmake/FindLibDRM.cmake
    M Source/cmake/OptionsGTK.cmake
    M Source/cmake/OptionsWPE.cmake

  Log Message:
  -----------
  [GTK] Build broken with USE_GBM=OFF
https://bugs.webkit.org/show_bug.cgi?id=271525

Reviewed by Michael Catanzaro.

Add missing USE(GBM) guards, arrange to link against libdrm with
USE_GBM=OFF and USE_LIBDRM=ON, and while at it convert the the libdrm
CMake find-module to use imported targets.

* Source/WebCore/PlatformGTK.cmake: Link libgbm or libdrm as appropriate.
* Source/WebCore/PlatformWPE.cmake: Ditto.
* Source/WebKit/PlatformGTK.cmake: Remove explicit libdrm linking, now
using an imported target it gets pulled transitively due to WebKit
linking against the WebCore target.
* Source/WebKit/PlatformWPE.cmake: Ditto.
* Source/WebKit/WPEPlatform/CMakeLists.txt: Link libgbm of libdrm as
appropriate, remove specifying the libdrm include directory for
GObject-Introspection as it gets pulled from transitively from the
imported target.
* Source/WebKit/WebProcess/WebPage/dmabuf/AcceleratedSurfaceDMABuf.cpp:
(WebKit::AcceleratedSurfaceDMABuf::backgroundColorDidChange): Add
missing USE(GBM) guard on usage of SwapChain::Type::EGLImage.
* Source/WebKit/WebProcess/WebPage/dmabuf/AcceleratedSurfaceDMABuf.h:
Only define SwapChain::Type::EGLImage with USE(GBM).
* Source/cmake/FindGBM.cmake: Make the GBM::GBM target INTERFACE-depend
on the LibDRM::LibDRM target, because headers from the former include
headers from the latter.
* Source/cmake/FindLibDRM.cmake: Convert to use imported targets, this
is needed to make GBM::GBM depend on it, and simplifies CMake build
files all around.
* Source/cmake/OptionsGTK.cmake: Use LibDRM_FOUND instead of LIBDRM_FOUND.
* Source/cmake/OptionsWPE.cmake: Ditto.

Canonical link: https://commits.webkit.org/276612@main



To unsubscribe from these emails, change your notification settings at https://github.com/WebKit/WebKit/settings/notifications