CVS commit: pkgsrc/graphics/cairo

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Jan 27 08:31:50 UTC 2026

Modified Files:
        pkgsrc/graphics/cairo: Makefile PLIST buildlink3.mk options.mk

Log Message:
cairo: merge xcb option into x11 option

xcb was defined as a superset of x11 here, but libX11 always
pulls in libxcb, so this doesn't make sense.

As discussed on tech-pkg.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.167 -r1.168 pkgsrc/graphics/cairo/Makefile
cvs rdiff -u -r1.47 -r1.48 pkgsrc/graphics/cairo/PLIST
cvs rdiff -u -r1.72 -r1.73 pkgsrc/graphics/cairo/buildlink3.mk
cvs rdiff -u -r1.27 -r1.28 pkgsrc/graphics/cairo/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/cairo/Makefile
diff -u pkgsrc/graphics/cairo/Makefile:1.167 pkgsrc/graphics/cairo/Makefile:1.168
--- pkgsrc/graphics/cairo/Makefile:1.167        Thu Oct 23 20:37:23 2025
+++ pkgsrc/graphics/cairo/Makefile      Tue Jan 27 08:31:50 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.167 2025/10/23 20:37:23 wiz Exp $
+# $NetBSD: Makefile,v 1.168 2026/01/27 08:31:50 wiz Exp $
 
 DISTNAME=      cairo-1.18.4
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    graphics
 MASTER_SITES=  https://cairographics.org/releases/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/graphics/cairo/PLIST
diff -u pkgsrc/graphics/cairo/PLIST:1.47 pkgsrc/graphics/cairo/PLIST:1.48
--- pkgsrc/graphics/cairo/PLIST:1.47    Tue Apr  1 05:19:04 2025
+++ pkgsrc/graphics/cairo/PLIST Tue Jan 27 08:31:50 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.47 2025/04/01 05:19:04 adam Exp $
+@comment $NetBSD: PLIST,v 1.48 2026/01/27 08:31:50 wiz Exp $
 ${PLIST.trace}bin/cairo-trace
 include/cairo/cairo-deprecated.h
 include/cairo/cairo-features.h
@@ -13,7 +13,7 @@ include/cairo/cairo-script.h
 include/cairo/cairo-svg.h
 include/cairo/cairo-tee.h
 include/cairo/cairo-version.h
-${PLIST.xcb}include/cairo/cairo-xcb.h
+${PLIST.x11}include/cairo/cairo-xcb.h
 ${PLIST.x11}include/cairo/cairo-xlib-xrender.h
 ${PLIST.x11}include/cairo/cairo-xlib.h
 include/cairo/cairo.h
@@ -41,8 +41,8 @@ lib/pkgconfig/cairo-script-interpreter.p
 lib/pkgconfig/cairo-script.pc
 lib/pkgconfig/cairo-svg.pc
 lib/pkgconfig/cairo-tee.pc
-${PLIST.xcb}lib/pkgconfig/cairo-xcb-shm.pc
-${PLIST.xcb}lib/pkgconfig/cairo-xcb.pc
+${PLIST.x11}lib/pkgconfig/cairo-xcb-shm.pc
+${PLIST.x11}lib/pkgconfig/cairo-xcb.pc
 ${PLIST.x11}lib/pkgconfig/cairo-xlib-xrender.pc
 ${PLIST.x11}lib/pkgconfig/cairo-xlib.pc
 lib/pkgconfig/cairo.pc

Index: pkgsrc/graphics/cairo/buildlink3.mk
diff -u pkgsrc/graphics/cairo/buildlink3.mk:1.72 pkgsrc/graphics/cairo/buildlink3.mk:1.73
--- pkgsrc/graphics/cairo/buildlink3.mk:1.72    Thu Oct 23 20:37:23 2025
+++ pkgsrc/graphics/cairo/buildlink3.mk Tue Jan 27 08:31:50 2026
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.72 2025/10/23 20:37:23 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.73 2026/01/27 08:31:50 wiz Exp $
 
 BUILDLINK_TREE+=       cairo
 
@@ -18,13 +18,10 @@ pkgbase := cairo
 .include "../../archivers/lzo/buildlink3.mk"
 .endif
 
-.if ${PKG_BUILD_OPTIONS.cairo:Mxcb}
-.include "../../x11/libxcb/buildlink3.mk"
-.endif
-
-.if ${PKG_BUILD_OPTIONS.cairo:Mx11} || ${PKG_BUILD_OPTIONS.cairo:Mxcb}
+.if ${PKG_BUILD_OPTIONS.cairo:Mx11}
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXrender/buildlink3.mk"
+.include "../../x11/libxcb/buildlink3.mk"
 .endif
 
 .include "../../devel/glib2/buildlink3.mk"

Index: pkgsrc/graphics/cairo/options.mk
diff -u pkgsrc/graphics/cairo/options.mk:1.27 pkgsrc/graphics/cairo/options.mk:1.28
--- pkgsrc/graphics/cairo/options.mk:1.27       Sun Apr  7 07:31:19 2024
+++ pkgsrc/graphics/cairo/options.mk    Tue Jan 27 08:31:50 2026
@@ -1,39 +1,37 @@
-# $NetBSD: options.mk,v 1.27 2024/04/07 07:31:19 wiz Exp $
+# $NetBSD: options.mk,v 1.28 2026/01/27 08:31:50 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.cairo
-PKG_SUPPORTED_OPTIONS= lzo x11 xcb
+PKG_SUPPORTED_OPTIONS= lzo x11
 .if exists(/System/Library/Frameworks/Quartz.framework)
 PKG_SUPPORTED_OPTIONS+=        quartz
 PKG_SUGGESTED_OPTIONS+=        quartz
 .else
-PKG_SUGGESTED_OPTIONS= x11 xcb
+PKG_SUGGESTED_OPTIONS= x11
 .endif
 PKG_SUGGESTED_OPTIONS+=        lzo
 
+# remove after 2026Q2
+PKG_OPTIONS_LEGACY_OPTS+=      xcb:x11
+
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=   x11 xcb quartz
+PLIST_VARS+=   x11 quartz
 
 .if !empty(PKG_OPTIONS:Mlzo)
 .include "../../archivers/lzo/buildlink3.mk"
 .endif
 
 ###
-### X11 and XCB support (XCB implies X11)
+### X11 support
 ###
-.if !empty(PKG_OPTIONS:Mx11) || !empty(PKG_OPTIONS:Mxcb)
+.if !empty(PKG_OPTIONS:Mx11)
 PLIST.x11=             yes
+MESON_ARGS+=           -Dxlib=enabled
+MESON_ARGS+=           -Dxcb=enabled
 .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
+.include "../../x11/libxcb/buildlink3.mk"
 .else
 MESON_ARGS+=           -Dxlib=disabled
 MESON_ARGS+=           -Dxcb=disabled