From patchwork Tue Oct 13 22:34:03 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Winarske X-Patchwork-Id: 28448 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 A26ADBDCB6 for ; Wed, 14 Oct 2026 06:02:57 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 73490689FE; Wed, 14 Oct 2026 08:02:56 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="BICl1jWb"; dkim-atps=neutral Received: from mail-pj1-x1033.google.com (mail-pj1-x1033.google.com [IPv6:2607:f8b0:4864:20::1033]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 55B316862F for ; Wed, 14 Oct 2026 00:34:38 +0200 (CEST) Received: by mail-pj1-x1033.google.com with SMTP id 98e67ed59e1d1-38e42560ebcso157746a91.1 for ; Tue, 13 Oct 2026 15:34:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1791930876; x=1792535676; darn=lists.libcamera.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=eEVe/iBQhHoaRQTKxrgeO18BvqK2ky7VCJ8ZXKyQD4Q=; b=BICl1jWbLt72MPI1IHa/GeOOnuskqcIdVPC8vmslE8hPuqUAD0ONH2inJdXUqxY4B/ LtnZMUwhnfuD6W+wNBV0jNojqNHuQdjvml0+6BnBOX6z8B7/p3jNTx8DWDoUxNgwCwWS UwHpwYhrsyA1vZXgVV80X8lX0VTRjSYAbRyYymBnr4FcurTu/lc8YiIZx20GCNwfyaLK tuFmfII5k39x28nFKEwoxCej7byrJThAah5qNzy3WPZ2woKBTDguG148PB6XjbXlT0BD OvbyyuerNjpJf9jZ1/ug2/TMLuzqXMDv2zmIRaopjwd3oVepGA1XJX7IsDcUif2rrt/5 jUXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791930876; x=1792535676; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=eEVe/iBQhHoaRQTKxrgeO18BvqK2ky7VCJ8ZXKyQD4Q=; b=rRKZUzasZ5IMH+nKKocI7clO4JKQzbn4f9iFzTP99bLXl0NK0Twje6RZLI1IXB/S8d N9gDl0/bZJ/mMgCd4xhjqbA+PoopRuGyb7smu55l8PVJASrM0nNuu2YRMj2y7GADoukL rC9Fe+T0twOtRRdORQSUyQNlOzOoio6khLeyvvd7HXHur1djN3vQWg0NS1Pl6rOCSPev FM6QlAlMIZlXKfILC1Trr25LrkQcarrXlvNzRN/iNB8h9gcRF+1iitSTHjOGh9XGOczt sGf+mbtE8o3qj6Q5rAzSRGA/nyFgpAw9nQqA9kp3nDajZ1U5yR9hyXd8FKFnnq3REt45 vBqA== X-Gm-Message-State: AFq9FYKYNMSfOogwR27IVUDdbAqn9HeNHkBk2Y7EgPed42JE+gJr31lm GNTjw+LCaNEwgFHaPiSbAWmc6ea3CKxfoaC7V4O8B5ZxpmFjHF2UN6JafKhmGQ== X-Gm-Gg: AYBFou2ZF3EuiBWE7baHyR3qB+svVVrZN1O9NnzVZ+ylYo4WAmHn5HIhbhfZg6f8QbA upt84l+m/HT8w31+ZlgulOTxJ3D8pcYRwD1rguYtSkfeQnrRvzTR0OH09Rtm5PuVT7x9fJfqmO9 2iGe3078dgFyHau49zJVbLvGwYyOhVTMJRm1r6UyLk8QrYE+zvK+01V1ZHoWRDYishz7lh544zt R35Gh6bfGjGa7joVxpH0nJJsz4kNs/umYEjGjsYr0KSmky5yAPgYHgGbNTeAC2a4yIOBpQH8XMf z+n8y/+lEoqKM7X/XcZ2taF62G8sfAft976sTnKV4E4XD5KCP0Bf07OMGU41HsbgdRTXXJBKfEz xAIWdy3i0DuWj3faQRnLeQg7J1BYCTQAINkxjr/HX1x7Or8CRtXIeGintv/XSsalyiTGNx64NeD pVYCRKC9NxFhhWdvEHnGIVd1qsazKFbuTQkrELjCI5EqzTTe9G6li8Y0xgr7mvLwMBV4eEUe6fX HWyNFxAwQd9Lsg3sjU2RrFCFZjWbLXwpCe8sFCQq0d4y99ISA== X-Received: by 2002:a17:90b:570e:b0:3aa:faf6:a954 with SMTP id 98e67ed59e1d1-3ab3a933795mr10776765a91.55.1791930876318; Tue, 13 Oct 2026 15:34:36 -0700 (PDT) Received: from air ([2601:602:580:a250:62eb:81a:51d8:6bf6]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3ac5f1fb257sm1485382a91.0.2026.10.13.15.34.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Oct 2026 15:34:34 -0700 (PDT) From: Joel Winarske X-Google-Original-From: Joel Winarske To: libcamera-devel@lists.libcamera.org Cc: Joel Winarske Subject: [PATCH] libcamera: egl: Don't redefine EGL_NO_X11 Date: Tue, 13 Oct 2026 15:34:03 -0700 Message-ID: <20261013223403.1242372-1-joel.winarske@linux.com> X-Mailer: git-send-email 2.56.0 MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 14 Oct 2026 08:02:55 +0200 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" Mesa <= 22.2 (and forks based on it, e.g. the PowerVR mesa-pvr used on StarFive JH7110) export -DEGL_NO_X11 via egl.pc Cflags. The unconditional define in egl.h then redefines it with a different value, which is an error with -Werror: include/libcamera/internal/egl.h:23:9: error: 'EGL_NO_X11' redefined [-Werror] Only define it when it isn't already set. Signed-off-by: Joel Winarske Reviewed-by: Kieran Bingham --- include/libcamera/internal/egl.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/libcamera/internal/egl.h b/include/libcamera/internal/egl.h index 7d062b32d..9d2c9b5bc 100644 --- a/include/libcamera/internal/egl.h +++ b/include/libcamera/internal/egl.h @@ -21,7 +21,9 @@ * Workaround for build issues on Mesa <= 22.2, see * https://github.com/KhronosGroup/EGL-Registry/pull/130 */ +#ifndef EGL_NO_X11 #define EGL_NO_X11 +#endif #define EGL_EGLEXT_PROTOTYPES #include