CVS commit: pkgsrc/graphics/cairo

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/graphics/cairo
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Tue, 14 Nov 2023 13:48:19 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Nov 14 13:48:19 UTC 2023

Modified Files:
        pkgsrc/graphics/cairo: Makefile PLIST buildlink3.mk distinfo options.mk
Added Files:
        pkgsrc/graphics/cairo/patches: patch-meson.build
            patch-test_pdf-structure.c patch-util_cairo-missing_getline.c
            patch-util_meson.build
Removed Files:
        pkgsrc/graphics/cairo: Makefile.common hacks.mk
        pkgsrc/graphics/cairo/patches: patch-aa patch-ab patch-ac patch-ad
            patch-boilerplate_cairo-boilerplate.c
            patch-perf_cairo-analyse-trace.c patch-perf_cairo-perf-report.c
            patch-perf_cairo-perf-trace.c patch-src_cairo-arc.c
            patch-src_cairo-ft-font.c patch-src_cairo-image-compositor.c
            patch-src_cairo-quartz-image-surface.c
            patch-src_cairo-quartz-surface.c patch-src_cairo-type1-subset.c
            patch-util_cairo-trace_trace.c

Log Message:
cairo: update to 1.18.0.

Merge cairo-gobject into this, per discussion on tech-pkg.

Release 1.18.0 (2023-09-20 Emmanuele Bassi <ebassi%gnome.org@localhost>)
==============================================================

The first stable cairo release in five years should be cause for celebration.

All the API added in the 1.17 development cycle is now considered stable, and
will not change.

Many thanks to all the contributors for this release.

The cairo-sphinx tool has been removed; we could not find any instruction on
how to use it, and no user answered our call for help. If you were using
cairo-sphinx, please reach out to the cairo maintainers.

Cairo now implements Type 3 color fonts for PDF. Thanks to Adrian Johnson for
his work on this feature.

Khaled Hosny contributed multiple documentation fixes, to ensure that the
cairo API reference is up to date. Khaled also fixed multiple compiler
warnings generated when building cairo.

The XML surface has been removed; it was disabled by default when building
cairo, and we could not find any downstream distributor that would enable
it.

The Tee surface is now automatically enabled. Downstream distributors of
cairo have been enabling for years it in order to build Firefox.

Fujii Hironori and Adrian Johnson fixed multiple issues with the DWrite
font backend.

John Ralls improved the Quartz surface; mainly, Quartz surfaces now use
the main display ColorSpace, speeding up rendering operations.

Cairo now hides all private symbols by default on every platform; the old
"slim" symbols hack to alias internally used symbols has been dropped, in
favor of using `-Bsymbolic-functions` with toolchains that support it.

Uli Schlachter fixed multiple memory leaks in the code base and test suite,
and helped with many reviews and general maintenance.

Marc Jeanmougin added new API to expose the Pixman dithering filter to cairo
patterns; this is currently implemented only for image surfaces.

Release 1.17.8 (2023-01-30 Emmanuele Bassi <ebassi%gnome.org@localhost>)
==============================================================

A new cairo snapshot! And it only took less than one year, this time!

Many thanks to everyone who contributed to cairo, and especially
to (in no particular order):

- Adrian Johnson
- Khaled Hosny
- Behdad Esfahbod
- Matthias Clasen
- Uli Schlachter
- Manuel Stoeckl
- Fujii Hironori
- Tim-Philipp Müller
- Luca Bacci
- Caolán McNamara
- John Ralls

In a continuing effort to reduce the amount of legacy code, and increase
the long-term maintainability of cairo, the following backends have been
removed:

- GL and GLES drawing

Additionally, cairo's Autotools build system has been removed; from now on,
cairo will only support the Meson build system. While the end result should
be identical, further testing is appreciated.

In this snapshot, cairo gained support for rendering COLRv1 fonts, and
rendering SVG and COLRv1 fonts with custom palettes.

Support for macOS and Windows has been improved, with lots of build and bug
fixes.

Lots of safety issues have been fixed, with array bounds checking and
plugging memory leaks, as well as fixes for bugs identified via fuzzying.

This is going to be the last snapshot of the 1.17 development cycle; we only
expect minor bug fixing and improvements until the 1.18.0 release.

Release 1.17.6 (2022-03-18 Emmanuele Bassi <ebassi%gnome.org@localhost>)
==============================================================

I spy with my little eye… a cairo snapshot!

First of all, many, many thanks to everyone who contributed to cairo
during this development cycle. A special thank you goes to:

- Adrian Johnson
- Uli Schlachter

for their tireless efforts in ensuring that the lights are still on
in the cairo project.

This snapshot sees the removal of the following backends and platform
support:

- Qt4
- BeOS
- OS/2
- DirectFB
- DRM
- Cogl
- OpenVG

Thanks to all past contributors for their work on them. If you were using
any of these backends then you will need to stick to cairo 1.16.

To offset the removal of the backends above, Adrian Johnson landed the
DWrite font rendering backend on Windows.

There have been multiple improvements in the Quartz backend, courtesy of
John Ralls.

Tim-Philipp Müller has kept the Meson build in top shape.

This snapshot is going to be the **last** release of cairo with the
Autotools build system. The Meson build has seen many improvements and
it is considerably easier to maintain and faster to build.

Release 1.17.4 (2020-11-27 Bryce Harrington <bryce%bryceharrington.org@localhost>)
========================================================================

Thank you to the many people who have contributed the large number of
bug fixes and refinements since 1.17.2.

A particularly noteworthy improvement in this release is the addition of
the meson build system as an alternative to autotools.  Autotools is
still used for producing the releases, so will be the default in the
tarball and presumably will still be preferred by distro packagers of
Cairo.  It should be possible to build the release tarball using meson,
but as this is new functionality consider it still a work in progress.
The meson configuration has striven to track the autotools
implementation but be aware there may still be some differences between
the two.

Continuous Integration configurations have been added that enable
testing on a variety of platforms including Fedora, Windows MSVC, etc.
This work has helped in identifying updates and fixes including
adjusting to changes in API calls in dependencies like rsvg and
fontconfig, and to fix platform-specific build issues.

The cogl Cairo backend underwent significant development this cycle.
Cogl provides GPU accelerated drawing support.  The development work
includes implementation of core functionality, performance
optimizations, and stabilization.

Subpixel positioning support allows improved glyph outlines with the
FreeType font backend.

For a complete log of changes, please see

    https://cairographics.org/releases/ChangeLog.1.17.4

[On a personal note, this will be my last release for Cairo.  My Cairo
time availability has been non-existent (particularly this crazy past
year).  The release process is well documented and hopefully will help
whomever picks up the baton from here.]

Release 1.17.2 (2019-01-31 Bryce Harrington <bryce%bryceharrington.org@localhost>)
========================================================================
This snapshot provides the new support for writing floating point
formats as 16 bpc PNGs, with support for RGBA128F and RGB96F formats.
This new feature increases Cairo's pixman version requirement to 0.36.0.

Beyond this are a range of bugfixes and some work on establishing CI for
Cairo.

For a complete log of changes, please see

    https://cairographics.org/releases/ChangeLog.1.17.2

API Changes
-----------
None

Dependency Changes
------------------
pixman 0.36.0


To generate a diff of this commit:
cvs rdiff -u -r1.155 -r1.156 pkgsrc/graphics/cairo/Makefile
cvs rdiff -u -r1.17 -r0 pkgsrc/graphics/cairo/Makefile.common
cvs rdiff -u -r1.42 -r1.43 pkgsrc/graphics/cairo/PLIST
cvs rdiff -u -r1.64 -r1.65 pkgsrc/graphics/cairo/buildlink3.mk
cvs rdiff -u -r1.97 -r1.98 pkgsrc/graphics/cairo/distinfo
cvs rdiff -u -r1.7 -r0 pkgsrc/graphics/cairo/hacks.mk
cvs rdiff -u -r1.23 -r1.24 pkgsrc/graphics/cairo/options.mk
cvs rdiff -u -r1.16 -r0 pkgsrc/graphics/cairo/patches/patch-aa
cvs rdiff -u -r1.17 -r0 pkgsrc/graphics/cairo/patches/patch-ab
cvs rdiff -u -r1.18 -r0 pkgsrc/graphics/cairo/patches/patch-ac
cvs rdiff -u -r1.11 -r0 pkgsrc/graphics/cairo/patches/patch-ad
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/graphics/cairo/patches/patch-boilerplate_cairo-boilerplate.c \
    pkgsrc/graphics/cairo/patches/patch-perf_cairo-analyse-trace.c \
    pkgsrc/graphics/cairo/patches/patch-perf_cairo-perf-report.c \
    pkgsrc/graphics/cairo/patches/patch-perf_cairo-perf-trace.c \
    pkgsrc/graphics/cairo/patches/patch-src_cairo-arc.c \
    pkgsrc/graphics/cairo/patches/patch-src_cairo-type1-subset.c \
    pkgsrc/graphics/cairo/patches/patch-util_cairo-trace_trace.c
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/cairo/patches/patch-meson.build \
    pkgsrc/graphics/cairo/patches/patch-test_pdf-structure.c \
    pkgsrc/graphics/cairo/patches/patch-util_cairo-missing_getline.c \
    pkgsrc/graphics/cairo/patches/patch-util_meson.build
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/graphics/cairo/patches/patch-src_cairo-ft-font.c \
    pkgsrc/graphics/cairo/patches/patch-src_cairo-image-compositor.c \
    pkgsrc/graphics/cairo/patches/patch-src_cairo-quartz-image-surface.c \
    pkgsrc/graphics/cairo/patches/patch-src_cairo-quartz-surface.c

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.155 pkgsrc/graphics/cairo/Makefile:1.156
--- pkgsrc/graphics/cairo/Makefile:1.155        Sun Nov 12 13:21:51 2023
+++ pkgsrc/graphics/cairo/Makefile      Tue Nov 14 13:48:19 2023
@@ -1,21 +1,47 @@
-# $NetBSD: Makefile,v 1.155 2023/11/12 13:21:51 wiz Exp $
+# $NetBSD: Makefile,v 1.156 2023/11/14 13:48:19 wiz Exp $
 
-.include "../../graphics/cairo/Makefile.common"
+DISTNAME=      cairo-1.18.0
+CATEGORIES=    graphics
+MASTER_SITES=  https://cairographics.org/releases/
+EXTRACT_SUFX=  .tar.xz
 
-PKGREVISION=   10
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      https://cairographics.org/
+COMMENT=       Vector graphics library with cross-device output support
+LICENSE=       gnu-lgpl-v2.1 AND mpl-1.1
 
-TEST_TARGET=                   check
+USE_CC_FEATURES=       c99
+USE_LANGUAGES=         c c++
+USE_TOOLS+=            pkg-config
+
+# For snprintf() and ctime_r()
+CPPFLAGS.SunOS+=       -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS
+
+PKGCONFIG_OVERRIDE_STAGE=      post-build
+PKGCONFIG_OVERRIDE+=           output/meson-private/*.pc
+
+SUPERSEDES+=   cairo-gobject-[0-9]*
 
 .include "options.mk"
 
+.include "../../mk/bsd.prefs.mk"
+
+# see meson.build for systems that support cairo-trace
+PLIST_VARS+=   trace
+.if ${OPSYS} == "Darwin" || ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux"
+PLIST.trace=   yes
+.endif
+
+.include "../../devel/meson/build.mk"
+.include "../../lang/python/tool.mk"
 .include "../../archivers/lzo/buildlink3.mk"
+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"
-BUILDLINK_API_DEPENDS.pixman+= pixman>=0.30.0
+BUILDLINK_API_DEPENDS.pixman+= pixman>=0.36.0
 .include "../../x11/pixman/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/cairo/PLIST
diff -u pkgsrc/graphics/cairo/PLIST:1.42 pkgsrc/graphics/cairo/PLIST:1.43
--- pkgsrc/graphics/cairo/PLIST:1.42    Wed Nov 14 17:14:52 2018
+++ pkgsrc/graphics/cairo/PLIST Tue Nov 14 13:48:19 2023
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.42 2018/11/14 17:14:52 kleink Exp $
-bin/cairo-trace
+@comment $NetBSD: PLIST,v 1.43 2023/11/14 13:48:19 wiz Exp $
+${PLIST.trace}bin/cairo-trace
 include/cairo/cairo-deprecated.h
 include/cairo/cairo-features.h
-include/cairo/cairo-ft.h
+${PLIST.x11}include/cairo/cairo-ft.h
+include/cairo/cairo-gobject.h
 include/cairo/cairo-pdf.h
 include/cairo/cairo-ps.h
 ${PLIST.quartz}include/cairo/cairo-quartz-image.h
@@ -16,18 +17,27 @@ ${PLIST.xcb}include/cairo/cairo-xcb.h
 ${PLIST.x11}include/cairo/cairo-xlib-xrender.h
 ${PLIST.x11}include/cairo/cairo-xlib.h
 include/cairo/cairo.h
-lib/cairo/cairo-fdr.la
-lib/cairo/libcairo-trace.la
-lib/libcairo-script-interpreter.la
-lib/libcairo.la
-lib/pkgconfig/cairo-fc.pc
-lib/pkgconfig/cairo-ft.pc
+${PLIST.trace}lib/cairo/libcairo-fdr.so
+${PLIST.trace}lib/cairo/libcairo-trace.so
+lib/libcairo-gobject.so
+lib/libcairo-gobject.so.2
+lib/libcairo-gobject.so.2.11800.0
+lib/libcairo-script-interpreter.so
+lib/libcairo-script-interpreter.so.2
+lib/libcairo-script-interpreter.so.2.11800.0
+lib/libcairo.so
+lib/libcairo.so.2
+lib/libcairo.so.2.11800.0
+${PLIST.x11}lib/pkgconfig/cairo-fc.pc
+${PLIST.x11}lib/pkgconfig/cairo-ft.pc
+lib/pkgconfig/cairo-gobject.pc
 lib/pkgconfig/cairo-pdf.pc
 lib/pkgconfig/cairo-png.pc
 lib/pkgconfig/cairo-ps.pc
 ${PLIST.quartz}lib/pkgconfig/cairo-quartz-font.pc
 ${PLIST.quartz}lib/pkgconfig/cairo-quartz-image.pc
 ${PLIST.quartz}lib/pkgconfig/cairo-quartz.pc
+lib/pkgconfig/cairo-script-interpreter.pc
 lib/pkgconfig/cairo-script.pc
 lib/pkgconfig/cairo-svg.pc
 lib/pkgconfig/cairo-tee.pc
@@ -36,69 +46,3 @@ ${PLIST.xcb}lib/pkgconfig/cairo-xcb.pc
 ${PLIST.x11}lib/pkgconfig/cairo-xlib-xrender.pc
 ${PLIST.x11}lib/pkgconfig/cairo-xlib.pc
 lib/pkgconfig/cairo.pc
-share/gtk-doc/html/cairo/bindings-errors.html
-share/gtk-doc/html/cairo/bindings-fonts.html
-share/gtk-doc/html/cairo/bindings-memory.html
-share/gtk-doc/html/cairo/bindings-overloading.html
-share/gtk-doc/html/cairo/bindings-path.html
-share/gtk-doc/html/cairo/bindings-patterns.html
-share/gtk-doc/html/cairo/bindings-return-values.html
-share/gtk-doc/html/cairo/bindings-streams.html
-share/gtk-doc/html/cairo/bindings-surfaces.html
-share/gtk-doc/html/cairo/cairo-Error-handling.html
-share/gtk-doc/html/cairo/cairo-FreeType-Fonts.html
-share/gtk-doc/html/cairo/cairo-Image-Surfaces.html
-share/gtk-doc/html/cairo/cairo-PDF-Surfaces.html
-share/gtk-doc/html/cairo/cairo-PNG-Support.html
-share/gtk-doc/html/cairo/cairo-Paths.html
-share/gtk-doc/html/cairo/cairo-PostScript-Surfaces.html
-share/gtk-doc/html/cairo/cairo-Quartz-(CGFont)-Fonts.html
-share/gtk-doc/html/cairo/cairo-Quartz-Surfaces.html
-share/gtk-doc/html/cairo/cairo-Raster-Sources.html
-share/gtk-doc/html/cairo/cairo-Recording-Surfaces.html
-share/gtk-doc/html/cairo/cairo-Regions.html
-share/gtk-doc/html/cairo/cairo-SVG-Surfaces.html
-share/gtk-doc/html/cairo/cairo-Script-Surfaces.html
-share/gtk-doc/html/cairo/cairo-Tags-and-Links.html
-share/gtk-doc/html/cairo/cairo-Transformations.html
-share/gtk-doc/html/cairo/cairo-Types.html
-share/gtk-doc/html/cairo/cairo-User-Fonts.html
-share/gtk-doc/html/cairo/cairo-Version-Information.html
-share/gtk-doc/html/cairo/cairo-Win32-Fonts.html
-share/gtk-doc/html/cairo/cairo-Win32-Surfaces.html
-share/gtk-doc/html/cairo/cairo-XCB-Surfaces.html
-share/gtk-doc/html/cairo/cairo-XLib-Surfaces.html
-share/gtk-doc/html/cairo/cairo-XLib-XRender-Backend.html
-share/gtk-doc/html/cairo/cairo-cairo-device-t.html
-share/gtk-doc/html/cairo/cairo-cairo-font-face-t.html
-share/gtk-doc/html/cairo/cairo-cairo-font-options-t.html
-share/gtk-doc/html/cairo/cairo-cairo-matrix-t.html
-share/gtk-doc/html/cairo/cairo-cairo-pattern-t.html
-share/gtk-doc/html/cairo/cairo-cairo-scaled-font-t.html
-share/gtk-doc/html/cairo/cairo-cairo-surface-t.html
-share/gtk-doc/html/cairo/cairo-cairo-t.html
-share/gtk-doc/html/cairo/cairo-drawing.html
-share/gtk-doc/html/cairo/cairo-fonts.html
-share/gtk-doc/html/cairo/cairo-support.html
-share/gtk-doc/html/cairo/cairo-surfaces.html
-share/gtk-doc/html/cairo/cairo-text.html
-share/gtk-doc/html/cairo/cairo.devhelp2
-share/gtk-doc/html/cairo/home.png
-share/gtk-doc/html/cairo/index-1.10.html
-share/gtk-doc/html/cairo/index-1.12.html
-share/gtk-doc/html/cairo/index-1.14.html
-share/gtk-doc/html/cairo/index-1.16.html
-share/gtk-doc/html/cairo/index-1.2.html
-share/gtk-doc/html/cairo/index-1.4.html
-share/gtk-doc/html/cairo/index-1.6.html
-share/gtk-doc/html/cairo/index-1.8.html
-share/gtk-doc/html/cairo/index-all.html
-share/gtk-doc/html/cairo/index.html
-share/gtk-doc/html/cairo/language-bindings.html
-share/gtk-doc/html/cairo/left-insensitive.png
-share/gtk-doc/html/cairo/left.png
-share/gtk-doc/html/cairo/right-insensitive.png
-share/gtk-doc/html/cairo/right.png
-share/gtk-doc/html/cairo/style.css
-share/gtk-doc/html/cairo/up-insensitive.png
-share/gtk-doc/html/cairo/up.png

Index: pkgsrc/graphics/cairo/buildlink3.mk
diff -u pkgsrc/graphics/cairo/buildlink3.mk:1.64 pkgsrc/graphics/cairo/buildlink3.mk:1.65
--- pkgsrc/graphics/cairo/buildlink3.mk:1.64    Sun Nov 12 13:21:51 2023
+++ pkgsrc/graphics/cairo/buildlink3.mk Tue Nov 14 13:48:19 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.64 2023/11/12 13:21:51 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.65 2023/11/14 13:48:19 wiz Exp $
 
 BUILDLINK_TREE+=       cairo
 
@@ -6,10 +6,8 @@ BUILDLINK_TREE+=       cairo
 CAIRO_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.cairo+=  cairo>=1.0.0nb2
-BUILDLINK_ABI_DEPENDS.cairo+=  cairo>=1.16.0nb10
-BUILDLINK_PKGSRCDIR.cairo?=    ../../graphics/cairo
-
-BUILDLINK_API_DEPENDS.Xrender+=        Xrender>=0.8
+BUILDLINK_ABI_DEPENDS.cairo+=  cairo>=1.18
+BUILDLINK_PKGSRCDIR.cairo=     ../../graphics/cairo
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -21,14 +19,15 @@ pkgbase := cairo
 .endif
 
 .if ${PKG_BUILD_OPTIONS.cairo:Mx11} || ${PKG_BUILD_OPTIONS.cairo:Mxcb}
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXrender/buildlink3.mk"
 .endif
 
 .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/distinfo
diff -u pkgsrc/graphics/cairo/distinfo:1.97 pkgsrc/graphics/cairo/distinfo:1.98
--- pkgsrc/graphics/cairo/distinfo:1.97 Tue Jan 24 10:16:33 2023
+++ pkgsrc/graphics/cairo/distinfo      Tue Nov 14 13:48:19 2023
@@ -1,20 +1,9 @@
-$NetBSD: distinfo,v 1.97 2023/01/24 10:16:33 wiz Exp $
+$NetBSD: distinfo,v 1.98 2023/11/14 13:48:19 wiz Exp $
 
-BLAKE2s (cairo-1.16.0.tar.xz) = fba95926f57ad97d9c0c197c355ef646fd3cf9d17d1eb3270d343eef5d7bfa40
-SHA512 (cairo-1.16.0.tar.xz) = 9eb27c4cf01c0b8b56f2e15e651f6d4e52c99d0005875546405b64f1132aed12fbf84727273f493d84056a13105e065009d89e94a8bfaf2be2649e232b82377f
-Size (cairo-1.16.0.tar.xz) = 41997432 bytes
-SHA1 (patch-aa) = b01bc60f77a7122b0c0d0d9b25ad512bac7c190c
-SHA1 (patch-ab) = 11f7e0e59bd5c51a8fdacb48dcf2f2fefdf3b768
-SHA1 (patch-ac) = 1785bbef6bcab4781bf89e1b986a7eb96e5f2b64
-SHA1 (patch-ad) = a1068a37113b162ccfe14d7f1bd0baa9df7e5530
-SHA1 (patch-boilerplate_cairo-boilerplate.c) = 8a2099dcc6a6a0e3cd401482a563b35b447197f1
-SHA1 (patch-perf_cairo-analyse-trace.c) = 38e76dd4dbeb3d8e2eb8fe7219ba7bf98c724c31
-SHA1 (patch-perf_cairo-perf-report.c) = 34579b44238ead31aaf97dbb63347c883d23b5a3
-SHA1 (patch-perf_cairo-perf-trace.c) = 0f8cb89493a202b58b22e6244fe1c1bcc0a34b88
-SHA1 (patch-src_cairo-arc.c) = 77d1d76accf71f16de73866dd7237c9806005c72
-SHA1 (patch-src_cairo-ft-font.c) = 97288d79380473869f1049c1d8955a2f6fa3d178
-SHA1 (patch-src_cairo-image-compositor.c) = 83337d8211083d77b061c43b69da2b61080776d9
-SHA1 (patch-src_cairo-quartz-image-surface.c) = f3963afb665d70189c18de02b943313b7f7b6dcd
-SHA1 (patch-src_cairo-quartz-surface.c) = 870ff264a0046adad5a3c93e76da4684d6a365eb
-SHA1 (patch-src_cairo-type1-subset.c) = 741de4ec29cc4805aa51cbb4d89947a58dca0646
-SHA1 (patch-util_cairo-trace_trace.c) = 0979e99a2aeaeb711a9b7636a0e6ba5048f26077
+BLAKE2s (cairo-1.18.0.tar.xz) = d17e3d7a1b32769f02500ff3edaf8a7e18974873a128c61e607f05e5216e8a63
+SHA512 (cairo-1.18.0.tar.xz) = 6366c7d5e3fd3e12df2edc43aa4ed4c3a517de2ef0b1b3b30dfa8b69a7cae1dd55765801228cec308d2e9792037d0704ae49d95b7b12c06f20df092fa0534e1c
+Size (cairo-1.18.0.tar.xz) = 33761148 bytes
+SHA1 (patch-meson.build) = 3187c754af123be69e1b5651165f6310c8786558
+SHA1 (patch-test_pdf-structure.c) = dd3e5ee2cdbc19e77c2d5a60dab98195ecbe82bb
+SHA1 (patch-util_cairo-missing_getline.c) = a1068a37113b162ccfe14d7f1bd0baa9df7e5530
+SHA1 (patch-util_meson.build) = 344d29f84114b441bbfede8b77d7a2d02d756ce4

Index: pkgsrc/graphics/cairo/options.mk
diff -u pkgsrc/graphics/cairo/options.mk:1.23 pkgsrc/graphics/cairo/options.mk:1.24
--- pkgsrc/graphics/cairo/options.mk:1.23       Tue Oct  4 07:13:52 2022
+++ pkgsrc/graphics/cairo/options.mk    Tue Nov 14 13:48:19 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.23 2022/10/04 07:13:52 wiz Exp $
+# $NetBSD: options.mk,v 1.24 2023/11/14 13:48:19 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.cairo
 PKG_SUPPORTED_OPTIONS= x11 xcb
@@ -11,31 +11,23 @@ PKG_SUGGESTED_OPTIONS=      x11 xcb
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=           x11 xcb quartz
+PLIST_VARS+=   x11 xcb quartz
 
 ###
 ### X11 and XCB support (XCB implies X11)
 ###
 .if !empty(PKG_OPTIONS:Mx11) || !empty(PKG_OPTIONS:Mxcb)
-CONFIGURE_ARGS+=       --enable-xlib
-CONFIGURE_ARGS+=       --enable-xlib-xrender
-PLIST.x11=             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"
 
 .  if !empty(PKG_OPTIONS:Mxcb)
-CONFIGURE_ARGS+=       --enable-xcb
-PLIST.xcb=             yes
+PLIST.xcb=     yes
 .    include "../../x11/libxcb/buildlink3.mk"
-.  else
-CONFIGURE_ARGS+=       --disable-xcb
 .  endif
-
-.else
-CONFIGURE_ARGS+=       --disable-xlib
-CONFIGURE_ARGS+=       --disable-xlib-xrender
-CONFIGURE_ARGS+=       --disable-xcb
 .endif
 
 ###
@@ -49,13 +41,6 @@ CONFIGURE_ARGS+=     --disable-xcb
 # fonts in MacOS X system-default paths too so sticking with it will
 # not be a problem.
 .if !empty(PKG_OPTIONS:Mquartz)
-CONFIGURE_ARGS+=       --enable-quartz
-CONFIGURE_ARGS+=       --enable-quartz-font
-CONFIGURE_ARGS+=       --enable-quartz-image
-PLIST.quartz=          yes
-WARNINGS+=             "You have enabled Quartz backend. No fonts installed with pkgsrc will be found."
-.else
-CONFIGURE_ARGS+=       --disable-quartz
-CONFIGURE_ARGS+=       --disable-quartz-font
-CONFIGURE_ARGS+=       --disable-quartz-image
+PLIST.quartz=  yes
+WARNINGS+=     "You have enabled Quartz backend. No fonts installed with pkgsrc will be found."
 .endif

Added files:

Index: pkgsrc/graphics/cairo/patches/patch-meson.build
diff -u /dev/null pkgsrc/graphics/cairo/patches/patch-meson.build:1.1
--- /dev/null   Tue Nov 14 13:48:19 2023
+++ pkgsrc/graphics/cairo/patches/patch-meson.build     Tue Nov 14 13:48:19 2023
@@ -0,0 +1,14 @@
+$NetBSD: patch-meson.build,v 1.1 2023/11/14 13:48:19 wiz Exp $
+
+Look for library providing backtrace_symbols()
+
+--- meson.build.orig   2023-09-23 14:18:32.000000000 +0000
++++ meson.build
+@@ -167,6 +167,7 @@ check_thread_flags = [
+ ]
+ 
+ m_dep = cc.find_library('m', required: false)
++backtrace_dep = cc.find_library('execinfo', required: false)
+ # Used in util
+ gtk_dep = dependency('gtk+-2.0', required: get_option('gtk2-utils'))
+ 
Index: pkgsrc/graphics/cairo/patches/patch-test_pdf-structure.c
diff -u /dev/null pkgsrc/graphics/cairo/patches/patch-test_pdf-structure.c:1.1
--- /dev/null   Tue Nov 14 13:48:19 2023
+++ pkgsrc/graphics/cairo/patches/patch-test_pdf-structure.c    Tue Nov 14 13:48:19 2023
@@ -0,0 +1,14 @@
+$NetBSD: patch-test_pdf-structure.c,v 1.1 2023/11/14 13:48:19 wiz Exp $
+
+Add header for WIFEXITED and WAITSTATUS.
+
+--- test/pdf-structure.c.orig  2023-09-23 14:18:32.000000000 +0000
++++ test/pdf-structure.c
+@@ -29,6 +29,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdlib.h>
++#include <sys/wait.h>
+ 
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h> /* __unix__ */
Index: pkgsrc/graphics/cairo/patches/patch-util_cairo-missing_getline.c
diff -u /dev/null pkgsrc/graphics/cairo/patches/patch-util_cairo-missing_getline.c:1.1
--- /dev/null   Tue Nov 14 13:48:19 2023
+++ pkgsrc/graphics/cairo/patches/patch-util_cairo-missing_getline.c    Tue Nov 14 13:48:19 2023
@@ -0,0 +1,13 @@
+$NetBSD: patch-util_cairo-missing_getline.c,v 1.1 2023/11/14 13:48:19 wiz Exp $
+
+The variable name is self-explanatory :)
+
+--- util/cairo-missing/getline.c.orig  Thu Sep 13 15:45:55 2012
++++ util/cairo-missing/getline.c       Thu Sep 13 15:46:18 2012
+@@ -87,4 +87,6 @@
+     return ret;
+ }
+ #undef GETLINE_BUFFER_SIZE
++#else
++int solaris_ld_requires_at_least_one_symbol = 0;
+ #endif
Index: pkgsrc/graphics/cairo/patches/patch-util_meson.build
diff -u /dev/null pkgsrc/graphics/cairo/patches/patch-util_meson.build:1.1
--- /dev/null   Tue Nov 14 13:48:19 2023
+++ pkgsrc/graphics/cairo/patches/patch-util_meson.build        Tue Nov 14 13:48:19 2023
@@ -0,0 +1,13 @@
+$NetBSD: patch-util_meson.build,v 1.1 2023/11/14 13:48:19 wiz Exp $
+
+Use library providing backtrace_symbols()
+
+--- util/meson.build.orig      2023-09-23 14:18:32.000000000 +0000
++++ util/meson.build
+@@ -43,5 +43,5 @@ foreach util : cairo_utils
+ endforeach
+ 
+ if conf.get('CAIRO_HAS_DLSYM', 0) == 1 and cc.has_header('execinfo.h')
+-  libmallocstats = library('malloc-stats', 'malloc-stats.c', dependencies : dl_dep)
++  libmallocstats = library('malloc-stats', 'malloc-stats.c', dependencies : [dl_dep, backtrace_dep])
+ endif

Prev by Date: CVS commit: pkgsrc/mk/platform
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/mk/platform
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index