From nobody Mon Oct 9 09:02:35 2023 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 4S3tMv3swHz4x6LN; Mon, 9 Oct 2023 09:02: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 4S3tMv3Rrdz3VFK; Mon, 9 Oct 2023 09:02:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696842155; 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=OYEQb9ixenOSG0EwtG3bmEKkhfncBTNP+Q72f5cE0yE=; b=UirhSTSsejg9dx+hqpw/hKLihFxgOVuhvCIFsfwJtldDaGSPY6QJcIqi5tb6BLPLfLczBC Jm0D47eca66YWmqTy8GRY1AJnc/vewhN/EPFn6ThB5/6pRmAtKFUHEVARuZ5KcXyw3MT1m O8vaZ7EF9nmnSZGvdZofWynPm2KV5jiCFP0AmdU8/QNn3i8/PLeIUuosaB5cFdNemrZleM GtkbD96LFd7Dhm05LzjQzFlMd7la/NfegM0PUAsPZRH5xEB3kNQkRvcBqLQ7jocHnNVlxZ 2vUKDX3cXvdtnQwTxq/91GZSKkqiVR7BhytVB1IvvWMxrK8Ufkd+AcVpdF/8hg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696842155; a=rsa-sha256; cv=none; b=leNFEc1xfn7pShYa4hEoAbELVcoO9Asn1utg6uD8NHo1idvdsqFVkUaxcl9R6GrRpm1ccS 69KyTrUgoi4NLqjRhxg13F60YG1sqRT74wrN38OhB8Clutz9w69YODIF1Wqi0XvHZXZCwP EMu8JGzp4ZHhEZw1kuLIlBs+iTNBJHS+PaM55JhA9kr8b+uDudSqZDhQNzCY0iJMHKcpE1 acXh36+lbE53iglXV2hLtLqiWv8RcqMFLCx37weOTh6iiMzlHh51VHJws0VM19td4aJXnR I7FkGABmqb8tb8oJQlpe4tcQNq0PCWUyW3zQixiQmRZInUzaqoSPhGaZvQqeOQ== 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=1696842155; 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=OYEQb9ixenOSG0EwtG3bmEKkhfncBTNP+Q72f5cE0yE=; b=AImVr8FVGYSVuoAglcEeF292r3o77Pg0dWD/GOjeoGVG+TmNXfl9F3LVkYJ1VbeWmjhmiq qIMF5dWTnEV818gpo5VDD6lcBDiaDegDNl/AOjCYQFBnhZIkiVgrepK+QwYHeFg+78cn4K z9arng7i9n7oi1AePhnufe2hQ6NZqgKUiXTf06UzuOhy1hn4GS573W0zigv+InxhbNh7Rn XUM5KWLUuwS/I6ncqEhVgmRuhRpO3ZcoqiiWuuCAjkcNi4pImh7PVphoba7v1WczePcsPT ZoTiJNYvXLc2r35OVS4HUchhUV1q92hCTGG8UbtB0GWzYC4syIGRbfMGcakjsQ== 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 4S3tMv2YD3zqLQ; Mon, 9 Oct 2023 09:02:35 +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 39992ZKC057251; Mon, 9 Oct 2023 09:02:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39992Zh7057248; Mon, 9 Oct 2023 09:02:35 GMT (envelope-from git) Date: Mon, 9 Oct 2023 09:02:35 GMT Message-Id: <202310090902.39992Zh7057248@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dirk Meyer Subject: git: 0b4ed72cbba6 - main - emulators/vice: fix build on arm64 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: dinoex X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0b4ed72cbba69b466a1356ace2c4302de5b57bc6 Auto-Submitted: auto-generated The branch main has been updated by dinoex: URL: https://cgit.FreeBSD.org/ports/commit/?id=0b4ed72cbba69b466a1356ace2c4302de5b57bc6 commit 0b4ed72cbba69b466a1356ace2c4302de5b57bc6 Author: Dirk Meyer AuthorDate: 2023-10-09 09:02:14 +0000 Commit: Dirk Meyer CommitDate: 2023-10-09 09:02:14 +0000 emulators/vice: fix build on arm64 PR: 273785 --- emulators/vice/Makefile | 2 +- .../files/patch-src_arch_shared_iodrv_io-unix-access.c | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile index 0af755eaf558..13f589cfa7b0 100644 --- a/emulators/vice/Makefile +++ b/emulators/vice/Makefile @@ -1,6 +1,6 @@ PORTNAME= vice PORTVERSION= 3.7.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= emulators MASTER_SITES= SF/vice-emu/releases diff --git a/emulators/vice/files/patch-src_arch_shared_iodrv_io-unix-access.c b/emulators/vice/files/patch-src_arch_shared_iodrv_io-unix-access.c index c360674300c3..1fad3f0bf319 100644 --- a/emulators/vice/files/patch-src_arch_shared_iodrv_io-unix-access.c +++ b/emulators/vice/files/patch-src_arch_shared_iodrv_io-unix-access.c @@ -1,4 +1,4 @@ ---- src/arch/shared/iodrv/io-unix-access.c.orig 2022-12-24 19:44:57 UTC +--- src/arch/shared/iodrv/io-unix-access.c.orig 2022-12-27 23:56:56 UTC +++ src/arch/shared/iodrv/io-unix-access.c @@ -26,6 +26,15 @@ @@ -16,3 +16,15 @@ #ifdef UNIX_COMPILE #include +@@ -121,7 +130,11 @@ static uint8_t device_io_inb(uint16_t addr) + #ifdef HAVE_INBV + return inbv(addr); + #else ++#ifdef HAVE_INB + return inb(addr); ++#else ++ return 0; ++#endif + #endif + } +