Tue Apr 12 23:42:58 2022 UTC ()
babl: turn mmx into a PKG_OPTION so people can easily disable it if needed

There are reports of segfaults while building gimp.


(tnn)
diff -r1.45 -r1.46 pkgsrc/graphics/babl/Makefile
cvs diff -r1.45 -r1.46 pkgsrc/graphics/babl/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/babl/Makefile 2022/03/23 22:27:34 1.45
+++ pkgsrc/graphics/babl/Makefile 2022/04/12 23:42:58 1.46
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.45 2022/03/23 22:27:34 tnn Exp $ 1# $NetBSD: Makefile,v 1.46 2022/04/12 23:42:58 tnn Exp $
2 2
3DISTNAME= babl-0.1.90 3DISTNAME= babl-0.1.90
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= graphics 5CATEGORIES= graphics
6MASTER_SITES= https://download.gimp.org/pub/babl/${PKGVERSION_NOREV:R}/ 6MASTER_SITES= https://download.gimp.org/pub/babl/${PKGVERSION_NOREV:R}/
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://gegl.org/babl/ 10HOMEPAGE= http://gegl.org/babl/
11COMMENT= Dynamic pixel conversion library 11COMMENT= Dynamic pixel conversion library
12LICENSE= gnu-gpl-v3 12LICENSE= gnu-gpl-v3
13 13
14USE_TOOLS+= pkg-config 14USE_TOOLS+= pkg-config
@@ -27,30 +27,45 @@ PLIST_VARS+= Darwin not_Darwin @@ -27,30 +27,45 @@ PLIST_VARS+= Darwin not_Darwin
27.if ${OPSYS} == "Darwin" 27.if ${OPSYS} == "Darwin"
28PLIST.Darwin= yes 28PLIST.Darwin= yes
29PLIST_SUBST+= SOEXT="dylib" 29PLIST_SUBST+= SOEXT="dylib"
30.else 30.else
31PLIST.not_Darwin= yes 31PLIST.not_Darwin= yes
32PLIST_SUBST+= SOEXT="so" 32PLIST_SUBST+= SOEXT="so"
33.endif 33.endif
34 34
35PLIST_VARS+= x86_64 35PLIST_VARS+= x86_64
36.if ${MACHINE_ARCH} == "x86_64" 36.if ${MACHINE_ARCH} == "x86_64"
37PLIST.x86_64= yes 37PLIST.x86_64= yes
38.endif 38.endif
39 39
 40
 41PKG_OPTIONS_VAR= PKG_OPTIONS.babl
 42PKG_SUPPORTED_OPTIONS=
 43.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64")
 44PKG_SUPPORTED_OPTIONS+= mmx
 45.endif
 46
40.include "../../mk/compiler.mk" 47.include "../../mk/compiler.mk"
41 48
42.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && \ 49.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") \
43 !empty(CC_VERSION:Mgcc-7.*) 50 && empty(CC_VERSION:Mgcc-7.*)
 51PKG_SUGGESTED_OPTIONS= mmx
 52.endif
 53
 54.include "../../mk/bsd.options.mk"
 55
 56.if empty(PKG_OPTIONS:Mmmx)
 57MESON_ARGS+= -Denable-mmx=true
 58.else
44MESON_ARGS+= -Denable-mmx=false 59MESON_ARGS+= -Denable-mmx=false
45.endif 60.endif
46 61
47# Apply removals to post-wrapper transformed arguments. 62# Apply removals to post-wrapper transformed arguments.
48BUILDLINK_TRANSFORM.Darwin+= rm:-Wl,--version-script 63BUILDLINK_TRANSFORM.Darwin+= rm:-Wl,--version-script
49BUILDLINK_TRANSFORM.Darwin+= rm:-Wl,babl.map 64BUILDLINK_TRANSFORM.Darwin+= rm:-Wl,babl.map
50BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--version-script 65BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--version-script
51BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,babl.map 66BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,babl.map
52 67
53.include "../../devel/meson/build.mk" 68.include "../../devel/meson/build.mk"
54.include "../../devel/glib2/buildlink3.mk" 69.include "../../devel/glib2/buildlink3.mk"
55.include "../../graphics/lcms2/buildlink3.mk" 70.include "../../graphics/lcms2/buildlink3.mk"
56.include "../../mk/pthread.buildlink3.mk" 71.include "../../mk/pthread.buildlink3.mk"