From 35cc78ceccc307de3ff896f996694be0e40d95ad Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Fri, 26 May 2023 06:37:37 +0000 Subject: [PATCH] Bug 1834898 [Linux] Don't require libdrm >= 2.4 r=glandium Differential Revision: https://phabricator.services.mozilla.com/D179071 --- taskcluster/scripts/misc/build-sysroot.sh | 1 - toolkit/moz.configure | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/taskcluster/scripts/misc/build-sysroot.sh b/taskcluster/scripts/misc/build-sysroot.sh index 617cfa25db49..5cc2db5fa4a1 100755 --- a/taskcluster/scripts/misc/build-sysroot.sh +++ b/taskcluster/scripts/misc/build-sysroot.sh @@ -43,7 +43,6 @@ packages=" libasound2-dev libstdc++-${gcc_version}-dev libdbus-glib-1-dev - libdrm-dev libfontconfig1-dev libfreetype6-dev libgconf2-dev diff --git a/toolkit/moz.configure b/toolkit/moz.configure index 9eb737766efb..55182915aafe 100644 --- a/toolkit/moz.configure +++ b/toolkit/moz.configure @@ -489,7 +489,7 @@ def toolkit_gtk(toolkit): # ============================================================== wayland_headers = pkg_check_modules( "MOZ_WAYLAND", - "gtk+-wayland-3.0 >= 3.14 xkbcommon >= 0.4.1 libdrm >= 2.4", + "gtk+-wayland-3.0 >= 3.14 xkbcommon >= 0.4.1", allow_missing=depends(full_toolkit)(lambda t: t == "cairo-gtk3"), when=toolkit_gtk, ) @@ -2929,7 +2929,7 @@ set_define("MOZ_DATA_REPORTING", True, when=data_reporting) with only_when(toolkit_gtk): pkg_check_modules( "MOZ_GTK3", - "gtk+-3.0 >= 3.14.0 gtk+-unix-print-3.0 glib-2.0 gobject-2.0 gio-unix-2.0 libdrm >= 2.4", + "gtk+-3.0 >= 3.14.0 gtk+-unix-print-3.0 glib-2.0 gobject-2.0 gio-unix-2.0", ) set_define("GDK_VERSION_MIN_REQUIRED", "GDK_VERSION_3_14")