From nobody Thu Apr 13 06:42:11 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 4PxqkX3NSwz45b32; Thu, 13 Apr 2023 06:42: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 4PxqkX1r57z3kW6; Thu, 13 Apr 2023 06:42:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681368132; 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=8a/duB3Xte5cbfhhgvK3HiJ4/JUYakbqMJ1O+02dLXg=; b=JHb/0I9Vwu1CHLOoTOXEPRXKIs3HemnAEgQrV7WG6j8GRxVxWROCPB1FNceCZ2++DBOGEu 5UsD6zFjcovHfgeY+hpjvZVMhHc6Cey5mvdMrCkxg/KubQIsXbQnbvVuXJK0s2lXOBEU/n KAsj93WcdquGDNWCksFg3hUkKtXQOLzYKfnmRFuEQQMc3F+Zf65ce9t+rQKSHsgtf+omga VR9ZcMSpxPjODOlJVzIGXxsYMSdqlXecppXPj1t98NrBSMqYnYNNusQbsXkbYoqZMkshI9 lMIvAN4klCiVo76yzIR82/XuB2K6qnw2AvW7XyIbt0n8Ca7bBP4bnRvChHy2ZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681368132; 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=8a/duB3Xte5cbfhhgvK3HiJ4/JUYakbqMJ1O+02dLXg=; b=hrWJwd+bX1XmnnFp/qpnrzHF7VJn7nuTBzpvdCNIV0zIWviH6yurF2LNduDp6Xjn6nk9Ld 6pAc9nl6fy5nlzJiuPxTR6ZyKnGaKohpN3zfYRuXkUMORrD6hKG1AJ0W4NeZ4xa6ulGT4n Dztwz4qVJWuq11avPdojeZpuLfCLRrH23ihobUayE35nHgZreWJmo3emYGLwyCagjvyiNu sh7xa906aEASCKJO50AIp/zSXUiZUW4pn+11pV1KCYCHrgWQiMHb2zQbf45JUnEyCk3cp5 /ip77hT5g7qyWbvE4TTbJzP6grBBucJwMjqAKmK8adVPlBcOZ5c8ROjr87Ke0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681368132; a=rsa-sha256; cv=none; b=L3tb/qfpLPFj+HAApwhNiz+4aokpLmqX2/lxG23ixaH6yez8p//oQn8pcs8brMn5FLPCVT yI5I9UKpJNtDRykSIguAgIH2YFndRM8DAQJVqndiEATQilPz80XFBxwvoyzprDPbs+21NL V1ORkin3nDyiCHt52yib/KjQuWH4yfYDnsVckTByq/wbkOrZPGZj4ZFraPlQJZGVyywBQ/ ojuxSAbMIvY2IpYN25DuaTZYvuCCBhvdS0mq8OOYHIsNl1ChIS3X0YoOkr+zFFKiwprM4b L9V5YN6qh/YBsHBxlPZr48Ww5/Oyxr4yi/4619RTlIzCwbI8vLTmx6UjQ+uUbQ== 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 4PxqkX0xFqzXXH; Thu, 13 Apr 2023 06:42: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 33D6gBgb097524; Thu, 13 Apr 2023 06:42:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33D6gBBL097523; Thu, 13 Apr 2023 06:42:11 GMT (envelope-from git) Date: Thu, 13 Apr 2023 06:42:11 GMT Message-Id: <202304130642.33D6gBBL097523@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Emanuel Haupt Subject: git: 1158bb6541df - 2023Q2 - graphics/grafx2: Fix TTF font rendering 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: ehaupt X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q2 X-Git-Reftype: branch X-Git-Commit: 1158bb6541df5d3f68c5beff064e80257eef814f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by ehaupt: URL: https://cgit.FreeBSD.org/ports/commit/?id=1158bb6541df5d3f68c5beff064e80257eef814f commit 1158bb6541df5d3f68c5beff064e80257eef814f Author: Emanuel Haupt AuthorDate: 2023-04-13 06:37:02 +0000 Commit: Emanuel Haupt CommitDate: 2023-04-13 06:42:06 +0000 graphics/grafx2: Fix TTF font rendering PR: 270781 Reported by: tobias.rehbein@web.de (cherry picked from commit 3ad1498338bad3d6c51bff6984ca6493fe8d8da6) --- graphics/grafx2/Makefile | 1 + graphics/grafx2/files/patch-sdlscreen.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/graphics/grafx2/Makefile b/graphics/grafx2/Makefile index e953bfbb61dc..220dc2a2ab41 100644 --- a/graphics/grafx2/Makefile +++ b/graphics/grafx2/Makefile @@ -1,6 +1,7 @@ PORTNAME= grafx2 PORTVERSION= 2.8 DISTVERSIONSUFFIX= .3091-HEAD-src +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://pulkomandy.tk/projects/GrafX2/downloads/ \ LOCAL/ehaupt diff --git a/graphics/grafx2/files/patch-sdlscreen.c b/graphics/grafx2/files/patch-sdlscreen.c new file mode 100644 index 000000000000..6f75258a549a --- /dev/null +++ b/graphics/grafx2/files/patch-sdlscreen.c @@ -0,0 +1,29 @@ +--- sdlscreen.c.orig 2023-04-11 14:41:38 UTC ++++ sdlscreen.c +@@ -373,17 +373,11 @@ byte * Surface_to_bytefield(SDL_Surface *source, byte + byte *src; + byte *dest_ptr; + int y; +- int remainder; + + // Support seulement des images 256 couleurs + if (source->format->BytesPerPixel != 1) + return NULL; + +- if (source->w & 3) +- remainder=4-(source->w&3); +- else +- remainder=0; +- + if (dest==NULL) + dest=(byte *)malloc(source->w*source->h); + +@@ -393,7 +387,7 @@ byte * Surface_to_bytefield(SDL_Surface *source, byte + { + memcpy(dest_ptr, src,source->w); + dest_ptr += source->w; +- src += source->w + remainder; ++ src += source->pitch; + } + return dest; +