From patchwork Wed Jan 21 09:08:53 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Robert Mader X-Patchwork-Id: 25904 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 82D2EC3220 for ; Wed, 21 Jan 2026 09:09:41 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 3514A61FC8; Wed, 21 Jan 2026 10:09:41 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=collabora.com header.i=robert.mader@collabora.com header.b="fX2wiysW"; dkim-atps=neutral Received: from sender4-pp-f112.zoho.com (sender4-pp-f112.zoho.com [136.143.188.112]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 7D8A961FC4 for ; Wed, 21 Jan 2026 10:09:39 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; t=1768986576; cv=none; d=zohomail.com; s=zohoarc; b=ZfinL/nhq6DRQpIG/h/XQdUVWumlJy07t8NB7ouhr8vCJ1Ot1oI9q7ZPBKUeljGaedk1Wnmgqs8WdoiPLGy4b8Ckc99VkMZIsWqJtT3vUut9v1iVXxnW4nsEY/Nc2jnYdS91vszORZC9FrZDCBiZp4V5gwudvDsVfb8rRnJCHtM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768986576; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=itY7biLqCAllWqA6C4kfZnzkwFvdl1kmXHpnGgg6qJU=; b=PJfCc8W4Pna6NMDod4tmYnpyC5ktcSWLcxGD8GFYTb4T1ef7tatWOvy+av8Or/+VJQ9GIB7Q+DM+fqLHX/vV3nwyys4lIE4v9jUKKCevsrYTQR0yrL9VGS+2YQqbPiCXaJeylY1Xkp3zpaeojwlIa+PKv73PXStN4741YqHAtmQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=robert.mader@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1768986576; s=zohomail; d=collabora.com; i=robert.mader@collabora.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Reply-To; bh=itY7biLqCAllWqA6C4kfZnzkwFvdl1kmXHpnGgg6qJU=; b=fX2wiysWVcPyUm1Ci+cO3lvrcH82fkBHGCp1ZA9cAh95vQKKu+Q+MRCOeQyUSyFH kV2EbFirL+QMhYkOZpuns8lW93/IxKrrgUV4hnvhkN+DwBJKQMKMXVU4dR2PgzqLWcE /V0fKa8s5DcPOktnhK+VcDx7XIvKr+bR6KdfPEXM= Received: by mx.zohomail.com with SMTPS id 1768986574441237.22933348087736; Wed, 21 Jan 2026 01:09:34 -0800 (PST) From: Robert Mader To: libcamera-devel@lists.libcamera.org Cc: Robert Mader , =?utf-8?q?Barnab=C3=A1s_P?= =?utf-8?b?xZFjemU=?= Subject: [PATCH v4 2/3] egl: Add workaround for Mesa <= 22.2 Date: Wed, 21 Jan 2026 10:08:53 +0100 Message-ID: <20260121090854.27483-2-robert.mader@collabora.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260121090854.27483-1-robert.mader@collabora.com> References: <20260121090854.27483-1-robert.mader@collabora.com> MIME-Version: 1.0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Older Mesa versions with EGL headers missing the change from https://github.com/KhronosGroup/EGL-Registry/pull/130 pull in Xlib headers, causing build issues. This notably happens on the Debian 11 CI image, which until now does not build the shared EGL code due to missing GBM dependencies. That will change in the following commit, thus include a workaround. Suggested-by: Barnabás Pőcze Signed-off-by: Robert Mader Reviewed-by: Laurent Pinchart --- Changes in v4: - Pulled this change into a dedicated commit - Fixed comment style - Fixed Mesa version in comment --- include/libcamera/internal/egl.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/libcamera/internal/egl.h b/include/libcamera/internal/egl.h index 630345ea7..8a2d96d7a 100644 --- a/include/libcamera/internal/egl.h +++ b/include/libcamera/internal/egl.h @@ -16,6 +16,12 @@ #include #include +/* + * Workaround for build issues on Mesa <= 22.2, see + * https://github.com/KhronosGroup/EGL-Registry/pull/130 + */ +#define EGL_NO_X11 + #define EGL_EGLEXT_PROTOTYPES #include #include