From nobody Sun Jul 2 19:14:08 2023 X-Original-To: dev-commits-ports-branches@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 4QvJdD4pGJz4ljJb; Sun, 2 Jul 2023 19:14:08 +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 4QvJdD2gr4z3Dmp; Sun, 2 Jul 2023 19:14:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688325248; 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=XD5xQs5VVJWY0yKOrCERccOMHXVFTA1OVCn5PHd121E=; b=JXOO8JzVcpzqzOvnpG7hfgGHfNopAD9Q9I9Ood6xN18lGc39AHWxSJgZ44c+7liU+4Xy2M q01tG64f45NbSMQX+JfcH3pZLPc8/dwEplAcdghosaHJa97Wh/cKlT2pHobIdpjza8t422 Cyc1KrGLeiVv/mfArxt2H1MYqpaBNJKoRQLJRepBzV7wNGBPjriBMO9ECWY2tfXxaRDxmu JWrVhHS2+NG9B4dQHuzYyHyO+FaIRXqDsbUaASBcW2SOKFpovvIBYfmn98xA/zlNR/n9pP 56GN7Rz9qOlV5emzFpT5x+RPFGkaawioN3qwdcGxSIg6/yKCi6723FTLPKIAOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688325248; 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=XD5xQs5VVJWY0yKOrCERccOMHXVFTA1OVCn5PHd121E=; b=jY5aSO1eQmVjMi8v200B15pFqjuND3IAz8hyvABaFH7Q6peoArLoGPXwqzTR/LMAWGlcP/ abQBwYrga8wvVDlyF763DtEPKr37nu46Bv+eob9AChRIz3rcJk4hjA2YGdyh3WNnCPfdrn cguY9ubB8AHa4ghRCcV+hYHsBJQX2iKC55AsUk+LarAi9jHo8RKuRr9cLeX7cF0n/F4STZ TGxarTY9C/5iXX0pzVsRuU4BXfjoJPYhTiTJoCcSz5Co4YcbM/+S5qWzW10PTAcee8RQP2 cOidsFN3sh0SCwQyradgI8GyIsdMRSfGMuA5h+mDk3ciBEswGWsIDWjcwryz5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688325248; a=rsa-sha256; cv=none; b=fhBWfjGe9X5Qqr44wMY18nEHlwg1Pqv3JFeif/PyUSimZJnZbt1bgWSjjVMTngKvECqQnS ETXDo2QI+Y9LUONgMAqmNfjGz37REsUyjWX8cP7MVS+r6XY/+mc/0LGDRJL6wHUHm3KBVi 1wWeOmeZyJE3MPraqTxamyBc+QHweJCnCg2KLWeYP6WBejs9kzDuhp176AZV0voAB479Cd UxVDWe1TLeSAP30x0BUMelwNXmKU1g5/WsVMwinehfGfQR4i2aEU7qlC0ce88plDmdbavf VcFxl11MTNw5WK3+cNNu4TgPysQWAG8qlqQXBB0mzOybheJOLyJEfqjvJx1Lfg== 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 4QvJdD1nThzKjj; Sun, 2 Jul 2023 19:14:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 362JE8vW034274; Sun, 2 Jul 2023 19:14:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 362JE8WD034273; Sun, 2 Jul 2023 19:14:08 GMT (envelope-from git) Date: Sun, 2 Jul 2023 19:14:08 GMT Message-Id: <202307021914.362JE8WD034273@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 896072281543 - 2023Q3 - x11-servers/xarcan: unbreak build with clang 16 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q3 X-Git-Reftype: branch X-Git-Commit: 8960722815438dd8d789e02c1088e4c63eac498b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q3 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=8960722815438dd8d789e02c1088e4c63eac498b commit 8960722815438dd8d789e02c1088e4c63eac498b Author: Jan Beich AuthorDate: 2023-07-02 19:01:23 +0000 Commit: Jan Beich CommitDate: 2023-07-02 19:13:58 +0000 x11-servers/xarcan: unbreak build with clang 16 ../hw/kdrive/arcan/arcan.c:1523:21: error: incompatible function pointer types initializing 'present_abort_vblank_ptr' (aka 'void (*)(struct _rrCrtc *, unsigned long, unsigned long)') with an expression of type 'void (void *)' [-Wincompatible-function-pointer-types] .abort_vblank = arcanPresentAbortVblank, ^~~~~~~~~~~~~~~~~~~~~~~ Reported by: pkg-fallout (cherry picked from commit 109051cff449fa3c24630d0f164c85a88936e035) --- x11-servers/xarcan/Makefile | 2 +- x11-servers/xarcan/files/patch-clang16 | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/x11-servers/xarcan/Makefile b/x11-servers/xarcan/Makefile index fd04cd1417bb..29b5becd63f1 100644 --- a/x11-servers/xarcan/Makefile +++ b/x11-servers/xarcan/Makefile @@ -1,6 +1,6 @@ PORTNAME= xarcan DISTVERSION= 0.6.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-servers PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ diff --git a/x11-servers/xarcan/files/patch-clang16 b/x11-servers/xarcan/files/patch-clang16 new file mode 100644 index 000000000000..a86f06fddfb8 --- /dev/null +++ b/x11-servers/xarcan/files/patch-clang16 @@ -0,0 +1,33 @@ +https://github.com/letoram/xarcan/commit/c6173b4f6682 + +../hw/kdrive/arcan/arcan.c:1523:21: error: incompatible function pointer types initializing 'present_abort_vblank_ptr' (aka 'void (*)(struct _rrCrtc *, unsigned long, unsigned long)') with an expression of type 'void (void *)' [-Wincompatible-function-pointer-types] + .abort_vblank = arcanPresentAbortVblank, + ^~~~~~~~~~~~~~~~~~~~~~~ +../hw/kdrive/arcan/arcan.c:1704:25: warning: incompatible pointer types passing 'miPointerSpriteFuncRec *' (aka 'struct _miPointerSpriteFuncRec *') to parameter of type 'miPointerScreenFuncPtr' (aka 'struct _miPointerScreenFuncRec *') [-Wincompatible-pointer-types] + &ArcanPointerSpriteFuncs, FALSE); + ^~~~~~~~~~~~~~~~~~~~~~~~ + +--- hw/kdrive/arcan/arcan.c.orig 2020-11-29 15:29:55 UTC ++++ hw/kdrive/arcan/arcan.c +@@ -1458,11 +1458,9 @@ static int arcanPresentGetUstMsc(RRCrtcPtr crtc, CARD6 + return 0; + } + +-static void arcanPresentAbortVblank(void *data) ++static void arcanPresentAbortVblank(RRCrtcPtr crtc, uint64_t evid, uint64_t msc) + { +- struct ms_present_vblank_event *event = data; + trace("present:vblank abort"); +- free(event); + } + + static int arcanPresentQueueVblank(RRCrtcPtr crtc, uint64_t evid, uint64_t msc) +@@ -1701,7 +1699,7 @@ arcanCursorInit(ScreenPtr screen) + + miPointerInitialize(screen, + &ArcanPointerSpriteFuncs, +- &ArcanPointerSpriteFuncs, FALSE); ++ &ArcanPointerScreenFuncs, FALSE); + + return TRUE; + }