Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 1 Jun 2024 23:24:23 GMT
From:      Vladimir Druzenko <vvd@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: bb1c7512f9d1 - main - x11/babl: sort out Makefile and pet portclippy
Message-ID:  <202406012324.451NON9R088480@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=bb1c7512f9d178ff5711bb2051006916482aa47a

commit bb1c7512f9d178ff5711bb2051006916482aa47a
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2024-06-01 20:20:01 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2024-06-01 23:16:56 +0000

    x11/babl: sort out Makefile and pet portclippy
    
    Remove localbase.
    Limit SIMD to i386/amd64, default for i386 is none, for amd64 SSE2.
    But users can turn on or off all SIMD sets during build.
    
    PR:             279275
    Approved by:    fluffy (gnome, maintainer)
---
 x11/babl/Makefile | 45 +++++++++++++++++++++++++++++++++++----------
 1 file changed, 35 insertions(+), 10 deletions(-)

diff --git a/x11/babl/Makefile b/x11/babl/Makefile
index ef9efba55256..3310fde6f467 100644
--- a/x11/babl/Makefile
+++ b/x11/babl/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	babl
 PORTVERSION=	0.1.108
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	GIMP
 
@@ -12,25 +13,49 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	liblcms2.so:graphics/lcms2
 
-USES=		gnome localbase meson pathfix pkgconfig tar:xz vala:build
+USES=		gnome meson pathfix pkgconfig tar:xz vala:build
 
-USE_LDCONFIG=	yes
 USE_GNOME=	introspection:build
+USE_LDCONFIG=	yes
 
 MESON_ARGS=	-Dgi-docgen=disabled -Dwith-docs=false
 
-OPTIONS_DEFINE=	SIMD
-OPTIONS_DEFAULT_amd64=SIMD
-OPTIONS_EXCLUDE_i386=SIMD
-
-SIMD_MESON_OFF=	-Denable-mmx=false -Denable-sse=false \
-		-Denable-sse2=false -Denable-sse4_1=false \
-		-Denable-avx2=false -Denable-f16c=false
-
 BABL_SHLIB=	0.207.1
 BABL_VER=	0.1
 PLIST_SUB+=	BABL_SHLIB=${BABL_SHLIB} BABL_VER=${BABL_VER}
 
+OPTIONS_DEFINE_amd64=	AVX2 F16C MMX SSE2 SSE41 SSE
+OPTIONS_DEFINE_i386=	AVX2 F16C MMX SSE2 SSE41 SSE
+OPTIONS_DEFAULT_amd64=	MMX SSE2 SSE
+
+AVX2_DESC=		Use AVX2 optimized routines
+F16C_DESC=		Use F16C optimized routines
+SSE2_DESC=		Use SSE2 optimized routines
+SSE41_DESC=		Use SSE4.1 optimized routines
+
+AVX2_IMPLIES=		SSE41
+AVX2_MESON_ON=		-Denable-avx2=true
+AVX2_MESON_OFF=		-Denable-avx2=false
+
+F16C_IMPLIES=		MMX
+F16C_MESON_ON=		-Denable-f16c=true
+F16C_MESON_OFF=		-Denable-f16c=false
+
+MMX_MESON_ON=		-Denable-mmx=true
+MMX_MESON_OFF=		-Denable-mmx=false
+
+SSE2_IMPLIES=		SSE
+SSE2_MESON_ON=		-Denable-sse2=true
+SSE2_MESON_OFF=		-Denable-sse2=false
+
+SSE41_IMPLIES=		SSE2
+SSE41_MESON_ON=		-Denable-sse4_1=true
+SSE41_MESON_OFF=	-Denable-sse4_1=false
+
+SSE_IMPLIES=		MMX
+SSE_MESON_ON=		-Denable-sse=true
+SSE_MESON_OFF=		-Denable-sse=false
+
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == powerpc



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202406012324.451NON9R088480>