From nobody Sun Jul 10 19:20:07 2022 X-Original-To: dev-commits-ports-branches@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 43A151CFF620; Sun, 10 Jul 2022 19:20:08 +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 4Lgxfw1b1Fz3hfC; Sun, 10 Jul 2022 19:20:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657480808; 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=ROwFNybQqhElgQgMPEvKWyY00HIOQmROuchUczW3mV0=; b=j3MoMtn2rsvnSoS/RHpLFLSKpPcdE0wuYkrebOHIGRyn2GhpJxwagVqk4WOrklaCXhMqOu RsX1J+/dPGJwL7E7xvn2ngHhTuh+X0MAa4ngUmYLwsFflwKmb5451AQahmpJ8SRpoa+sJH MHX6KvqJYyMcvN+VDwm1U0yMpfamwQBYzWRloICW0B4WaTIBvYtndxPVnXuGwtLC5cGhCD 2c3YtXvM1NJX5PQ1l3Q6ye2bFSrisd2EIfF7L5Op7eXHRVhKk7D1FyKef1VsvJR71oF+oT CnOIUtMB9QrxsFyPS0h+Dl6m57WT2AyXHS6Ll2Dux7LYRM5CV9P1HocojIhvvw== 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 4Lgxfw0j64zbw1; Sun, 10 Jul 2022 19:20:08 +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 26AJK8ZD099681; Sun, 10 Jul 2022 19:20:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26AJK7gH099678; Sun, 10 Jul 2022 19:20:07 GMT (envelope-from git) Date: Sun, 10 Jul 2022 19:20:07 GMT Message-Id: <202207101920.26AJK7gH099678@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Dima Panov Subject: git: 9d7de4c8cd4d - 2022Q3 - graphics/gegl: fix build on armv7 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2022Q3 X-Git-Reftype: branch X-Git-Commit: 9d7de4c8cd4d513c99c23e2c2c900823bbe054ac Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657480808; 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=ROwFNybQqhElgQgMPEvKWyY00HIOQmROuchUczW3mV0=; b=Jumm8EVG4KfJKD/FgM+Uqgj0ASTSVrYB8wCou+5/YA7esTRM/oGCE1I+Cea+dkyJuVpO4D 6LhyVR7n8NNIaBvwlbPnM23m1SzCEzfXhs2rYWvmq4TdnBXC/DWZdk4825vgS5n9IkX8Xv wvoPzfvmEqZMVCgl3NV25V+64/0q6N3N3IDG41abfMBcdplHkh8u+lgMaUK37JQBF7f7io /UJvP+STBiVGf8OMElk62tv2aVez/2fbqC1ABOfPkxVTHgRUue6cerMfCxZjyppWkSCuyf b00gykYkP/pVrHZ0gCAS6iJVcWBQ9+tyIGOqL065NTQI79WzHAu+getqnsdjhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657480808; a=rsa-sha256; cv=none; b=fvFynALRQ5kODaBlg9Yb4nwrC2mfKt6bb7gn0yn+EGEfruePrS+QTLPBsYn6DZhLwE47Mg 8sLvMEVboipy6OL9/neGrSvVzAY8+6QdIKSwe3CbD4h5XSwCMPwIfCZqTGh+8x298Yvftc 0VGHCJwuNn1sz2/ol81SXUhseAiaZEDavfohWltdjtpzND6T2N/smLGhZ9K9WB4prAafdF rODUCZJamMYvrPKMJ6YOYoE/tAvB+s8yEDfvkoupcesoKdRZOCs5cKGJCT4+s3Qd99Rvgu G7BW7AGc8pUL3nvKE5HnqtCk5ESPCWgYH84duZtmV98yeZNJABH3x6WGPv3Ieg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=9d7de4c8cd4d513c99c23e2c2c900823bbe054ac commit 9d7de4c8cd4d513c99c23e2c2c900823bbe054ac Author: Dima Panov AuthorDate: 2022-07-10 19:15:24 +0000 Commit: Dima Panov CommitDate: 2022-07-10 19:19:56 +0000 graphics/gegl: fix build on armv7 PR: 265092 MFH: 2022Q3 (cherry picked from commit 057805f28af5664ae6286db371a5220de354cc9d) --- graphics/gegl/files/patch-gegl_gegl-cpuaccel.c | 41 ++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/graphics/gegl/files/patch-gegl_gegl-cpuaccel.c b/graphics/gegl/files/patch-gegl_gegl-cpuaccel.c new file mode 100644 index 000000000000..9566e2bfd1a1 --- /dev/null +++ b/graphics/gegl/files/patch-gegl_gegl-cpuaccel.c @@ -0,0 +1,41 @@ +--- gegl/gegl-cpuaccel.c.orig 2022-07-07 02:35:48 UTC ++++ gegl/gegl-cpuaccel.c +@@ -552,32 +552,18 @@ 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?GEGL_CPU_ACCEL_ARM_NEON:0; ++ unsigned long hwcap = 0; ++ ++ elf_aux_info(AT_HWCAP, &hwcap, sizeof hwcap); ++ ++ return hwcap & HWCAP_NEON ? GEGL_CPU_ACCEL_ARM_NEON : 0; + } + + #endif /* ARCH_ARM */