From nobody Sat Nov 18 16:47:05 2023 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 4SXfnP3Cqkz51Ksm; Sat, 18 Nov 2023 16:47:05 +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 4SXfnP2TvRz3R8c; Sat, 18 Nov 2023 16:47:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700326025; 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=8UIr4vvPM0IBO9uaQzJoqPDuok3HyIOS3J2jgkeNqnw=; b=fkhlMhNyNz1MguGbwygIhQwC9LocsDiTGyenA9I36E2ET6/UbweanJpau+ppuJtOcizHfL CeswhpmA9CV3REAzH9Ht6GlQ8JijdPU25UkxWiSen9d/L6PI783KQIj46/O25/fJF9FGeY 6JydkTJ3MK2G33Wcpav7U+ZQTHK0rTSg2xUZ8I+VvDhkLloayWu0CFV53SZMdOaYJG2m07 DsENryNhJcVuh3PdB6WLTVDpbDQZWrfAkqgzGSDKqwXlm2nGnQJiTeW7jfb+AFxyQlBc6I iIzt3/BnAlkJ4g4nPxqUU55LnRUlOn+3L906octhZ/hPZoRUMis0VUwcRGhnww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700326025; 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=8UIr4vvPM0IBO9uaQzJoqPDuok3HyIOS3J2jgkeNqnw=; b=eJfTHKISli98DeSGx2bqxWIbOImBBrmxGt+EOP2rr422q1nV3zAPN0YXNu3bGTdjbPF1jc bFR26C+NID1NbxNUryP6YzWNQUe3ksjLJD50oBS0fyL/CZIlnMS+ksR3KG5H/b1yKVNBY6 fILBPoT8kE7OgZrHUj6Sa7EvtBiHErj3zOqFJLfvYOCMB0lRyASB/T6qYZ/p9/uRtUDRpj BAH4Jc7Vh6111bDSlE1vMZO+4p4pJkRMbLoHXrgDqukHWOnCNLh5ru+ppWF7Rk6gihCh0Y Qz20ZYlP7JDpQQEzDtAVxK5bTH6TQ5UfVKW2dFjYkBGOiJ84Buo7AlxRGYqhsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700326025; a=rsa-sha256; cv=none; b=OVnt9ZkwzRxun4mZ0Po60RW7HVooaGq7wyuNQ1BfPW+iJZccuLLqfJFQXBMEUn0LnoXJ++ KTYB0IUvQGb3eBLuDS2MzgYGUnEtHqqlBFxYtz8fZqsfrVHI6BatsZY1hwmUAqi1WalcuH W0gSrnsdD6Z9Iw2TzlYRUzD/wvzACKmhCT1vh/8sBQ5T7VWrMFcbiipM93Ojj2gOnKgO6c tz3p8qeqD7e4RL4zr5PBLwK8l4E7YvbpL9gUnBy44GzT30pf8eM+fG2VsFbwNNXDm/xSLW gSL1AbGuKJqQaszb93tgqy5HH7CW43vWG5qRKioBwCGnq9oVFkDA38fKsz7CKA== 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 4SXfnP1XJNzZYK; Sat, 18 Nov 2023 16:47:05 +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 3AIGl5hE048115; Sat, 18 Nov 2023 16:47:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AIGl5Zr048113; Sat, 18 Nov 2023 16:47:05 GMT (envelope-from git) Date: Sat, 18 Nov 2023 16:47:05 GMT Message-Id: <202311181647.3AIGl5Zr048113@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: 3b7f6d468072 - main - emulators/vice: fix build on arm64 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 3b7f6d468072ef91a66d1ea7d940d5fd37c21bc4 Auto-Submitted: auto-generated The branch main has been updated by dinoex: URL: https://cgit.FreeBSD.org/ports/commit/?id=3b7f6d468072ef91a66d1ea7d940d5fd37c21bc4 commit 3b7f6d468072ef91a66d1ea7d940d5fd37c21bc4 Author: Dirk Meyer AuthorDate: 2023-11-18 16:45:12 +0000 Commit: Dirk Meyer CommitDate: 2023-11-18 16:46:59 +0000 emulators/vice: fix build on arm64 PR: 273785 --- emulators/vice/Makefile | 2 +- .../files/patch-src_arch_shared_iodrv_io-unix-access.c | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile index 13f589cfa7b0..0a2762397a1d 100644 --- a/emulators/vice/Makefile +++ b/emulators/vice/Makefile @@ -1,6 +1,6 @@ PORTNAME= vice PORTVERSION= 3.7.1 -PORTREVISION= 5 +PORTREVISION= 6 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 1fad3f0bf319..c77d704d0ec5 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 @@ -16,7 +16,7 @@ #ifdef UNIX_COMPILE #include -@@ -121,7 +130,11 @@ static uint8_t device_io_inb(uint16_t addr) +@@ -121,8 +130,12 @@ static uint8_t device_io_inb(uint16_t addr) #ifdef HAVE_INBV return inbv(addr); #else @@ -24,7 +24,18 @@ return inb(addr); +#else + return 0; -+#endif #endif ++#endif } + static void device_io_outb(uint16_t addr, uint8_t val) +@@ -130,7 +143,9 @@ static void device_io_outb(uint16_t addr, uint8_t val) + #ifdef HAVE_OUTBV + outbv(addr, val); + #else ++#ifdef HAVE_OUTB + outb(addr, val); ++#endif + #endif + } + #endif