From nobody Wed Feb 15 04:40:12 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PGlk43QVqz3rFxd; Wed, 15 Feb 2023 04:40:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PGlk42gFFz3Ksy; Wed, 15 Feb 2023 04:40:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676436012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DH/GDezBWfqD53I2it8F4C+v2ckhbdptSbYR2k6WekA=; b=DGLXwZeEfJ73osNURn4N1K1yUWwnseMt8n8Lqnxu+guTBjyOfCqwm14ZLXB3q4Xoe9TbWn RDIy4IZkp7ejFvE1TsWahT38NMXyXVoewhMbM/kTAMT2fxSuBQroyTd22qSEDBlucQrtjF 5oeP/1cHsukoZg0qTrWTViOkHUhicJc0IB8Uzsnad9qJiAAk5fBuIj77iNt8Bzqp8iacxs A4gaJGyPDKSR1CIAZYJFtHF2azT1ZsbNFtNcf4TinfSl1ZV5EXzcDLvOfu/TpRiOTtntoM GVMsjQOpQX1Hn6XLXNA5/0nb2WwAAjdbF4Aesg/wLnwPvYErJ071gebG6r7aag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676436012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DH/GDezBWfqD53I2it8F4C+v2ckhbdptSbYR2k6WekA=; b=e63YRX64r90msl3lqwnyTH2hL6sSL96LnbLST1q9ZAGje9lH7oy5GMGDJwRikuX4Ewo0CH +2oh1gftFyxA9ufIndHIzC++SfGCK8x+VhY+CnS+WtfuLheNYu9wcH4HLGDFpAyTgj35lI 8cymHZMODThZBAK+z3v8ebfHCrv5Qi0lmigiMzPsqRwp/XoR3jytswATLLo9FUbR28tlR1 eMgZ5FkTHNPmK/TOp0DVsOBV8SY0dfw2rBqJIPhOVcRrOiK2hh58ycHKZdAG79pZ8NrAvj zox1kiHxehwZWcIrMmrF64t28u9kmUAnxMDNKsC7UlBLrSqKqYwOLgVJgaLCQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676436012; a=rsa-sha256; cv=none; b=Vo9yE4IHARavUWvod5wrLdEv4FlJTBp1Bt18ktx+usVZtoQX2qi/nxS9M0nmcSBVz7Pd3F 2q9dvG2SYQf23wm/AXE2kWz4V26VXctxnpp5PhNL63e69P5a7YazSwGrWXWHawHgMXdu9r q2EAa5hbNsfvg06dBrbbsSES+USyy/ybn2GoXgRo7sJoyL5NronKRU6vFIUzn/hZD1s8bJ BoKQEF+2PFNf4522DJWC7TREzbPx4iluZT07Z1FDhIw+O4AjxOxYG5TwCXj5B3y2yJIuwE 7h4a+WW7ORZOVfEodvBg28t2EHl7PzrXtmmIW7AFoBiTryAt5Ths74uuaVRVAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PGlk41jrsz1QSY; Wed, 15 Feb 2023 04:40:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31F4eCBx067597; Wed, 15 Feb 2023 04:40:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31F4eC2w067591; Wed, 15 Feb 2023 04:40:12 GMT (envelope-from git) Date: Wed, 15 Feb 2023 04:40:12 GMT Message-Id: <202302150440.31F4eC2w067591@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 46295812c6a4 - main - games/egl: unbreak the port's build against Clang 15 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 46295812c6a411741c04ba87345e08216ff0c6c3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=46295812c6a411741c04ba87345e08216ff0c6c3 commit 46295812c6a411741c04ba87345e08216ff0c6c3 Author: Alexey Dokuchaev AuthorDate: 2023-02-15 04:39:32 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-02-15 04:39:32 +0000 games/egl: unbreak the port's build against Clang 15 Add #include "x11_linux.h" to obtain the prototype for the X11_GetAuxKeyRemapName() function, otherwise compiler does not know its return value and defaults to `int': unix/unix_glimp.c:117:5: error: incompatible integer to pointer conversion assigning to 'char *' from 'int' [-Wint-conversion] Reported by: pkg-fallout --- games/egl/files/patch-unix__unix_glimp.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/games/egl/files/patch-unix__unix_glimp.c b/games/egl/files/patch-unix__unix_glimp.c index 82e220eb6db9..3fe1860452ba 100644 --- a/games/egl/files/patch-unix__unix_glimp.c +++ b/games/egl/files/patch-unix__unix_glimp.c @@ -1,6 +1,18 @@ ---- unix/unix_glimp.c.orig Mon Jul 24 16:42:03 2006 -+++ unix/unix_glimp.c Mon Jul 24 16:47:48 2006 -@@ -41,6 +41,9 @@ +--- unix/unix_glimp.c.orig 2006-06-03 19:24:54 UTC ++++ unix/unix_glimp.c +@@ -31,16 +31,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, + #include + #include + +-#include "../renderer/r_local.h" +-#include "../client/cl_local.h" ++#include "../shared/shared.h" + #include "unix_glimp.h" + #include "unix_local.h" ++#include "x11_linux.h" + + static qBool vid_queueRestart; + static qBool vid_isActive; glxState_t glxState = {.OpenGLLib = NULL}; @@ -10,7 +22,7 @@ /* ============================================================================= -@@ -208,8 +211,8 @@ +@@ -208,8 +211,8 @@ void VID_Init (refConfig_t *outConfig) vid_fullscreen = Cvar_Register ("vid_fullscreen", "0", CVAR_ARCHIVE); // Add some console commands that we want to handle @@ -21,7 +33,7 @@ // Start the graphics mode and load refresh DLL vid_isActive = qFalse; -@@ -232,8 +235,8 @@ +@@ -232,8 +235,8 @@ void VID_Shutdown (void) vid_isActive = qFalse; }