x11/babl: update to 0.1.92 release

4 files changed, 111 insertions, 50 deletions

diff --git a/x11/babl/Makefile b/x11/babl/Makefile
index 1181d7c588cb..f8331189dd18 100644
--- a/x11/babl/Makefile
+++ b/x11/babl/Makefile
@@ -1,13 +1,10 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 
 PORTNAME=	babl
-PORTVERSION=	0.1.88
+PORTVERSION=	0.1.92
 CATEGORIES=	x11
 MASTER_SITES=	GIMP
 
-PATCH_SITES=	https://gitlab.gnome.org/GNOME/${PORTNAME}/-/commit/
-PATCHFILES+=	9a74120fbdd2.patch:-p1 # https://gitlab.gnome.org/GNOME/babl/-/merge_requests/45
-
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Dynamic pixel format conversion library
 
@@ -29,4 +26,18 @@ SIMD_MESON_OFF=	-Denable-mmx=false -Denable-sse=false \
 		-Denable-sse2=false -Denable-sse4_1=false \
 		-Denable-avx2=false -Denable-f16c=false
 
-.include <bsd.port.mk>
+BABL_SHLIB=	0.191.1
+BABL_VER=	0.1
+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=""
+.else
+PLIST_SUB+=	AMD64="@comment " AARCH64="@comment "
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/x11/babl/distinfo b/x11/babl/distinfo
index d7dcde731eb9..f4806fe25f97 100644
--- a/x11/babl/distinfo
+++ b/x11/babl/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1626439807
-SHA256 (babl-0.1.88.tar.xz) = 4f0d7f4aaa0bb2e725f349adf7b351a957d9fb26d555d9895a7af816b4167039
-SIZE (babl-0.1.88.tar.xz) = 299972
-SHA256 (9a74120fbdd2.patch) = df02d8731e95992dafdd98d9c9889d1ec0a23eec247d7a9b05f3a7261652f905
-SIZE (9a74120fbdd2.patch) = 1177
+TIMESTAMP = 1655194578
+SHA256 (babl-0.1.92.tar.xz) = f667735028944b6375ad18f160a64ceb93f5c7dccaa9d8751de359777488a2c1
+SIZE (babl-0.1.92.tar.xz) = 309784
diff --git a/x11/babl/files/patch-meson_build b/x11/babl/files/patch-meson_build
new file mode 100644
index 000000000000..096a931a5e79
--- /dev/null
+++ b/x11/babl/files/patch-meson_build
@@ -0,0 +1,15 @@
+Fix for meson >=0.62.0
+
+Index: meson.build
+--- meson.build.orig
++++ meson.build
+@@ -55,9 +55,6 @@ lib_name    = meson.project_name() + '-' + api_version
+ stability_version_number = (major_version != 0 ? minor_version : micro_version)
+ stable = (stability_version_number % 2 == 0)
+ 
+-conf.set10('BABL_UNSTABLE', not stable, Description:
+-  'Define to 1 if this is an unstable version of BABL.')
+-
+ conf.set       ('BABL_MAJOR_VERSION',    '@0@'.format(major_version))
+ conf.set       ('BABL_MINOR_VERSION',    '@0@'.format(minor_version))
+ conf.set       ('BABL_MICRO_VERSION',    '@0@'.format(micro_version))
diff --git a/x11/babl/pkg-plist b/x11/babl/pkg-plist
index 492bac5c8a1c..695f67c93a1c 100644
--- a/x11/babl/pkg-plist
+++ b/x11/babl/pkg-plist
@@ -1,41 +1,78 @@
-include/babl-0.1/babl/babl-introspect.h
-include/babl-0.1/babl/babl-macros.h
-include/babl-0.1/babl/babl-types.h
-include/babl-0.1/babl/babl-version.h
-include/babl-0.1/babl/babl.h
-lib/babl-0.1/CIE.so
-lib/babl-0.1/HCY.so
-lib/babl-0.1/HSL.so
-lib/babl-0.1/HSV.so
-lib/babl-0.1/avx2-int8.so
-lib/babl-0.1/cairo.so
-lib/babl-0.1/double.so
-lib/babl-0.1/fast-float.so
-lib/babl-0.1/float.so
-lib/babl-0.1/gegl-fixups.so
-lib/babl-0.1/gggl-lies.so
-lib/babl-0.1/gggl-table-lies.so
-lib/babl-0.1/gggl-table.so
-lib/babl-0.1/gggl.so
-lib/babl-0.1/gimp-8bit.so
-lib/babl-0.1/grey.so
-lib/babl-0.1/half.so
-lib/babl-0.1/naive-CMYK.so
-lib/babl-0.1/simple.so
-lib/babl-0.1/sse-half.so
-lib/babl-0.1/sse2-float.so
-lib/babl-0.1/sse2-int16.so
-lib/babl-0.1/sse2-int8.so
-lib/babl-0.1/sse4-int8.so
-lib/babl-0.1/two-table.so
-lib/babl-0.1/u16.so
-lib/babl-0.1/u32.so
-lib/babl-0.1/ycbcr.so
-lib/girepository-1.0/Babl-0.1.typelib
-lib/libbabl-0.1.so
-lib/libbabl-0.1.so.0
-lib/libbabl-0.1.so.0.187.1
+include/babl-%%BABL_VER%%/babl/babl-introspect.h
+include/babl-%%BABL_VER%%/babl/babl-macros.h
+include/babl-%%BABL_VER%%/babl/babl-types.h
+include/babl-%%BABL_VER%%/babl/babl-version.h
+include/babl-%%BABL_VER%%/babl/babl.h
+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
+lib/babl-%%BABL_VER%%/avx2-int8.so
+lib/babl-%%BABL_VER%%/cairo.so
+lib/babl-%%BABL_VER%%/double.so
+lib/babl-%%BABL_VER%%/fast-float.so
+lib/babl-%%BABL_VER%%/float.so
+lib/babl-%%BABL_VER%%/gegl-fixups.so
+lib/babl-%%BABL_VER%%/gggl-lies.so
+lib/babl-%%BABL_VER%%/gggl-table-lies.so
+lib/babl-%%BABL_VER%%/gggl-table.so
+lib/babl-%%BABL_VER%%/gggl.so
+lib/babl-%%BABL_VER%%/gimp-8bit.so
+lib/babl-%%BABL_VER%%/grey.so
+lib/babl-%%BABL_VER%%/half.so
+lib/babl-%%BABL_VER%%/naive-CMYK.so
+lib/babl-%%BABL_VER%%/oklab.so
+lib/babl-%%BABL_VER%%/simple.so
+lib/babl-%%BABL_VER%%/sse-half.so
+lib/babl-%%BABL_VER%%/sse2-float.so
+lib/babl-%%BABL_VER%%/sse2-int16.so
+lib/babl-%%BABL_VER%%/sse2-int8.so
+lib/babl-%%BABL_VER%%/sse4-int8.so
+lib/babl-%%BABL_VER%%/two-table.so
+lib/babl-%%BABL_VER%%/u16.so
+lib/babl-%%BABL_VER%%/u32.so
+%%AMD64%%lib/babl-%%BABL_VER%%/x86-64-v2-CIE.so
+%%AMD64%%lib/babl-%%BABL_VER%%/x86-64-v2-cairo.so
+%%AMD64%%lib/babl-%%BABL_VER%%/x86-64-v2-double.so
+%%AMD64%%lib/babl-%%BABL_VER%%/x86-64-v2-float.so
+%%AMD64%%lib/babl-%%BABL_VER%%/x86-64-v2-gegl-fixups.so
+%%AMD64%%lib/babl-%%BABL_VER%%/x86-64-v2-gggl-lies.so
+%%AMD64%%lib/babl-%%BABL_VER%%/x86-64-v2-gggl.so
+%%AMD64%%lib/babl-%%BABL_VER%%/x86-64-v2-grey.so
+%%AMD64%%lib/babl-%%BABL_VER%%/x86-64-v2-simple.so
+%%AMD64%%lib/babl-%%BABL_VER%%/x86-64-v2-u16.so
+%%AMD64%%lib/babl-%%BABL_VER%%/x86-64-v2-u32.so
+%%AMD64%%lib/babl-%%BABL_VER%%/x86-64-v2-ycbcr.so
+%%AMD64%%lib/babl-%%BABL_VER%%/x86-64-v3-CIE.so
+%%AMD64%%lib/babl-%%BABL_VER%%/x86-64-v3-cairo.so
+%%AMD64%%lib/babl-%%BABL_VER%%/x86-64-v3-double.so
+%%AMD64%%lib/babl-%%BABL_VER%%/x86-64-v3-float.so
+%%AMD64%%lib/babl-%%BABL_VER%%/x86-64-v3-gegl-fixups.so
+%%AMD64%%lib/babl-%%BABL_VER%%/x86-64-v3-gggl-lies.so
+%%AMD64%%lib/babl-%%BABL_VER%%/x86-64-v3-gggl.so
+%%AMD64%%lib/babl-%%BABL_VER%%/x86-64-v3-grey.so
+%%AMD64%%lib/babl-%%BABL_VER%%/x86-64-v3-simple.so
+%%AMD64%%lib/babl-%%BABL_VER%%/x86-64-v3-u16.so
+%%AMD64%%lib/babl-%%BABL_VER%%/x86-64-v3-u32.so
+%%AMD64%%lib/babl-%%BABL_VER%%/x86-64-v3-ycbcr.so
+lib/babl-%%BABL_VER%%/ycbcr.so
+lib/girepository-1.0/Babl-%%BABL_VER%%.typelib
+lib/libbabl-%%BABL_VER%%.so
+lib/libbabl-%%BABL_VER%%.so.0
+lib/libbabl-%%BABL_VER%%.so.%%BABL_SHLIB%%
 libdata/pkgconfig/babl.pc
-share/gir-1.0/Babl-0.1.gir
-share/vala/vapi/babl-0.1.deps
-share/vala/vapi/babl-0.1.vapi
+share/gir-1.0/Babl-%%BABL_VER%%.gir
+share/vala/vapi/babl-%%BABL_VER%%.deps
+share/vala/vapi/babl-%%BABL_VER%%.vapi