diff --git a/Mk/Uses/vala.mk b/Mk/Uses/vala.mk index 402e0338d67c..f80bc07529c9 100644 --- a/Mk/Uses/vala.mk +++ b/Mk/Uses/vala.mk @@ -1,29 +1,31 @@ # Handle dependency on lang/vala # # Valid args: # - lib: add a lib depends # - build: add a build depends # - no_depend: only used for lang/vala itself .if ! defined(_INCLUDE_USES_VALA_MK) _INCLUDE_USES_VALA_MK= yes _VALA_VERSION= 0.56.8 _VALA_LIB_VERSION= ${_VALA_VERSION:R} _VALA_LIBRARY= libvala-${_VALA_LIB_VERSION}.so _VALA_BINARY= valac _VALA_PORT= lang/vala . if empty(vala_ARGS:Mno_depend) . if ! empty(vala_ARGS:Mlib) LIB_DEPENDS+= ${_VALA_LIBRARY}:${_VALA_PORT} . endif . if ! empty(vala_ARGS:Mbuild) BUILD_DEPENDS+= ${_VALA_BINARY}:${_VALA_PORT} . endif . endif # remove after https://gitlab.gnome.org/GNOME/vala/-/issues/1408 is fixed +.if ${ARCH} != powerpc CFLAGS+= -Wno-error=incompatible-function-pointer-types +.endif .endif diff --git a/x11/babl/Makefile b/x11/babl/Makefile index 91d29b698080..c15881474fb0 100644 --- a/x11/babl/Makefile +++ b/x11/babl/Makefile @@ -1,42 +1,50 @@ PORTNAME= babl PORTVERSION= 0.1.106 CATEGORIES= x11 MASTER_SITES= GIMP MAINTAINER= gnome@FreeBSD.org COMMENT= Dynamic pixel format conversion library WWW= https://www.gegl.org/babl/ LICENSE= LGPL3 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= liblcms2.so:graphics/lcms2 -USES= compiler:c11 gnome libtool localbase meson pathfix pkgconfig tar:xz vala:build +USES= gnome libtool localbase meson pathfix pkgconfig tar:xz vala:build USE_LDCONFIG= yes USE_GNOME= introspection:build 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.205.1 BABL_VER= 0.1 PLIST_SUB+= BABL_SHLIB=${BABL_SHLIB} BABL_VER=${BABL_VER} +.include + +.if ${ARCH} == powerpc +USES+= compiler:gcc-c++11-lib +.else +USES+= compiler:c11 +.endif + .include .if ${ARCH} == "amd64" PLIST_SUB+= AMD64="" ARM="@comment " .elif ${ARCH} == "armv6" || ${ARCH} == "armv7" PLIST_SUB+= AMD64="@comment " ARM="" .else PLIST_SUB+= AMD64="@comment " ARM="@comment " .endif .include