From nobody Sun Nov 13 12:39:34 2022 X-Original-To: dev-commits-ports-all@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 4N9Bpb0Sgqz4fc8W; Sun, 13 Nov 2022 12:39:35 +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 4N9BpZ7440z4QNW; Sun, 13 Nov 2022 12:39:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668343175; 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=xgCSq3dK06VuGhU93H0yl42TVDv4nUXeQ1zFH8kOhDI=; b=rrstBdC0dgioOhQykEpgmC+r2jn0dcm1EhHaRT2K5VOHh9QPZW5JR6oLZA4sCh8skt2usC IMCURh+4/NPEeYbhmHuXwJzImzSjxr6W/uuvLNwqX8/x8QY+tEt/ol3JXrjoZJTpy9/IUc TfLaVh7NGr1Y7CV4UMgaS3NvmSNG/VTkNgjgYgMBeMyo1beZCj2PIa4UGp4U6y0yqv5pXX /erNDDUOTYwf5+AjILmKLW6VCKIm7JDu89yjS+PJeUKSIhScCp7WV9jctZtiPLNydBIygc ogCJFiICPaebfYpSPhgDK6CXMVaaBSbzwfMgNaFoAXjts9qaA1H+/dGjqEj+TQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668343175; 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=xgCSq3dK06VuGhU93H0yl42TVDv4nUXeQ1zFH8kOhDI=; b=qq0dvhEOXSdBXY3iqe6xorqMnzLkjsbCAfy/rwh9C6If7UOpwtlzS3Xbge8j7Wy0u8XaZl OLw03qYiAMcCn2PShwgciuzHXuhSq4oDOrM5F9cj5PbcL2rVSYaUI/dtpFHSalfsC3C7n6 0hBU3fNXfWMVH09pRuQuorbb6snMHN/+IobWOiCaid2nUsZ/9XJuz6c85112lzI0F3jiL7 /hnC+/JJjtBzQWMFzRXWxlsExySXeS1cnJUY982jtvj5ToY3bxgmzPIST8cywuKq3qkl6x HtxLq/U+/GGsR44AG3Z5v16LQXqN81iCG06AkeB8elf607xwcads7zQ3TKYTww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668343175; a=rsa-sha256; cv=none; b=eyBgdJ4MfwQ/GtnoE+q2+MUSfwAzNJKxyG2+w9KnlRDuQF7dvvUc+OrciULEX1Ahfpw+Qv W8xYIJ6csfQgXm9LJHVLa6e/LIBPXpjV6gAGRjBjA4EeZIXscfTr6/HvPbIaTJKLuS5/Eb KWAOiQWsI5zcvs2uuKQI1m4yupa0u8WiKe/Er0FXo4W/XH9EQ+bwKtdpIvz4ueZ+nYEGwE cBKEFHzVuwxv/AypU2wYfNg60PwO0tliyN9DN8lgdv2p9Y0LjHb+GkAXPZ3bgaMkH1LokM 8JLB2JtYv6sEgMohItFEp6OEUqH2jvNU51m+lUiAa9ejA8mWxQ91TjnrW61LWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4N9BpZ68J0z131l; Sun, 13 Nov 2022 12:39:34 +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 2ADCdYOo094410; Sun, 13 Nov 2022 12:39:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ADCdYBh094409; Sun, 13 Nov 2022 12:39:34 GMT (envelope-from git) Date: Sun, 13 Nov 2022 12:39:34 GMT Message-Id: <202211131239.2ADCdYBh094409@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Juraj Lutter Subject: git: 96ca1951b9af - 2022Q4 - graphics/libemf: fix build on riscv64 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: otis X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q4 X-Git-Reftype: branch X-Git-Commit: 96ca1951b9af07aea6c84f36eb36284b16282a0b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q4 has been updated by otis: URL: https://cgit.FreeBSD.org/ports/commit/?id=96ca1951b9af07aea6c84f36eb36284b16282a0b commit 96ca1951b9af07aea6c84f36eb36284b16282a0b Author: Robert Clausecker AuthorDate: 2022-11-11 20:49:16 +0000 Commit: Juraj Lutter CommitDate: 2022-11-13 12:39:13 +0000 graphics/libemf: fix build on riscv64 Add missing RISC-V specific bits to winnt.h to make the build succeed. These bits are custom written stubs. PR: 267395 Approved by: maintainer timeout (cherry picked from commit 2ff55486c6332a41e6ce8ebd9fcee56d467a012e) --- graphics/libemf/Makefile | 2 - .../libemf/files/patch-include_libEMF_wine_winnt.h | 85 ++++++++++++++++++++++ 2 files changed, 85 insertions(+), 2 deletions(-) diff --git a/graphics/libemf/Makefile b/graphics/libemf/Makefile index 8548082ed7a5..acc1b9079707 100644 --- a/graphics/libemf/Makefile +++ b/graphics/libemf/Makefile @@ -10,8 +10,6 @@ WWW= http://libemf.sourceforge.net/ LICENSE= LGPL21 -BROKEN_riscv64= fails to build: ../include/libEMF/wine/winnt.h:77:3: Unknown CPU architecture - OPTIONS_DEFINE= DOCS USES= cpe libtool diff --git a/graphics/libemf/files/patch-include_libEMF_wine_winnt.h b/graphics/libemf/files/patch-include_libEMF_wine_winnt.h new file mode 100644 index 000000000000..66804ae95911 --- /dev/null +++ b/graphics/libemf/files/patch-include_libEMF_wine_winnt.h @@ -0,0 +1,85 @@ +--- include/libEMF/wine/winnt.h.orig 2022-10-27 16:15:39 UTC ++++ include/libEMF/wine/winnt.h +@@ -69,6 +69,10 @@ + # define WORDS_BIGENDIAN + # define BITFIELDS_BIGENDIAN + # undef ALLOW_UNALIGNED_ACCESS ++#elif defined(__riscv) ++# undef WORDS_BIGENDIAN ++# undef BITFIELDS_BIGENDIAN ++# define ALLOW_UNALIGNED_ACCESS + #elif !defined(RC_INVOKED) + # error Unknown CPU architecture! + #endif +@@ -1581,6 +1585,71 @@ typedef struct _CONTEXT { + } CONTEXT; + + #endif /* __e2k__ */ ++ ++#if __riscv_xlen == 64 ++/* ++ * FIXME: ++ * ++ * There is not yet an official CONTEXT structure defined for ++ * RV64, so I just made one up. ++ * ++ */ ++ ++#define CONTEXT_RV64 0x4000000 ++#define CONTEXT_CONTROL (CONTEXT_RV64 | 0x00000001) ++#define CONTEXT_INTEGER (CONTEXT_RV64 | 0x00000002) ++#define CONTEXT_FLOATING_POINT (CONTEXT_RV64 | 0x00000004) ++ ++#define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_FLOATING_POINT) ++ ++#define EXCEPTION_READ_FAULT 0 ++#define EXCEPTION_WRITE_FAULT 1 ++#define EXCEPTION_EXECUTE_FAULT 8 ++ ++typedef struct _CONTEXT { ++ ULONG ContextFlags; ++ ++ /* This section is specified/returned if the ContextFlags word contains ++ the flag CONTEXT_INTEGER. */ ++ ULONGLONG R1; ++ ULONGLONG R2; ++ ULONGLONG R3; ++ ULONGLONG R4; ++ ULONGLONG R5; ++ ULONGLONG R6; ++ ULONGLONG R7; ++ ULONGLONG R8; ++ ULONGLONG R9; ++ ULONGLONG R10; ++ ULONGLONG R12; ++ ULONGLONG R13; ++ ULONGLONG R14; ++ ULONGLONG R15; ++ ULONGLONG R16; ++ ULONGLONG R17; ++ ULONGLONG R18; ++ ULONGLONG R19; ++ ULONGLONG R20; ++ ULONGLONG R21; ++ ULONGLONG R22; ++ ULONGLONG R23; ++ ULONGLONG R24; ++ ULONGLONG R25; ++ ULONGLONG R26; ++ ULONGLONG R27; ++ ULONGLONG R28; ++ ULONGLONG R29; ++ ULONGLONG R30; ++ ULONGLONG R31; ++ ++ /* These are selected by CONTEXT_CONTROL */ ++ ULONGLONG Pc; ++ ++ /* These are selected by CONTEXT_FLOATING_POINT */ ++ ++} CONTEXT; ++ ++#endif /* __riscv */ + + #if !defined(CONTEXT_FULL) && !defined(RC_INVOKED) + #error You need to define a CONTEXT for your CPU