Attachment 235126 Details for Bug 265092 – graphics/gegl: fix build on armv7

[patch] graphics/gegl: fix build on armv7

0001-graphics-gegl-fix-build-on-armv7.patch (text/plain), 1.83 KB, created by Robert Clausecker on 2022-07-08 13:52:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Clausecker

Created: 2022-07-08 13:52:45 UTC

Size: 1.83 KB

patch

obsolete

>From 132e052a959429bd844d5e1a485bfffd91ee6f00 Mon Sep 17 00:00:00 2001
>From: Robert Clausecker <fuz@fuz.su>
>Date: Fri, 8 Jul 2022 15:49:56 +0200
>Subject: [PATCH] graphics/gegl: fix build on armv7
>
>This applies the same patch that was previously applied to x11/babl
>to adapt NEON detection on armv6/armv7 to FreeBSD's interfaces.
>
>See also:	PR #264942
>See also:	bb0f1da1920c245641a1f8a03dc17051631e66f0
>---
> .../gegl/files/patch-gegl_gegl-cpuaccel.c     | 41 +++++++++++++++++++
> 1 file changed, 41 insertions(+)
> create mode 100644 graphics/gegl/files/patch-gegl_gegl-cpuaccel.c
>
>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 <fcntl.h>
>+ #include <string.h>
>+ #include <elf.h>
>++#include <sys/auxv.h>
>+ 
>+ #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  */
>-- 
>2.35.2
>

Flags:

fuz: maintainer-approval? (gnome)

Actions: View | Diff

Attachments on bug 265092: 235126