From nobody Mon Aug 15 15:10:14 2022 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 4M5yPy4Fqhz4ZDDp; Mon, 15 Aug 2022 15:10:14 +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 4M5yPy3lmdz3lVC; Mon, 15 Aug 2022 15:10:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660576214; 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=v6hij7p/78mrjBKSqkL3hfTmZ67QBfHFtXD/qKG4FwI=; b=KBzvy92h7iY5M2htIOl9eXLyfrw4LlBC7axLxpMB13Xj9fQg6oOCAuEylTBDnSF7DTLxgj 4r2/zpfQIx8X5+1165bM3IY0+2tEJmHzspwNA+wMaMfV502jakZAmOyG8BwddioMaTPm4R vBVcPI18ywIMGi48Qx8/rY+G8J9uAZIrFYbLpN/Xb73L6kA2DkkUKqvH0RN2H+MrnL49S6 H5jCYE18ipwwox2INjbvxNps3OBaP/1QwnXDhno162ZWW9NkHVZbLvnhlgks1jJ0Ryn0Np LWDkH7hT6FRTUZpMe1ztgOVML/W9FeH+q47Xe8hszhoJRGj+ENc0D7uzdmF4Rw== 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 4M5yPy2gqpzZ0M; Mon, 15 Aug 2022 15:10:14 +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 27FFAE2O019195; Mon, 15 Aug 2022 15:10:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27FFAEmC019189; Mon, 15 Aug 2022 15:10:14 GMT (envelope-from git) Date: Mon, 15 Aug 2022 15:10:14 GMT Message-Id: <202208151510.27FFAEmC019189@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikael Urankar Subject: git: 39d767fa0b00 - main - x11-servers/xorg-server: Fix build on aarch64 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: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 39d767fa0b00ed86b29b388d946f3934d9cd6460 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660576214; 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=v6hij7p/78mrjBKSqkL3hfTmZ67QBfHFtXD/qKG4FwI=; b=MrPwPHsrlSPgekJO/qwDdBf0HiZ+7hwNX4ZYLOgClm54X+taLkaEoIgP3CV2hOpiQt9VI2 tcPg/QR32y7g2y7toWIKP8dZOPluwOMkCtDmO5/MhJyxu4idpFwmLQq6KgHSHYunl+fp/S 5p3l1Ecdt8HYpX44ddK8IUxc9mUyMWVEbAsiwM/wullu9pQp4bMoBj3lgmXYBk7OhwXKb0 0nQ8h6/Mxf2f9jQr1ChzxQvwRglPN1oyVLd1HAp0CizILciVg80FGjXq5gyxENm1bhtJxv j0VuVl45MgK91Qlaw19L8Xx5AiqzyyKElJvvPtkFN+pc0qbRVTUyuFnCcEqVJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660576214; a=rsa-sha256; cv=none; b=UJt8PpMMyXnbQEacim0Jlotsd8fyXQmk7EpbMt9kcKC6aJaFtf+gD7KjsyA4irXkWE2c89 chL5nqZ/c9ouyvwcmdQpgbXsw7T5oCYlOQqdgdBR9HrX12cshBwv3dXpxVXfXQjorJJVWH /xhdjeKYzZGbvRM0ZcCtfhKc44mJSYw8tdK1uNY91gvWKZ5FQlF9pkJIpduTLk2kL1i287 G3bzek54gfVHiAtXUpsxYzNGdqUh1ihfFtorwV16WxVZSUzCt+xz6LmbtYFAcUKnRs9/Cq MubQB9lJVlzcRMUyTGICq6KOF66To5Aj7aTDHIoAqk601/BHXIpjXHLhVKR/DQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=39d767fa0b00ed86b29b388d946f3934d9cd6460 commit 39d767fa0b00ed86b29b388d946f3934d9cd6460 Author: John Kennedy AuthorDate: 2022-08-15 13:49:33 +0000 Commit: Mikael Urankar CommitDate: 2022-08-15 15:10:00 +0000 x11-servers/xorg-server: Fix build on aarch64 Same fix as https://reviews.freebsd.org/D8465 PR: 265691 Approved by: portmgr (build fix blanket) --- .../xorg-server/files/patch-hw_xfree86_os-support_meson.build | 11 +++++++---- x11-servers/xorg-server/files/patch-include_meson.build | 11 +++++++++++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_meson.build b/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_meson.build index 12373890385d..5051539d3aeb 100644 --- a/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_meson.build +++ b/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_meson.build @@ -1,8 +1,11 @@ ---- hw/xfree86/os-support/meson.build.orig 2022-07-12 13:27:57 UTC -+++ hw/xfree86/os-support/meson.build -@@ -113,7 +113,7 @@ elif host_machine.system().endswith('bsd') +--- hw/xfree86/os-support/meson.build.orig 2022-07-12 13:27:57.000000000 +0000 ++++ hw/xfree86/os-support/meson.build 2022-08-08 23:22:53.349353000 +0000 +@@ -111,9 +111,9 @@ + if host_machine.system() == 'netbsd' or host_machine.system() == 'openbsd' + os_dep += cc.find_library('i386') endif - elif host_machine.cpu_family() == 'arm' +- elif host_machine.cpu_family() == 'arm' ++ elif host_machine.cpu_family() == 'arm' or host_machine.cpu_family() == 'aarch64' srcs_xorg_os_support += 'bsd/arm_video.c' - elif host_machine.cpu_family() == 'powerpc' + elif host_machine.cpu_family() == 'ppc' or host_machine.cpu_family() == 'ppc64' diff --git a/x11-servers/xorg-server/files/patch-include_meson.build b/x11-servers/xorg-server/files/patch-include_meson.build new file mode 100644 index 000000000000..a873f548052d --- /dev/null +++ b/x11-servers/xorg-server/files/patch-include_meson.build @@ -0,0 +1,11 @@ +--- include/meson.build.orig 2022-07-12 13:27:57.000000000 +0000 ++++ include/meson.build 2022-08-09 00:48:12.688887000 +0000 +@@ -377,7 +377,7 @@ + xorg_data.set('HAVE_SYS_VT_H', cc.has_header('sys/vt.h') ? '1' : false) + + if host_machine.system() == 'freebsd' or host_machine.system() == 'dragonfly' +- if host_machine.cpu_family() == 'x86' or host_machine.cpu_family() == 'x86_64' ++ if host_machine.cpu_family() == 'x86' or host_machine.cpu_family() == 'x86_64' or host_machine.cpu_family() == 'aarch64' + xorg_data.set('USE_DEV_IO', '1') + endif + elif host_machine.system() == 'netbsd'