From nobody Wed Aug 28 02:28:17 2024 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 4WtpHQ1XLrz5Mc0Q; Wed, 28 Aug 2024 02:28:18 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WtpHQ0yGRz4JZd; Wed, 28 Aug 2024 02:28:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724812098; 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=kGfd0J0pfo17wUjS+3w1Uiahvo+TrHF3rR10KzFeihg=; b=PZJFmFHVU3z75xHKSj244s0emzqcXm/TZLy5wK8o3P9G4vXq+NG3QwnbElxeE1rZamXj9J DCrI6LP/LUPO88nu43SW+URMjFWFLueALW7ro3F8GhgfdBBYCi4Ivs+YH64UKChIsilMBg b1BA6k1iDsB5ohdKhJNKvWOW7OGeHgZpIAvKPVpUzRzkr5gON+ob1n6X1GdPfsLbTN4LSQ TEz+tc0HhiFFcULzcy9YljzHrONddAjprtQI5aZPZef9Z10DJ36bAi/R4ZgDwIRHtBW5Js xswtrTJJEU2rFKqkdt2W1ArX1kheeGE+t7wi3xpZH4og9Ob8Urdg03sGmqQv1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724812098; a=rsa-sha256; cv=none; b=ArJteK4VnDK9WO6rE0dtDWMun80RePcIxXJe/ExRzgH5Z4Axetr5CVIV/kMvaDWC7p0cTW S4SYCtTBwEmcYJ8jUg7qd/6QW6G/wWft1n9FU79+CB0UpvRjFdAfZ6oVEwAIb5QGmNA1Z+ z494E2xx9fZEhABbmd8kGv/LSMeyZOv2EiWmuuEiIpniELi3GQ9rvsQ/HZst9RrkqH+5Fw SN0J7cPj4KFtQww0/gkS/x/vy0YOGsXnYSJ/EJjErmZX/hRHhy7AE9OpGlXF1K/KeYiEOu 0Thu2WU7k5OF/rrQnfMQF98u9sfj9xrAhTgrImFXB7cTS0SdV9fvq08chU62yg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724812098; 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=kGfd0J0pfo17wUjS+3w1Uiahvo+TrHF3rR10KzFeihg=; b=WpwOiE8X6+Ly6QffKFPI2y9PYhyGmsa+W84KLa7dP+JvCkc/hdO0T3Stu8uf9eqTtth+yw FL7309TWlC6eOTcPS9LLLykmETuwbTmNXyV7fw9Bf1idI2P8TmWaJ9m3YqCbnmSQ8OniEl dhea+CmC8kS8NMP1f2DYQBlrhj+OhFD3drKFdUgvWazszxaXLFC8g1ctumZrhABO+Ez5wu zrViPxAbcCh4rUPxAKuCk11VhAyKntnmjjFA4+z+jsJ4I65TQVIQ+HNwBeWJhlUfil3JjU /TxrjwlrqDUjq1ZPaAIYPk2MSaFVBtHytK4IEmUro76vZQyNtGzY75QLMznbkQ== 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 4WtpHQ0YcmzFgy; Wed, 28 Aug 2024 02:28:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47S2SHNI041996; Wed, 28 Aug 2024 02:28:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47S2SH3B041993; Wed, 28 Aug 2024 02:28:17 GMT (envelope-from git) Date: Wed, 28 Aug 2024 02:28:17 GMT Message-Id: <202408280228.47S2SH3B041993@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Koichiro Iwao Subject: git: ca5d9506c410 - main - net/tigervnc-viewer: Apply a fix for ZRLE exception 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: meta X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ca5d9506c4108b8c4e26e93833c3f79c1ea4319c Auto-Submitted: auto-generated The branch main has been updated by meta: URL: https://cgit.FreeBSD.org/ports/commit/?id=ca5d9506c4108b8c4e26e93833c3f79c1ea4319c commit ca5d9506c4108b8c4e26e93833c3f79c1ea4319c Author: Koichiro Iwao AuthorDate: 2024-08-28 02:18:18 +0000 Commit: Koichiro Iwao CommitDate: 2024-08-28 02:21:06 +0000 net/tigervnc-viewer: Apply a fix for ZRLE exception Reported by: Keith White Obtained from: https://github.com/TigerVNC/tigervnc/issues/1809 --- .../files/patch-common_rfb_ZRLEDecoder.cxx | 15 +++++++++++++++ net/tigervnc-viewer/Makefile | 2 ++ 2 files changed, 17 insertions(+) diff --git a/net/tigervnc-server/files/patch-common_rfb_ZRLEDecoder.cxx b/net/tigervnc-server/files/patch-common_rfb_ZRLEDecoder.cxx new file mode 100644 index 000000000000..bd97820b5fb7 --- /dev/null +++ b/net/tigervnc-server/files/patch-common_rfb_ZRLEDecoder.cxx @@ -0,0 +1,15 @@ +--- common/rfb/ZRLEDecoder.cxx.orig 2024-07-23 08:50:25 UTC ++++ common/rfb/ZRLEDecoder.cxx +@@ -126,10 +126,10 @@ void ZRLEDecoder::zrleDecode(const Rect& r, rdr::InStr + Pixel maxPixel = pf.pixelFromRGB((uint16_t)-1, (uint16_t)-1, (uint16_t)-1); + bool fitsInLS3Bytes = maxPixel < (1<<24); + bool fitsInMS3Bytes = (maxPixel & 0xff) == 0; +- bool isLowCPixel = (sizeof(T) == 4) && ++ bool isLowCPixel = (sizeof(T) == 4) && (pf.depth <= 24) && + ((fitsInLS3Bytes && pf.isLittleEndian()) || + (fitsInMS3Bytes && pf.isBigEndian())); +- bool isHighCPixel = (sizeof(T) == 4) && ++ bool isHighCPixel = (sizeof(T) == 4) && (pf.depth <= 24) && + ((fitsInLS3Bytes && pf.isBigEndian()) || + (fitsInMS3Bytes && pf.isLittleEndian())); + diff --git a/net/tigervnc-viewer/Makefile b/net/tigervnc-viewer/Makefile index e9161161ec94..5d9644cec68a 100644 --- a/net/tigervnc-viewer/Makefile +++ b/net/tigervnc-viewer/Makefile @@ -1,5 +1,6 @@ PKGNAMESUFFIX= -viewer CATEGORIES= net +PORTREVISION= 1 COMMENT= TigerVNC Viewer WWW= https://tigervnc.org/ @@ -33,4 +34,5 @@ post-patch: ${WRKSRC}/CMakeLists.txt MASTERDIR= ${.CURDIR}/../tigervnc-server + .include "${MASTERDIR}/Makefile.common.mk"