Date: Sat, 25 Jun 2022 14:01:49 GMT From: Dima Panov <fluffy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 69dc4935e664 - main - x11/babl: fix packaging on arm/aarch64 Message-ID: <202206251401.25PE1naF094685@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=69dc4935e66470d3dd7fccfdbbe855b60644c1a4 commit 69dc4935e66470d3dd7fccfdbbe855b60644c1a4 Author: Dima Panov <fluffy@FreeBSD.org> AuthorDate: 2022-06-25 14:00:21 +0000 Commit: Dima Panov <fluffy@FreeBSD.org> CommitDate: 2022-06-25 14:00:21 +0000 x11/babl: fix packaging on arm/aarch64 PR: 264875 --- x11/babl/Makefile | 8 ++++---- x11/babl/pkg-plist | 24 ++++++++++++------------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/x11/babl/Makefile b/x11/babl/Makefile index f8331189dd18..2a26c16c8b36 100644 --- a/x11/babl/Makefile +++ b/x11/babl/Makefile @@ -33,11 +33,11 @@ PLIST_SUB+= BABL_SHLIB=${BABL_SHLIB} BABL_VER=${BABL_VER} .include <bsd.port.pre.mk> .if ${ARCH} == "amd64" -PLIST_SUB+= AMD64="" AARCH64="@comment " -.elif ${ARCH} == "aarch64" -PLIST_SUB+= AMD64="@comment " AARCH64="" +PLIST_SUB+= AMD64="" ARM="@comment " +.elif ${ARCH} == "armv6" || ${ARCH} == "armv7" +PLIST_SUB+= AMD64="@comment " ARM="" .else -PLIST_SUB+= AMD64="@comment " AARCH64="@comment " +PLIST_SUB+= AMD64="@comment " ARM="@comment " .endif .include <bsd.port.post.mk> diff --git a/x11/babl/pkg-plist b/x11/babl/pkg-plist index 695f67c93a1c..5fec613055d9 100644 --- a/x11/babl/pkg-plist +++ b/x11/babl/pkg-plist @@ -7,18 +7,18 @@ lib/babl-%%BABL_VER%%/CIE.so lib/babl-%%BABL_VER%%/HCY.so lib/babl-%%BABL_VER%%/HSL.so lib/babl-%%BABL_VER%%/HSV.so -%%AARCH64%%lib/babl-%%BABL_VER%%/arm-neon-CIE.so -%%AARCH64%%lib/babl-%%BABL_VER%%/arm-neon-cairo.so -%%AARCH64%%lib/babl-%%BABL_VER%%/arm-neon-double.so -%%AARCH64%%lib/babl-%%BABL_VER%%/arm-neon-float.so -%%AARCH64%%lib/babl-%%BABL_VER%%/arm-neon-gegl-fixups.so -%%AARCH64%%lib/babl-%%BABL_VER%%/arm-neon-gggl-lies.so -%%AARCH64%%lib/babl-%%BABL_VER%%/arm-neon-gggl.so -%%AARCH64%%lib/babl-%%BABL_VER%%/arm-neon-grey.so -%%AARCH64%%lib/babl-%%BABL_VER%%/arm-neon-simple.so -%%AARCH64%%lib/babl-%%BABL_VER%%/arm-neon-u16.so -%%AARCH64%%lib/babl-%%BABL_VER%%/arm-neon-u32.so -%%AARCH64%%lib/babl-%%BABL_VER%%/arm-neon-ycbcr.so +%%ARM%%lib/babl-%%BABL_VER%%/arm-neon-CIE.so +%%ARM%%lib/babl-%%BABL_VER%%/arm-neon-cairo.so +%%ARM%%lib/babl-%%BABL_VER%%/arm-neon-double.so +%%ARM%%lib/babl-%%BABL_VER%%/arm-neon-float.so +%%ARM%%lib/babl-%%BABL_VER%%/arm-neon-gegl-fixups.so +%%ARM%%lib/babl-%%BABL_VER%%/arm-neon-gggl-lies.so +%%ARM%%lib/babl-%%BABL_VER%%/arm-neon-gggl.so +%%ARM%%lib/babl-%%BABL_VER%%/arm-neon-grey.so +%%ARM%%lib/babl-%%BABL_VER%%/arm-neon-simple.so +%%ARM%%lib/babl-%%BABL_VER%%/arm-neon-u16.so +%%ARM%%lib/babl-%%BABL_VER%%/arm-neon-u32.so +%%ARM%%lib/babl-%%BABL_VER%%/arm-neon-ycbcr.so lib/babl-%%BABL_VER%%/avx2-int8.so lib/babl-%%BABL_VER%%/cairo.so lib/babl-%%BABL_VER%%/double.so
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202206251401.25PE1naF094685>