From nobody Sun Jul 10 19:16:28 2022 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 576DB1CFEBEC; Sun, 10 Jul 2022 19:16:28 +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 4LgxZh26s3z3h7W; Sun, 10 Jul 2022 19:16:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657480588; 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=oP8lSJP90zZLw0J6PocmBhyptCC07vSd4HVzbTNpi90=; b=tsUpyr7wSBa1u8rTdvDFQZexOjt4fewRe6vpHrnsnkeb/CekvMwH6/N0uKSFd7sCl2WYmH U4DzaMaRS3qNIIdCHDHejFlf9ULV06CIpcG2UKbCGyCIbCn1tWEaTpjfqCaHeYrZHbMAHj u05+r1sjBQsJG8BScobMCZ8M5HYpKHT+n2R4sqF6jPJuBmoAAS6ayGg0W+Ryz+hfQwKCbG 5cszXJuiYf9gHhikvz9P6UJ02/BRsnoUZxxqdzRaJYNmtjBBpvyvNtYxHpeD+jRYiPRAG9 87SvDa2Il/4ToYeUrbleUB4C8chx5oX4CvN4ryRG9FDhopmmMnTP423ogwUNiA== 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 4LgxZh19fBzbnX; Sun, 10 Jul 2022 19:16:28 +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 26AJGSDW096482; Sun, 10 Jul 2022 19:16:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26AJGSmQ096481; Sun, 10 Jul 2022 19:16:28 GMT (envelope-from git) Date: Sun, 10 Jul 2022 19:16:28 GMT Message-Id: <202207101916.26AJGSmQ096481@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: 057805f28af5 - main - graphics/gegl: fix build on armv7 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: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 057805f28af5664ae6286db371a5220de354cc9d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657480588; 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=oP8lSJP90zZLw0J6PocmBhyptCC07vSd4HVzbTNpi90=; b=WoBxB+8x2NYAsoTGboO5STN/d2A7QMaWf+j12M3eLMiNkBjXR2IiGyVHHbBVmIDmiViuVW f5IZYmQhX7oChmHCstu2YTcX8H2/Z8kJSpho4Hrb1tOnTURPSErDJyBpyM+kTQHB+I5yCd V/SYrmI3/4H8DNAbnFhgnl4Yjsuv1T/1SPM2BT5YAij+nCFciYaL+A+AL9l2ktaQ15wJ1A EHKrLUySEUvqXlszrjb/O6r2GV0kCRKpakOINBjRATpRcqdZTKxNCiA0qSdi3bII8SevMa 02UBku2O1nLHTEnKQIiw3HTx4Y+2A2MpntYYPhypWu1oEQrMUAKgmBYHqILVeA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657480588; a=rsa-sha256; cv=none; b=TUEnUM4wRLo2m/HUFVEOAgX5C7/TQll81kPxce3HkTAR+ZuWJiKjebOXRWX5f4tBeBiPl5 NQa7xrxExtqYTSZRZvFPOQRRDoKcgd3SB1YzJL1xeAghINcdLYuGMD3uz6eT2NNmLh0HyV C5DtKc+xSMlqpVViRmqiEqjgg7WuvL7SyLzWmpT0Ovh5zzhc1c1RXs90SCZaqorpI5uvSK nDhs+ZGAPOOocmJHM83d0gnmWK6O2WkQyLP7wia4Ok9plfHZBG256cXH5Yz0cwrgsnKP+o K1sKlWnsFG+qJoenYE1XdD8AyrGFU2kQoIz4F4QA/R8sqsRtoh4LUlPAGyVkRw== 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=057805f28af5664ae6286db371a5220de354cc9d commit 057805f28af5664ae6286db371a5220de354cc9d Author: Dima Panov AuthorDate: 2022-07-10 19:15:24 +0000 Commit: Dima Panov CommitDate: 2022-07-10 19:15:24 +0000 graphics/gegl: fix build on armv7 PR: 265092 MFH: 2022Q3 --- 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 */