Bug 237974 - [GTK][WPE] Guard libgbm and libdrm code, make them conditional dependencies for GTK
Summary: [GTK][WPE] Guard libgbm and libdrm code, make them conditional dependencies f...
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: New Bugs (show other bugs)
Version: WebKit Nightly Build
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Zan Dobersek
URL:
Keywords: InRadar
Depends on:
Blocks: DMA-BUF
  Show dependency tree / graph
 
Reported: 2022-03-16 12:06 PDT by Zan Dobersek
Modified: 2022-03-17 03:15 PDT (History)
9 users (show)

See Also:

Attachments
Patch (9.00 KB, patch)
2022-03-16 12:17 PDT, Zan Dobersek 		ews-feeder: commit-queue-
Details | Formatted Diff | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Zan Dobersek 2022-03-16 12:06:10 PDT 
[GTK][WPE] Guard libgbm code, make it a conditional dependency for GTK
Comment 1 Zan Dobersek 2022-03-16 12:17:44 PDT 
Created attachment 454878 [details]
Patch
Comment 2 Alejandro G. Castro 2022-03-16 12:41:49 PDT 
Comment on attachment 454878 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=454878&action=review

Great! LGTM!

> Source/cmake/OptionsGTK.cmake:389
> +
> +    if (USE_ANGLE_WEBGL)
> +        find_package(GBM REQUIRED)
> +        find_package(LibDRM REQUIRED)
> +        SET_AND_EXPOSE_TO_BUILD(USE_LIBGBM TRUE)
> +    endif ()

I would add in the file a dependency, in case someone tries to force one and not the other, we are not planning to implement other option for ANGLE:

WEBKIT_OPTION_DEPEND(USE_ANGLE_WEBGL USE_LIBGBM)

> Source/cmake/OptionsWPE.cmake:285
> +SET_AND_EXPOSE_TO_BUILD(USE_LIBGBM TRUE)

Ditto.
Comment 3 Zan Dobersek 2022-03-16 23:58:15 PDT 
I missed the comment, I'll add them later.
Comment 4 EWS 2022-03-17 00:42:57 PDT 
Committed r291392 (248522@main): <https://commits.webkit.org/248522@main>

All reviewed patches have been landed. Closing bug and clearing flags on attachment 454878 [details].
Comment 5 Radar WebKit Bug Importer 2022-03-17 00:43:18 PDT 
<rdar://problem/90415985>
Comment 6 Zan Dobersek 2022-03-17 03:00:49 PDT 
Comment on attachment 454878 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=454878&action=review

>> Source/cmake/OptionsGTK.cmake:389
>> +    endif ()
> 
> I would add in the file a dependency, in case someone tries to force one and not the other, we are not planning to implement other option for ANGLE:
> 
> WEBKIT_OPTION_DEPEND(USE_ANGLE_WEBGL USE_LIBGBM)

You can't force USE_LIBGBM, it's not public or configurable.