From nobody Thu Jun 30 21:45:36 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 00F3B8B529A; Thu, 30 Jun 2022 21:45:37 +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 4LYsMN6c3dz3KKW; Thu, 30 Jun 2022 21:45:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656625536; 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=tvjd7siSq3R5K9uh+78qRcmmBpT76RBD9K5a81yY6hU=; b=BPI6MpFIJ9uQK8K0ngQ0wFSVGImUlpkhin3n2XTIe1Ag7QaVbF3AjKOUmWD2RFUt9y12U2 AGdyl4ke1OiCAbjDq3hGHbxHbNan/yfvBWxfYZIkdZ4692CHNrk2K1L/YTj8ma93nm+X/L YzR271yCRKgcjaiB6L7IP80S6nvs9FkmVewkaDYKtdqAqZvGAt6vXssdSb3JNjRBBfGoh1 zvu7CGhbErBJW3IlhP3p3J+B1Zur1VGEmDqfUswXeaap7emWTETW5UwOLVyzQFlNrLuqfZ T9C4NB+VOF95xniTBOwKXIpjyqED4OTQQQXaii0F8n3/EzM5jcHLey07IhdZkw== 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 BEFA86AF3; Thu, 30 Jun 2022 21:45:36 +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 25ULjaRZ063624; Thu, 30 Jun 2022 21:45:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25ULja6I063623; Thu, 30 Jun 2022 21:45:36 GMT (envelope-from git) Date: Thu, 30 Jun 2022 21:45:36 GMT Message-Id: <202206302145.25ULja6I063623@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: bb0f1da1920c - main - x11/babl: fix build on armv7 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: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bb0f1da1920c245641a1f8a03dc17051631e66f0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656625536; 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=tvjd7siSq3R5K9uh+78qRcmmBpT76RBD9K5a81yY6hU=; b=IwoK5xwDWjTP9WPv3T7/8pjb+uHmNbv03dwcBrmLU5mkXeKK2j4GmRLTBuDohDfisYhSs9 irbQglm+NE850nnf2cSL+mcz/x2pDdfocbasq1xQTQbY0x1h2gxsOYCx1rCX2OVasmJNA+ CbsfP2UG44pf9nK/lGRH9XEuI8Hu7uhgeQR+HCpIOpGSmW5Di7EJ8ylftvz1naDtWSvZLa BLnNgKJ5jljgbwNsA+DdZFGDq/SQ7IUpLuFrZc3y4JYhLwAN6+SmHKPqNfPEG+F7t7T60Y V9ceiFcWaqtpWjLVsL1EbScAlHqAwJeABeCoEgnfylJClcehb6MSJaa6rg3HvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656625536; a=rsa-sha256; cv=none; b=FfoUYSbUF5Kzh/OZ5bXVQQJXZuke+MRo8wcLeebVb19KznaD7KIy6F4pAPJZelGmGjpVl8 ZgJpbVuFxpfW1c1p/xJXYVn31wJRIDUNyXy5EWimi8oyW1c6uAFOgZaDa0EuBpESDStBvl +qt+aToyuEkA3gbK5xTfA+8RQK06YI/UExsuu6UtNiEMd/OgorA/QWPIICPbwPfaHoEQOW P8ll1l0O7kLzfZZ6KxQf/xEWLBLzqdpB4erH9BuuL2p+YB/rLcVBMnS7kALmeZN59cbQRj smmOl8v+9DwQrsy2HwVCsplKhTjTnQZZoGcVH7uTsWYUhCXdZ5oX8LSBdlDcGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=bb0f1da1920c245641a1f8a03dc17051631e66f0 commit bb0f1da1920c245641a1f8a03dc17051631e66f0 Author: Dima Panov AuthorDate: 2022-06-30 21:44:03 +0000 Commit: Dima Panov CommitDate: 2022-06-30 21:45:19 +0000 x11/babl: fix build on armv7 PR: 264942 Submitted by: Robert Clausecker --- x11/babl/files/patch-babl_babl-cpuaccel.c | 43 +++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/x11/babl/files/patch-babl_babl-cpuaccel.c b/x11/babl/files/patch-babl_babl-cpuaccel.c new file mode 100644 index 000000000000..65adc87df47c --- /dev/null +++ b/x11/babl/files/patch-babl_babl-cpuaccel.c @@ -0,0 +1,43 @@ +--- babl/babl-cpuaccel.c.orig 2022-06-28 12:20:06 UTC ++++ babl/babl-cpuaccel.c +@@ -556,33 +556,19 @@ arch_accel (void) + #include + #include + #include ++#include + + #define HAVE_ACCEL 1 + + static guint32 + arch_accel (void) + { +- /* TODO : add or hardcode the other ways it can be on arm, where +- * this info comes from the system and not from running cpu +- * instructions +- */ +- int has_neon = 0; +- int fd = open ("/proc/self/auxv", O_RDONLY); +- Elf32_auxv_t auxv; +- if (fd >= 0) +- { +- while (read (fd, &auxv, sizeof (Elf32_auxv_t)) == sizeof (Elf32_auxv_t)) +- { +- if (auxv.a_type == AT_HWCAP) +- { +- if (auxv.a_un.a_val & 4096) +- has_neon = 1; +- } +- } +- close (fd); +- } +- return has_neon?BABL_CPU_ACCEL_ARM_NEON:0; +-} ++ unsigned long hwcap = 0; ++ ++ elf_aux_info(AT_HWCAP, &hwcap, sizeof hwcap); ++ ++ return hwcap & HWCAP_NEON ? BABL_CPU_ACCEL_ARM_NEON : 0; ++} + + #endif /* ARCH_ARM */ +