gegl: fix build on earmv7 and options-related PLIST issues

4 files changed, 31 insertions, 4 deletions

diff --git a/graphics/gegl/Makefile b/graphics/gegl/Makefile
index b95d878c53a..3889f0a52a2 100644
--- a/graphics/gegl/Makefile
+++ b/graphics/gegl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.102 2022/03/05 13:17:42 tnn Exp $
+# $NetBSD: Makefile,v 1.103 2022/03/24 00:02:25 tnn Exp $
 
 DISTNAME=	gegl-0.4.36
 CATEGORIES=	graphics
@@ -39,6 +39,11 @@ PLIST_VARS+=		x86_64
 PLIST.x86_64=		yes
 .endif
 
+PLIST_VARS+=		neon
+.if !empty(MACHINE_ARCH:Mearmv[67]*)
+PLIST.neon=		yes
+.endif
+
 # ../gegl/opencl/gegl-cl-color.c:32:10: fatal error: opencl/colors.cl.h: No such file or directory
 # race condition in meson?
 pre-build:
diff --git a/graphics/gegl/PLIST b/graphics/gegl/PLIST
index 24f58209e7f..ca72623b07d 100644
--- a/graphics/gegl/PLIST
+++ b/graphics/gegl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.36 2022/03/05 13:17:42 tnn Exp $
+@comment $NetBSD: PLIST,v 1.37 2022/03/24 00:02:25 tnn Exp $
 bin/gegl
 bin/gegl-imgcmp
 include/gegl-0.4/gegl-apply.h
@@ -87,9 +87,12 @@ include/gegl-0.4/sc/sc-sample.h
 lib/gegl-0.4/dropshadow2.json
 lib/gegl-0.4/exr-load.${SOEXT}
 lib/gegl-0.4/exr-save.${SOEXT}
+${PLIST.neon}lib/gegl-0.4/gegl-common-arm-neon.${SOEXT}
+${PLIST.neon}lib/gegl-0.4/gegl-common-cxx-arm-neon.${SOEXT}
 ${PLIST.x86_64}lib/gegl-0.4/gegl-common-cxx-x86_64-v2.${SOEXT}
 ${PLIST.x86_64}lib/gegl-0.4/gegl-common-cxx-x86_64-v3.${SOEXT}
 lib/gegl-0.4/gegl-common-cxx.${SOEXT}
+${PLIST.neon}lib/gegl-0.4/gegl-common-gpl3-arm-neon.${SOEXT}
 ${PLIST.x86_64}lib/gegl-0.4/gegl-common-gpl3-x86_64-v2.${SOEXT}
 ${PLIST.x86_64}lib/gegl-0.4/gegl-common-gpl3-x86_64-v3.${SOEXT}
 lib/gegl-0.4/gegl-common-gpl3.${SOEXT}
@@ -97,13 +100,16 @@ ${PLIST.x86_64}lib/gegl-0.4/gegl-common-x86_64-v2.${SOEXT}
 ${PLIST.x86_64}lib/gegl-0.4/gegl-common-x86_64-v3.${SOEXT}
 lib/gegl-0.4/gegl-common.${SOEXT}
 lib/gegl-0.4/gegl-core.${SOEXT}
+${PLIST.neon}lib/gegl-0.4/gegl-generated-arm-neon.${SOEXT}
 ${PLIST.x86_64}lib/gegl-0.4/gegl-generated-x86_64-v2.${SOEXT}
 ${PLIST.x86_64}lib/gegl-0.4/gegl-generated-x86_64-v3.${SOEXT}
 lib/gegl-0.4/gegl-generated.${SOEXT}
+${PLIST.neon}lib/gegl-0.4/gegl-transformops-arm-neon.${SOEXT}
 ${PLIST.x86_64}lib/gegl-0.4/gegl-transformops-x86_64-v2.${SOEXT}
 ${PLIST.x86_64}lib/gegl-0.4/gegl-transformops-x86_64-v3.${SOEXT}
 lib/gegl-0.4/gif-load.${SOEXT}
 lib/gegl-0.4/grey2.json
+${PLIST.jasper}lib/gegl-0.4/jp2-load.${SOEXT}
 lib/gegl-0.4/jpg-load.${SOEXT}
 lib/gegl-0.4/jpg-save.${SOEXT}
 lib/gegl-0.4/lcms-from-profile.${SOEXT}
@@ -121,7 +127,7 @@ lib/gegl-0.4/rgbe-save.${SOEXT}
 lib/gegl-0.4/sdl2-display.${SOEXT}
 lib/gegl-0.4/seamless-clone-compose.${SOEXT}
 lib/gegl-0.4/seamless-clone.${SOEXT}
-lib/gegl-0.4/svg-load.${SOEXT}
+${PLIST.svg}lib/gegl-0.4/svg-load.${SOEXT}
 lib/gegl-0.4/text.${SOEXT}
 lib/gegl-0.4/tiff-load.${SOEXT}
 lib/gegl-0.4/tiff-save.${SOEXT}
diff --git a/graphics/gegl/distinfo b/graphics/gegl/distinfo
index d047a1780fd..b1742758c14 100644
--- a/graphics/gegl/distinfo
+++ b/graphics/gegl/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.39 2022/02/26 07:54:16 wiz Exp $
+$NetBSD: distinfo,v 1.40 2022/03/24 00:02:25 tnn Exp $
 
 BLAKE2s (gegl-0.4.36.tar.xz) = 31f54ad7c5527a0b01b74e65709367701ca54e462c5a0d5691d3d3fd1e164902
 SHA512 (gegl-0.4.36.tar.xz) = 4d681091b15e7911229f86bf22381d62268451da57bba072bcb8ee3f4db79e2719dd7e70ab208c2c021e5353f42a9f88c18f62132512b18fe78ed6ad279660f8
 Size (gegl-0.4.36.tar.xz) = 5680876 bytes
 SHA1 (patch-gegl_gegl-config.c) = a8e1f5f5394a33be2bcdcb05ec7654d06f7ad4bc
+SHA1 (patch-gegl_gegl-cpuaccel.c) = f32ee8dfb8b89eb0aa117ac071cd35367b7841a5
 SHA1 (patch-operations_external_png-load.c) = 9a03e842597d6c069f7dfa0fa224dd487479b27f
 SHA1 (patch-operations_external_tiff-load.c) = 5be8581a1459db3007bb82c27c2770356314f71d
diff --git a/graphics/gegl/patches/patch-gegl_gegl-cpuaccel.c b/graphics/gegl/patches/patch-gegl_gegl-cpuaccel.c
new file mode 100644
index 00000000000..b20e2f0c654
--- /dev/null
+++ b/graphics/gegl/patches/patch-gegl_gegl-cpuaccel.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-gegl_gegl-cpuaccel.c,v 1.1 2022/03/24 00:02:25 tnn Exp $
+
+only use Linux-specific neon instruction set detection on Linux
+
+--- gegl/gegl-cpuaccel.c.orig	2022-02-21 22:29:17.000000000 +0000
++++ gegl/gegl-cpuaccel.c
+@@ -546,7 +546,7 @@ arch_accel (void)
+ #endif /* ARCH_PPC && USE_ALTIVEC */
+ 
+ 
+-#if defined(ARCH_ARM)
++#if defined(ARCH_ARM) && defined(__linux__)
+ 
+ #include <unistd.h>
+ #include <fcntl.h>