Thu Mar 24 00:02:25 2022 UTC ()
gegl: fix build on earmv7 and options-related PLIST issues


(tnn)
diff -r1.102 -r1.103 pkgsrc/graphics/gegl/Makefile
diff -r1.36 -r1.37 pkgsrc/graphics/gegl/PLIST
diff -r1.39 -r1.40 pkgsrc/graphics/gegl/distinfo
diff -r0 -r1.1 pkgsrc/graphics/gegl/patches/patch-gegl_gegl-cpuaccel.c
cvs diff -r1.102 -r1.103 pkgsrc/graphics/gegl/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/gegl/Makefile 2022/03/05 13:17:42 1.102
+++ pkgsrc/graphics/gegl/Makefile 2022/03/24 00:02:25 1.103
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.102 2022/03/05 13:17:42 tnn Exp $ 1# $NetBSD: Makefile,v 1.103 2022/03/24 00:02:25 tnn Exp $
2 2
3DISTNAME= gegl-0.4.36 3DISTNAME= gegl-0.4.36
4CATEGORIES= graphics 4CATEGORIES= graphics
5MASTER_SITES= https://download.gimp.org/pub/gegl/${PKGVERSION_NOREV:R}/ 5MASTER_SITES= https://download.gimp.org/pub/gegl/${PKGVERSION_NOREV:R}/
6EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
7 7
8MAINTAINER= adam@NetBSD.org 8MAINTAINER= adam@NetBSD.org
9HOMEPAGE= http://gegl.org/ 9HOMEPAGE= http://gegl.org/
10COMMENT= Graph based image processing framework 10COMMENT= Graph based image processing framework
11LICENSE= gnu-gpl-v3 11LICENSE= gnu-gpl-v3
12 12
13MESON_ARGS+= -Dintrospection=false 13MESON_ARGS+= -Dintrospection=false
14MESON_ARGS+= -Dlibv4l=disabled 14MESON_ARGS+= -Dlibv4l=disabled
@@ -29,26 +29,31 @@ PYTHON_FOR_BUILD_ONLY= tool @@ -29,26 +29,31 @@ PYTHON_FOR_BUILD_ONLY= tool
29 29
30.include "../../mk/bsd.prefs.mk" 30.include "../../mk/bsd.prefs.mk"
31.if ${OPSYS} == "Darwin" 31.if ${OPSYS} == "Darwin"
32PLIST_SUBST+= SOEXT="dylib" 32PLIST_SUBST+= SOEXT="dylib"
33.else 33.else
34PLIST_SUBST+= SOEXT="so" 34PLIST_SUBST+= SOEXT="so"
35.endif 35.endif
36 36
37PLIST_VARS+= x86_64 37PLIST_VARS+= x86_64
38.if ${MACHINE_ARCH} == "x86_64" 38.if ${MACHINE_ARCH} == "x86_64"
39PLIST.x86_64= yes 39PLIST.x86_64= yes
40.endif 40.endif
41 41
 42PLIST_VARS+= neon
 43.if !empty(MACHINE_ARCH:Mearmv[67]*)
 44PLIST.neon= yes
 45.endif
 46
42# ../gegl/opencl/gegl-cl-color.c:32:10: fatal error: opencl/colors.cl.h: No such file or directory 47# ../gegl/opencl/gegl-cl-color.c:32:10: fatal error: opencl/colors.cl.h: No such file or directory
43# race condition in meson? 48# race condition in meson?
44pre-build: 49pre-build:
45 cd ${WRKSRC}/opencl && for file in $$(ls -1 | grep '\.cl$$'); do \ 50 cd ${WRKSRC}/opencl && for file in $$(ls -1 | grep '\.cl$$'); do \
46 ${PYTHONBIN} cltostring.py "$$file" "$$file".h \ 51 ${PYTHONBIN} cltostring.py "$$file" "$$file".h \
47 ; done 52 ; done
48 53
49.include "options.mk" 54.include "options.mk"
50.include "../../devel/meson/build.mk" 55.include "../../devel/meson/build.mk"
51.include "../../devel/pango/buildlink3.mk" 56.include "../../devel/pango/buildlink3.mk"
52.include "../../devel/SDL2/buildlink3.mk" 57.include "../../devel/SDL2/buildlink3.mk"
53BUILDLINK_API_DEPENDS.babl+= babl>=0.1.90 58BUILDLINK_API_DEPENDS.babl+= babl>=0.1.90
54.include "../../graphics/babl/buildlink3.mk" 59.include "../../graphics/babl/buildlink3.mk"
cvs diff -r1.36 -r1.37 pkgsrc/graphics/gegl/PLIST (expand / switch to unified diff)

--- pkgsrc/graphics/gegl/PLIST 2022/03/05 13:17:42 1.36
+++ pkgsrc/graphics/gegl/PLIST 2022/03/24 00:02:25 1.37
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.36 2022/03/05 13:17:42 tnn Exp $ 1@comment $NetBSD: PLIST,v 1.37 2022/03/24 00:02:25 tnn Exp $
2bin/gegl 2bin/gegl
3bin/gegl-imgcmp 3bin/gegl-imgcmp
4include/gegl-0.4/gegl-apply.h 4include/gegl-0.4/gegl-apply.h
5include/gegl-0.4/gegl-audio-fragment.h 5include/gegl-0.4/gegl-audio-fragment.h
6include/gegl-0.4/gegl-buffer-backend.h 6include/gegl-0.4/gegl-buffer-backend.h
7include/gegl-0.4/gegl-buffer-enums.h 7include/gegl-0.4/gegl-buffer-enums.h
8include/gegl-0.4/gegl-buffer-iterator.h 8include/gegl-0.4/gegl-buffer-iterator.h
9include/gegl-0.4/gegl-buffer-matrix2.h 9include/gegl-0.4/gegl-buffer-matrix2.h
10include/gegl-0.4/gegl-buffer-swap.h 10include/gegl-0.4/gegl-buffer-swap.h
11include/gegl-0.4/gegl-buffer.h 11include/gegl-0.4/gegl-buffer.h
12include/gegl-0.4/gegl-color.h 12include/gegl-0.4/gegl-color.h
13include/gegl-0.4/gegl-cpuaccel.h 13include/gegl-0.4/gegl-cpuaccel.h
14include/gegl-0.4/gegl-curve.h 14include/gegl-0.4/gegl-curve.h
@@ -77,61 +77,67 @@ include/gegl-0.4/operation/gegl-operatio @@ -77,61 +77,67 @@ include/gegl-0.4/operation/gegl-operatio
77include/gegl-0.4/operation/gegl-operation-point-render.h 77include/gegl-0.4/operation/gegl-operation-point-render.h
78include/gegl-0.4/operation/gegl-operation-property-keys.h 78include/gegl-0.4/operation/gegl-operation-property-keys.h
79include/gegl-0.4/operation/gegl-operation-sink.h 79include/gegl-0.4/operation/gegl-operation-sink.h
80include/gegl-0.4/operation/gegl-operation-source.h 80include/gegl-0.4/operation/gegl-operation-source.h
81include/gegl-0.4/operation/gegl-operation-temporal.h 81include/gegl-0.4/operation/gegl-operation-temporal.h
82include/gegl-0.4/operation/gegl-operation.h 82include/gegl-0.4/operation/gegl-operation.h
83include/gegl-0.4/sc/sc-common.h 83include/gegl-0.4/sc/sc-common.h
84include/gegl-0.4/sc/sc-context.h 84include/gegl-0.4/sc/sc-context.h
85include/gegl-0.4/sc/sc-outline.h 85include/gegl-0.4/sc/sc-outline.h
86include/gegl-0.4/sc/sc-sample.h 86include/gegl-0.4/sc/sc-sample.h
87lib/gegl-0.4/dropshadow2.json 87lib/gegl-0.4/dropshadow2.json
88lib/gegl-0.4/exr-load.${SOEXT} 88lib/gegl-0.4/exr-load.${SOEXT}
89lib/gegl-0.4/exr-save.${SOEXT} 89lib/gegl-0.4/exr-save.${SOEXT}
 90${PLIST.neon}lib/gegl-0.4/gegl-common-arm-neon.${SOEXT}
 91${PLIST.neon}lib/gegl-0.4/gegl-common-cxx-arm-neon.${SOEXT}
90${PLIST.x86_64}lib/gegl-0.4/gegl-common-cxx-x86_64-v2.${SOEXT} 92${PLIST.x86_64}lib/gegl-0.4/gegl-common-cxx-x86_64-v2.${SOEXT}
91${PLIST.x86_64}lib/gegl-0.4/gegl-common-cxx-x86_64-v3.${SOEXT} 93${PLIST.x86_64}lib/gegl-0.4/gegl-common-cxx-x86_64-v3.${SOEXT}
92lib/gegl-0.4/gegl-common-cxx.${SOEXT} 94lib/gegl-0.4/gegl-common-cxx.${SOEXT}
 95${PLIST.neon}lib/gegl-0.4/gegl-common-gpl3-arm-neon.${SOEXT}
93${PLIST.x86_64}lib/gegl-0.4/gegl-common-gpl3-x86_64-v2.${SOEXT} 96${PLIST.x86_64}lib/gegl-0.4/gegl-common-gpl3-x86_64-v2.${SOEXT}
94${PLIST.x86_64}lib/gegl-0.4/gegl-common-gpl3-x86_64-v3.${SOEXT} 97${PLIST.x86_64}lib/gegl-0.4/gegl-common-gpl3-x86_64-v3.${SOEXT}
95lib/gegl-0.4/gegl-common-gpl3.${SOEXT} 98lib/gegl-0.4/gegl-common-gpl3.${SOEXT}
96${PLIST.x86_64}lib/gegl-0.4/gegl-common-x86_64-v2.${SOEXT} 99${PLIST.x86_64}lib/gegl-0.4/gegl-common-x86_64-v2.${SOEXT}
97${PLIST.x86_64}lib/gegl-0.4/gegl-common-x86_64-v3.${SOEXT} 100${PLIST.x86_64}lib/gegl-0.4/gegl-common-x86_64-v3.${SOEXT}
98lib/gegl-0.4/gegl-common.${SOEXT} 101lib/gegl-0.4/gegl-common.${SOEXT}
99lib/gegl-0.4/gegl-core.${SOEXT} 102lib/gegl-0.4/gegl-core.${SOEXT}
 103${PLIST.neon}lib/gegl-0.4/gegl-generated-arm-neon.${SOEXT}
100${PLIST.x86_64}lib/gegl-0.4/gegl-generated-x86_64-v2.${SOEXT} 104${PLIST.x86_64}lib/gegl-0.4/gegl-generated-x86_64-v2.${SOEXT}
101${PLIST.x86_64}lib/gegl-0.4/gegl-generated-x86_64-v3.${SOEXT} 105${PLIST.x86_64}lib/gegl-0.4/gegl-generated-x86_64-v3.${SOEXT}
102lib/gegl-0.4/gegl-generated.${SOEXT} 106lib/gegl-0.4/gegl-generated.${SOEXT}
 107${PLIST.neon}lib/gegl-0.4/gegl-transformops-arm-neon.${SOEXT}
103${PLIST.x86_64}lib/gegl-0.4/gegl-transformops-x86_64-v2.${SOEXT} 108${PLIST.x86_64}lib/gegl-0.4/gegl-transformops-x86_64-v2.${SOEXT}
104${PLIST.x86_64}lib/gegl-0.4/gegl-transformops-x86_64-v3.${SOEXT} 109${PLIST.x86_64}lib/gegl-0.4/gegl-transformops-x86_64-v3.${SOEXT}
105lib/gegl-0.4/gif-load.${SOEXT} 110lib/gegl-0.4/gif-load.${SOEXT}
106lib/gegl-0.4/grey2.json 111lib/gegl-0.4/grey2.json
 112${PLIST.jasper}lib/gegl-0.4/jp2-load.${SOEXT}
107lib/gegl-0.4/jpg-load.${SOEXT} 113lib/gegl-0.4/jpg-load.${SOEXT}
108lib/gegl-0.4/jpg-save.${SOEXT} 114lib/gegl-0.4/jpg-save.${SOEXT}
109lib/gegl-0.4/lcms-from-profile.${SOEXT} 115lib/gegl-0.4/lcms-from-profile.${SOEXT}
110lib/gegl-0.4/npd.${SOEXT} 116lib/gegl-0.4/npd.${SOEXT}
111lib/gegl-0.4/npy-save.${SOEXT} 117lib/gegl-0.4/npy-save.${SOEXT}
112lib/gegl-0.4/path.${SOEXT} 118lib/gegl-0.4/path.${SOEXT}
113lib/gegl-0.4/pixbuf-load.${SOEXT} 119lib/gegl-0.4/pixbuf-load.${SOEXT}
114lib/gegl-0.4/pixbuf-save.${SOEXT} 120lib/gegl-0.4/pixbuf-save.${SOEXT}
115lib/gegl-0.4/png-load.${SOEXT} 121lib/gegl-0.4/png-load.${SOEXT}
116lib/gegl-0.4/png-save.${SOEXT} 122lib/gegl-0.4/png-save.${SOEXT}
117lib/gegl-0.4/ppm-load.${SOEXT} 123lib/gegl-0.4/ppm-load.${SOEXT}
118lib/gegl-0.4/ppm-save.${SOEXT} 124lib/gegl-0.4/ppm-save.${SOEXT}
119lib/gegl-0.4/rgbe-load.${SOEXT} 125lib/gegl-0.4/rgbe-load.${SOEXT}
120lib/gegl-0.4/rgbe-save.${SOEXT} 126lib/gegl-0.4/rgbe-save.${SOEXT}
121lib/gegl-0.4/sdl2-display.${SOEXT} 127lib/gegl-0.4/sdl2-display.${SOEXT}
122lib/gegl-0.4/seamless-clone-compose.${SOEXT} 128lib/gegl-0.4/seamless-clone-compose.${SOEXT}
123lib/gegl-0.4/seamless-clone.${SOEXT} 129lib/gegl-0.4/seamless-clone.${SOEXT}
124lib/gegl-0.4/svg-load.${SOEXT} 130${PLIST.svg}lib/gegl-0.4/svg-load.${SOEXT}
125lib/gegl-0.4/text.${SOEXT} 131lib/gegl-0.4/text.${SOEXT}
126lib/gegl-0.4/tiff-load.${SOEXT} 132lib/gegl-0.4/tiff-load.${SOEXT}
127lib/gegl-0.4/tiff-save.${SOEXT} 133lib/gegl-0.4/tiff-save.${SOEXT}
128lib/gegl-0.4/transformops.${SOEXT} 134lib/gegl-0.4/transformops.${SOEXT}
129lib/gegl-0.4/vector-stroke.${SOEXT} 135lib/gegl-0.4/vector-stroke.${SOEXT}
130lib/gegl-0.4/webp-load.${SOEXT} 136lib/gegl-0.4/webp-load.${SOEXT}
131lib/gegl-0.4/webp-save.${SOEXT} 137lib/gegl-0.4/webp-save.${SOEXT}
132lib/libgegl-0.4.${SOEXT} 138lib/libgegl-0.4.${SOEXT}
133lib/libgegl-0.4.${SOEXT}.0 139lib/libgegl-0.4.${SOEXT}.0
134lib/libgegl-0.4.${SOEXT}.0.435.1 140lib/libgegl-0.4.${SOEXT}.0.435.1
135lib/libgegl-npd-0.4.${SOEXT} 141lib/libgegl-npd-0.4.${SOEXT}
136lib/libgegl-sc-0.4.${SOEXT} 142lib/libgegl-sc-0.4.${SOEXT}
137lib/pkgconfig/gegl-0.4.pc 143lib/pkgconfig/gegl-0.4.pc
cvs diff -r1.39 -r1.40 pkgsrc/graphics/gegl/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/gegl/distinfo 2022/02/26 07:54:16 1.39
+++ pkgsrc/graphics/gegl/distinfo 2022/03/24 00:02:25 1.40
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.39 2022/02/26 07:54:16 wiz Exp $ 1$NetBSD: distinfo,v 1.40 2022/03/24 00:02:25 tnn Exp $
2 2
3BLAKE2s (gegl-0.4.36.tar.xz) = 31f54ad7c5527a0b01b74e65709367701ca54e462c5a0d5691d3d3fd1e164902 3BLAKE2s (gegl-0.4.36.tar.xz) = 31f54ad7c5527a0b01b74e65709367701ca54e462c5a0d5691d3d3fd1e164902
4SHA512 (gegl-0.4.36.tar.xz) = 4d681091b15e7911229f86bf22381d62268451da57bba072bcb8ee3f4db79e2719dd7e70ab208c2c021e5353f42a9f88c18f62132512b18fe78ed6ad279660f8 4SHA512 (gegl-0.4.36.tar.xz) = 4d681091b15e7911229f86bf22381d62268451da57bba072bcb8ee3f4db79e2719dd7e70ab208c2c021e5353f42a9f88c18f62132512b18fe78ed6ad279660f8
5Size (gegl-0.4.36.tar.xz) = 5680876 bytes 5Size (gegl-0.4.36.tar.xz) = 5680876 bytes
6SHA1 (patch-gegl_gegl-config.c) = a8e1f5f5394a33be2bcdcb05ec7654d06f7ad4bc 6SHA1 (patch-gegl_gegl-config.c) = a8e1f5f5394a33be2bcdcb05ec7654d06f7ad4bc
 7SHA1 (patch-gegl_gegl-cpuaccel.c) = f32ee8dfb8b89eb0aa117ac071cd35367b7841a5
7SHA1 (patch-operations_external_png-load.c) = 9a03e842597d6c069f7dfa0fa224dd487479b27f 8SHA1 (patch-operations_external_png-load.c) = 9a03e842597d6c069f7dfa0fa224dd487479b27f
8SHA1 (patch-operations_external_tiff-load.c) = 5be8581a1459db3007bb82c27c2770356314f71d 9SHA1 (patch-operations_external_tiff-load.c) = 5be8581a1459db3007bb82c27c2770356314f71d
File Added: pkgsrc/graphics/gegl/patches/patch-gegl_gegl-cpuaccel.c
$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>