diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile index c1fae2aedb15..1bc9dc1fe9a1 100644 --- a/graphics/cairo/Makefile +++ b/graphics/cairo/Makefile @@ -1,94 +1,96 @@ # Created by: Michael Johnson PORTNAME= cairo -PORTVERSION= 1.16.0 # update to 1.17.2 causes problems, see bug#249290 +DISTVERSION= 1.17.4 PORTEPOCH= 3 -PORTREVISION= 1 CATEGORIES= graphics -MASTER_SITES= http://cairographics.org/releases/ \ - http://cairographics.org/snapshots/ +MASTER_SITES= https://cairographics.org/releases/ \ + https://cairographics.org/snapshots/ + +PATCH_SITES= https://gitlab.freedesktop.org/${PORTNAME}/${PORTNAME}/commit/ +PATCHFILES= ebbaebdec12878836fc84d31c59ee324e67abc05.patch:-p1 # cairo-script-interpreter.pc MAINTAINER= desktop@FreeBSD.org COMMENT= Vector graphics library with cross-device output support LICENSE= LGPL21 MPL11 LICENSE_COMB= dual LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING-LGPL-2.1 LICENSE_FILE_MPL11= ${WRKSRC}/COPYING-MPL-1.1 LIB_DEPENDS= libfreetype.so:print/freetype2 \ libpng.so:graphics/png \ libfontconfig.so:x11-fonts/fontconfig PORTSCOUT= skipv:5c-1.1,5c-1.2,5c-1.5 -USES= cpe gnome libtool pathfix pkgconfig tar:xz xorg +USES= autoreconf cpe gnome libtool pathfix pkgconfig tar:xz xorg CPE_VENDOR= cairographics USE_XORG= pixman USE_LDCONFIG= yes INSTALL_TARGET= install-strip GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-html-dir=${DOCSDIR} \ --disable-directfb \ --disable-gallium \ --disable-wgl \ --enable-tee OPTIONS_RADIO= GL OPTIONS_RADIO_GL= OPENGL GLESV2 OPTIONS_DEFINE= XCB GLIB X11 DOCS OPTIONS_DEFAULT=OPENGL XCB GLIB X11 OPTIONS_SLAVE= ${ARCH:tu} OPTIONS_SUB= yes X11_USES= xorg X11_USE= xorg=x11,xext,xorgproto,xrender X11_CONFIGURE_ENABLE=xlib X11_CONFIGURE_OFF=--disable-glx OPENGL_USES= gl OPENGL_USE= gl=egl OPENGL_CONFIGURE_ENABLE=gl egl GLESV2_USES= gl GLESV2_USE= gl=glesv2 GLESV2_DESC= Enable GLESv2 rendering GLESV2_CONFIGURE_ENABLE=glesv2 GLIB_DESC= Enable GObject Functions Feature GLIB_USES= gettext-runtime GLIB_USE= gnome=glib20 GLIB_CONFIGURE_ENABLE= gobject XCB_DESC= Enable XCB (X C-language Binding) Support XCB_USES= xorg XCB_USE= xorg=xcb XCB_CONFIGURE_ENABLE= xcb # this has another option --enable-xlib-xcb=auto but it is buggy. MIPS_BUILD_DEPENDS= ${LOCALBASE}/include/atomic_ops.h:devel/libatomic_ops MIPS_USES= localbase MIPS_CONFIGURE_ENV= cairo_cv_atomic_primitives="libatomic-ops" -PLIST_SUB+= LIBVER=2.11600.0 +PLIST_SUB+= LIBVER=2.11704.0 post-patch: @${REINPLACE_CMD} -e '/strings/s/ - / -a /' \ -e '/test/s/==/=/g' \ -e '/LIBS/s/-lrt//' -e '/LIBS/s|-ldld||' \ -e '/LIBS/s|-ldl||' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|-lcairo|-lcairo -lpthread|' \ ${WRKSRC}/src/*.pc.in @${REINPLACE_CMD} -e '/@CAIRO_HAS_PNG_FUNCTIONS_TRUE@.*=/d' \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|-ldl||g' \ ${WRKSRC}/util/*/Makefile.in \ ${WRKSRC}/boilerplate/Makefile.in post-patch-DOCS-off: @${REINPLACE_CMD} -e 's|public||g' \ ${WRKSRC}/doc/Makefile.in .include diff --git a/graphics/cairo/distinfo b/graphics/cairo/distinfo index 74b2a57b9a05..d5c1b5bfc06e 100644 --- a/graphics/cairo/distinfo +++ b/graphics/cairo/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1542402739 -SHA256 (cairo-1.16.0.tar.xz) = 5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331 -SIZE (cairo-1.16.0.tar.xz) = 41997432 +TIMESTAMP = 1618524411 +SHA256 (cairo-1.17.4.tar.xz) = 74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705 +SIZE (cairo-1.17.4.tar.xz) = 41834076 +SHA256 (ebbaebdec12878836fc84d31c59ee324e67abc05.patch) = 8b8f19ed74def2d663942fe596206ae21e4186fddf5c51097cb31ab6941cc6c8 +SIZE (ebbaebdec12878836fc84d31c59ee324e67abc05.patch) = 4272 diff --git a/graphics/cairo/pkg-plist b/graphics/cairo/pkg-plist index b165ef9b8bb0..be6b3fb8e1d8 100644 --- a/graphics/cairo/pkg-plist +++ b/graphics/cairo/pkg-plist @@ -1,120 +1,118 @@ -%%GLIB%%bin/cairo-sphinx bin/cairo-trace include/cairo/cairo-deprecated.h include/cairo/cairo-features.h include/cairo/cairo-ft.h %%OPENGL%%include/cairo/cairo-gl.h %%GLIB%%include/cairo/cairo-gobject.h include/cairo/cairo-pdf.h include/cairo/cairo-ps.h include/cairo/cairo-script-interpreter.h include/cairo/cairo-script.h include/cairo/cairo-svg.h include/cairo/cairo-tee.h include/cairo/cairo-version.h %%XCB%%include/cairo/cairo-xcb.h %%X11%%include/cairo/cairo-xlib-xrender.h %%X11%%include/cairo/cairo-xlib.h include/cairo/cairo.h lib/cairo/cairo-fdr.a lib/cairo/cairo-fdr.so -%%GLIB%%lib/cairo/cairo-sphinx.a -%%GLIB%%lib/cairo/cairo-sphinx.so lib/cairo/libcairo-trace.a lib/cairo/libcairo-trace.so %%GLIB%%lib/libcairo-gobject.a %%GLIB%%lib/libcairo-gobject.so %%GLIB%%lib/libcairo-gobject.so.2 %%GLIB%%lib/libcairo-gobject.so.%%LIBVER%% lib/libcairo-script-interpreter.a lib/libcairo-script-interpreter.so lib/libcairo-script-interpreter.so.2 lib/libcairo-script-interpreter.so.%%LIBVER%% lib/libcairo.a lib/libcairo.so lib/libcairo.so.2 lib/libcairo.so.%%LIBVER%% %%OPENGL%%libdata/pkgconfig/cairo-egl.pc libdata/pkgconfig/cairo-fc.pc libdata/pkgconfig/cairo-ft.pc %%OPENGL%%libdata/pkgconfig/cairo-gl.pc %%GLESV2%%libdata/pkgconfig/cairo-glesv2.pc %%OPENGL%%%%X11%%libdata/pkgconfig/cairo-glx.pc %%GLIB%%libdata/pkgconfig/cairo-gobject.pc libdata/pkgconfig/cairo-pdf.pc libdata/pkgconfig/cairo-png.pc libdata/pkgconfig/cairo-ps.pc libdata/pkgconfig/cairo-script.pc +libdata/pkgconfig/cairo-script-interpreter.pc libdata/pkgconfig/cairo-svg.pc libdata/pkgconfig/cairo-tee.pc %%XCB%%libdata/pkgconfig/cairo-xcb-shm.pc %%XCB%%libdata/pkgconfig/cairo-xcb.pc %%X11%%libdata/pkgconfig/cairo-xlib-xrender.pc %%X11%%libdata/pkgconfig/cairo-xlib.pc libdata/pkgconfig/cairo.pc %%PORTDOCS%%%%DOCSDIR%%/cairo/bindings-errors.html %%PORTDOCS%%%%DOCSDIR%%/cairo/bindings-fonts.html %%PORTDOCS%%%%DOCSDIR%%/cairo/bindings-memory.html %%PORTDOCS%%%%DOCSDIR%%/cairo/bindings-overloading.html %%PORTDOCS%%%%DOCSDIR%%/cairo/bindings-path.html %%PORTDOCS%%%%DOCSDIR%%/cairo/bindings-patterns.html %%PORTDOCS%%%%DOCSDIR%%/cairo/bindings-return-values.html %%PORTDOCS%%%%DOCSDIR%%/cairo/bindings-streams.html %%PORTDOCS%%%%DOCSDIR%%/cairo/bindings-surfaces.html %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Error-handling.html %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-FreeType-Fonts.html %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Image-Surfaces.html %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-PDF-Surfaces.html %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-PNG-Support.html %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Paths.html %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-PostScript-Surfaces.html %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Quartz-(CGFont)-Fonts.html %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Quartz-Surfaces.html %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Raster-Sources.html %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Recording-Surfaces.html %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Regions.html %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-SVG-Surfaces.html %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Script-Surfaces.html %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Tags-and-Links.html %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Transformations.html %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Types.html %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-User-Fonts.html %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Version-Information.html %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Win32-Fonts.html %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Win32-Surfaces.html %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-XCB-Surfaces.html %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-XLib-Surfaces.html %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-XLib-XRender-Backend.html %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-cairo-device-t.html %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-cairo-font-face-t.html %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-cairo-font-options-t.html %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-cairo-matrix-t.html %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-cairo-pattern-t.html %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-cairo-scaled-font-t.html %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-cairo-surface-t.html %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-cairo-t.html %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-drawing.html %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-fonts.html %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-support.html %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-surfaces.html %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-text.html %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo.devhelp2 %%PORTDOCS%%%%DOCSDIR%%/cairo/home.png %%PORTDOCS%%%%DOCSDIR%%/cairo/index-1.10.html %%PORTDOCS%%%%DOCSDIR%%/cairo/index-1.12.html %%PORTDOCS%%%%DOCSDIR%%/cairo/index-1.14.html %%PORTDOCS%%%%DOCSDIR%%/cairo/index-1.16.html %%PORTDOCS%%%%DOCSDIR%%/cairo/index-1.2.html %%PORTDOCS%%%%DOCSDIR%%/cairo/index-1.4.html %%PORTDOCS%%%%DOCSDIR%%/cairo/index-1.6.html %%PORTDOCS%%%%DOCSDIR%%/cairo/index-1.8.html %%PORTDOCS%%%%DOCSDIR%%/cairo/index-all.html %%PORTDOCS%%%%DOCSDIR%%/cairo/index.html %%PORTDOCS%%%%DOCSDIR%%/cairo/language-bindings.html %%PORTDOCS%%%%DOCSDIR%%/cairo/left-insensitive.png %%PORTDOCS%%%%DOCSDIR%%/cairo/left.png %%PORTDOCS%%%%DOCSDIR%%/cairo/right-insensitive.png %%PORTDOCS%%%%DOCSDIR%%/cairo/right.png %%PORTDOCS%%%%DOCSDIR%%/cairo/style.css %%PORTDOCS%%%%DOCSDIR%%/cairo/up-insensitive.png %%PORTDOCS%%%%DOCSDIR%%/cairo/up.png