Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id A45D384ED6 for ; Sun, 26 Nov 2023 18:45:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id K08c0sor5dkT for ; Sun, 26 Nov 2023 18:45:03 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id CE92784EAC for ; Sun, 26 Nov 2023 18:45:03 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id C7BD8FA40; Sun, 26 Nov 2023 18:45:03 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_170102430398820" MIME-Version: 1.0 Date: Sun, 26 Nov 2023 18:45:03 +0000 From: "Amitai Schleier" Subject: CVS commit: pkgsrc/graphics/cairo To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: schmonz@netbsd.org X-Mailer: log_accum Message-Id: <20231126184503.C7BD8FA40@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_170102430398820 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: schmonz Date: Sun Nov 26 18:45:03 UTC 2023 Modified Files: pkgsrc/graphics/cairo: Makefile PLIST buildlink3.mk options.mk Log Message: cairo: just always install cairo-ft. Bump PKGREVISION. Depend on freetype and fontconfig even if no options are selected, and take care to explicitly enable or disable meson options. Should fix pango build error seen on NetBSD sans X11: meson.build:429:4: ERROR: Problem encountered: No Cairo font backends found Build-tested (and `otool -L`-inspected) on macOS with each of 'quartz', 'x11', 'xcb', 'x11 xcb', and no options selected. To generate a diff of this commit: cvs rdiff -u -r1.159 -r1.160 pkgsrc/graphics/cairo/Makefile cvs rdiff -u -r1.44 -r1.45 pkgsrc/graphics/cairo/PLIST cvs rdiff -u -r1.67 -r1.68 pkgsrc/graphics/cairo/buildlink3.mk cvs rdiff -u -r1.25 -r1.26 pkgsrc/graphics/cairo/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_170102430398820 Content-Disposition: inline Content-Length: 5389 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/graphics/cairo/Makefile diff -u pkgsrc/graphics/cairo/Makefile:1.159 pkgsrc/graphics/cairo/Makefile:1.160 --- pkgsrc/graphics/cairo/Makefile:1.159 Thu Nov 23 10:57:44 2023 +++ pkgsrc/graphics/cairo/Makefile Sun Nov 26 18:45:03 2023 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.159 2023/11/23 10:57:44 jperkin Exp $ +# $NetBSD: Makefile,v 1.160 2023/11/26 18:45:03 schmonz Exp $ DISTNAME= cairo-1.18.0 +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= https://cairographics.org/releases/ EXTRACT_SUFX= .tar.xz @@ -19,6 +20,9 @@ USE_TOOLS+= pkg-config CPPFLAGS.SunOS+= -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS LDFLAGS.SunOS+= -lsocket +MESON_ARGS+= -Dfreetype=enabled +MESON_ARGS+= -Dfontconfig=enabled + PKGCONFIG_OVERRIDE_STAGE= post-build PKGCONFIG_OVERRIDE+= output/meson-private/*.pc @@ -40,6 +44,8 @@ PLIST.trace= yes BUILDLINK_API_DEPENDS.glib2+= glib2>=2.14.0 .include "../../devel/glib2/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" +.include "../../fonts/fontconfig/buildlink3.mk" +.include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" # include? #.include "../../print/libspectre/buildlink3.mk" Index: pkgsrc/graphics/cairo/PLIST diff -u pkgsrc/graphics/cairo/PLIST:1.44 pkgsrc/graphics/cairo/PLIST:1.45 --- pkgsrc/graphics/cairo/PLIST:1.44 Wed Nov 15 15:11:39 2023 +++ pkgsrc/graphics/cairo/PLIST Sun Nov 26 18:45:03 2023 @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.44 2023/11/15 15:11:39 tnn Exp $ +@comment $NetBSD: PLIST,v 1.45 2023/11/26 18:45:03 schmonz Exp $ ${PLIST.trace}bin/cairo-trace include/cairo/cairo-deprecated.h include/cairo/cairo-features.h -${PLIST.freetype}include/cairo/cairo-ft.h +include/cairo/cairo-ft.h include/cairo/cairo-gobject.h include/cairo/cairo-pdf.h include/cairo/cairo-ps.h @@ -28,8 +28,8 @@ lib/libcairo-script-interpreter.so.2.118 lib/libcairo.so lib/libcairo.so.2 lib/libcairo.so.2.11800.0 -${PLIST.fontconfig}lib/pkgconfig/cairo-fc.pc -${PLIST.freetype}lib/pkgconfig/cairo-ft.pc +lib/pkgconfig/cairo-fc.pc +lib/pkgconfig/cairo-ft.pc lib/pkgconfig/cairo-gobject.pc lib/pkgconfig/cairo-pdf.pc lib/pkgconfig/cairo-png.pc Index: pkgsrc/graphics/cairo/buildlink3.mk diff -u pkgsrc/graphics/cairo/buildlink3.mk:1.67 pkgsrc/graphics/cairo/buildlink3.mk:1.68 --- pkgsrc/graphics/cairo/buildlink3.mk:1.67 Wed Nov 15 15:17:21 2023 +++ pkgsrc/graphics/cairo/buildlink3.mk Sun Nov 26 18:45:03 2023 @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.67 2023/11/15 15:17:21 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.68 2023/11/26 18:45:03 schmonz Exp $ BUILDLINK_TREE+= cairo @@ -18,11 +18,6 @@ pkgbase := cairo .include "../../x11/libxcb/buildlink3.mk" .endif -.if ${PKG_BUILD_OPTIONS.cairo:Mx11} || ${PKG_BUILD_OPTIONS.cairo:Mxcb} || ${PKG_BUILD_OPTIONS.cairo:Mquartz} -.include "../../fonts/fontconfig/buildlink3.mk" -.include "../../graphics/freetype2/buildlink3.mk" -.endif - .if ${PKG_BUILD_OPTIONS.cairo:Mx11} || ${PKG_BUILD_OPTIONS.cairo:Mxcb} .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXrender/buildlink3.mk" @@ -31,6 +26,8 @@ pkgbase := cairo .include "../../archivers/lzo/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" +.include "../../fonts/fontconfig/buildlink3.mk" +.include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../x11/pixman/buildlink3.mk" .endif # CAIRO_BUILDLINK3_MK Index: pkgsrc/graphics/cairo/options.mk diff -u pkgsrc/graphics/cairo/options.mk:1.25 pkgsrc/graphics/cairo/options.mk:1.26 --- pkgsrc/graphics/cairo/options.mk:1.25 Wed Nov 15 15:11:39 2023 +++ pkgsrc/graphics/cairo/options.mk Sun Nov 26 18:45:03 2023 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.25 2023/11/15 15:11:39 tnn Exp $ +# $NetBSD: options.mk,v 1.26 2023/11/26 18:45:03 schmonz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.cairo PKG_SUPPORTED_OPTIONS= x11 xcb @@ -11,25 +11,27 @@ PKG_SUGGESTED_OPTIONS= x11 xcb .include "../../mk/bsd.options.mk" -PLIST_VARS+= fontconfig freetype x11 xcb quartz +PLIST_VARS+= x11 xcb quartz ### ### X11 and XCB support (XCB implies X11) ### .if !empty(PKG_OPTIONS:Mx11) || !empty(PKG_OPTIONS:Mxcb) -PLIST.fontconfig= yes -PLIST.freetype= yes PLIST.x11= yes -.include "../../fonts/fontconfig/buildlink3.mk" -.include "../../graphics/freetype2/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXrender/buildlink3.mk" - +MESON_ARGS+= -Dxlib=enabled . if !empty(PKG_OPTIONS:Mxcb) PLIST.xcb= yes . include "../../x11/libxcb/buildlink3.mk" +MESON_ARGS+= -Dxcb=enabled +. else +MESON_ARGS+= -Dxcb=disabled . endif +.else +MESON_ARGS+= -Dxlib=disabled +MESON_ARGS+= -Dxcb=disabled .endif ### @@ -43,12 +45,9 @@ PLIST.xcb= yes # fonts in MacOS X system-default paths too so sticking with it will # not be a problem. .if !empty(PKG_OPTIONS:Mquartz) -.include "../../fonts/fontconfig/buildlink3.mk" -.include "../../graphics/freetype2/buildlink3.mk" -MESON_ARGS+= -Dfreetype=enabled -MESON_ARGS+= -Dfontconfig=enabled -PLIST.fontconfig= yes -PLIST.freetype= yes PLIST.quartz= yes WARNINGS+= "You have enabled Quartz backend. No fonts installed with pkgsrc will be found." +MESON_ARGS+= -Dquartz=enabled +.else +MESON_ARGS+= -Dquartz=disabled .endif --_----------=_170102430398820--