[Midnightbsd-cvs] mports [24095] trunk/graphics/cairo: update cairo

Sun Sep 2 19:19:08 EDT 2018

Revision: 24095
          http://svnweb.midnightbsd.org/mports/?rev=24095
Author:   laffer1
Date:     2018-09-02 19:19:07 -0400 (Sun, 02 Sep 2018)
Log Message:
-----------
update cairo

Modified Paths:
--------------
    trunk/graphics/cairo/Makefile
    trunk/graphics/cairo/distinfo
    trunk/graphics/cairo/pkg-plist

Modified: trunk/graphics/cairo/Makefile
===================================================================

--- trunk/graphics/cairo/Makefile	2018-09-02 23:07:30 UTC (rev 24094)
+++ trunk/graphics/cairo/Makefile	2018-09-02 23:19:07 UTC (rev 24095)
@@ -1,9 +1,9 @@
 # $MidnightBSD$
 
 PORTNAME=	cairo
-PORTVERSION=	1.14.12
-PORTREVISION=	0
-PORTEPOCH?=	2
+PORTVERSION=	1.14.8
+PORTREVISION=	1
+PORTEPOCH=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://cairographics.org/releases/
 
@@ -21,11 +21,16 @@
 		libpng.so:graphics/png \
 		libfontconfig.so:x11-fonts/fontconfig
 
+PORTSCOUT=	skipv:5c-1.1,5c-1.2,5c-1.5
+
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-html-dir=${DOCSDIR} \
+		--disable-directfb \
+		--enable-tee
 USES+=		cpe gnome libtool pathfix pkgconfig
 CPE_VENDOR=	cairographics
-USE_XORG=	pixman xrender xext x11
-USE_GNOME=	referencehack glib20
+USE_XORG=	pixman
+USE_GNOME=	referencehack
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
@@ -34,26 +39,33 @@
 		--disable-gallium \
 		--disable-glesv2 \
 		--disable-wgl \
-		--enable-tee \
-		--enable-gobject \
-		--enable-xlib \
-		--enable-png
+		--enable-tee
 
-OPTIONS_DEFINE=	OPENGL XCB
-OPTIONS_DEFAULT=OPENGL XCB
+OPTIONS_DEFINE=	OPENGL XCB GLIB X11
+OPTIONS_DEFAULT=OPENGL XCB GLIB X11
+OPTIONS_SLAVE=	${ARCH:tu}
 XCB_DESC=	Enable XCB (X C-language Binding) Support
+GLIB_DESC=	Enable GObject Functions Feature
 OPTIONS_SUB=	yes
+X11_USE=	xorg=x11,xext,xrender
+X11_CONFIGURE_ENABLE=xlib
 OPENGL_USE=	gl=gl,egl xorg=glproto:both,dri2proto:both
 OPENGL_CONFIGURE_ENABLE=gl egl
+OPENGL_IMPLIES=	X11
+GLIB_USES=	gettext-runtime
+GLIB_USE=	gnome=glib20
+GLIB_CONFIGURE_ENABLE=	gobject
 XCB_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:x11/xcb-util-renderutil
 XCB_RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:x11/xcb-util-renderutil
+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"
 
-.include <bsd.mport.options.mk>
+PLIST_SUB+=	LIBVER=2.11400.8
 
-PLIST_SUB+=	LIBVER=2.11400.12
-
 post-patch:
 	@${REINPLACE_CMD} -e '/strings/s/ - / -a /' \
 		-e '/test/s/==/=/g' \
@@ -67,10 +79,6 @@
 	@${REINPLACE_CMD} -e 's|-ldl||g' \
 		${WRKSRC}/util/*/Makefile.in \
 		${WRKSRC}/boilerplate/Makefile.in
-.if ${PORT_OPTIONS:MOPENGL}
-	@${REINPLACE_CMD} 's|@CAIRO_CFLAGS@|-I$$(top_srcdir)/src/glew &|' \
-		${WRKSRC}/src/Makefile.in
-.endif
 
 .include <bsd.port.mk>
 

Modified: trunk/graphics/cairo/distinfo
===================================================================
--- trunk/graphics/cairo/distinfo	2018-09-02 23:07:30 UTC (rev 24094)
+++ trunk/graphics/cairo/distinfo	2018-09-02 23:19:07 UTC (rev 24095)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1525784046
-SHA256 (cairo-1.14.12.tar.xz) = 8c90f00c500b2299c0a323dd9beead2a00353752b2092ead558139bd67f7bf16
-SIZE (cairo-1.14.12.tar.xz) = 36251896
+TIMESTAMP = 1488198143
+SHA256 (cairo-1.14.8.tar.xz) = d1f2d98ae9a4111564f6de4e013d639cf77155baf2556582295a0f00a9bc5e20
+SIZE (cairo-1.14.8.tar.xz) = 35392464

Modified: trunk/graphics/cairo/pkg-plist
===================================================================
--- trunk/graphics/cairo/pkg-plist	2018-09-02 23:07:30 UTC (rev 24094)
+++ trunk/graphics/cairo/pkg-plist	2018-09-02 23:19:07 UTC (rev 24095)
@@ -1,10 +1,10 @@
-bin/cairo-sphinx
+%%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
-include/cairo/cairo-gobject.h
+%%GLIB%%include/cairo/cairo-gobject.h
 include/cairo/cairo-pdf.h
 include/cairo/cairo-ps.h
 include/cairo/cairo-script-interpreter.h
@@ -13,25 +13,25 @@
 include/cairo/cairo-tee.h
 include/cairo/cairo-version.h
 %%XCB%%include/cairo/cairo-xcb.h
-include/cairo/cairo-xlib-xrender.h
-include/cairo/cairo-xlib.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
 lib/cairo/cairo-fdr.so.0
 lib/cairo/cairo-fdr.so.0.0.0
-lib/cairo/cairo-sphinx.a
-lib/cairo/cairo-sphinx.so
-lib/cairo/cairo-sphinx.so.0
-lib/cairo/cairo-sphinx.so.0.0.0
+%%GLIB%%lib/cairo/cairo-sphinx.a
+%%GLIB%%lib/cairo/cairo-sphinx.so
+%%GLIB%%lib/cairo/cairo-sphinx.so.0
+%%GLIB%%lib/cairo/cairo-sphinx.so.0.0.0
 lib/cairo/libcairo-trace.a
 lib/cairo/libcairo-trace.so
 lib/cairo/libcairo-trace.so.0
 lib/cairo/libcairo-trace.so.0.0.0
-lib/libcairo-gobject.a
-lib/libcairo-gobject.so
-lib/libcairo-gobject.so.2
-lib/libcairo-gobject.so.%%LIBVER%%
+%%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
@@ -41,12 +41,12 @@
 lib/libcairo.so.2
 lib/libcairo.so.%%LIBVER%%
 libdata/pkgconfig/cairo.pc
- at comment only when EGL is on? libdata/pkgconfig/cairo-egl.pc
+%%OPENGL%%libdata/pkgconfig/cairo-egl.pc
 libdata/pkgconfig/cairo-fc.pc
 libdata/pkgconfig/cairo-ft.pc
 %%OPENGL%%libdata/pkgconfig/cairo-gl.pc
 %%OPENGL%%libdata/pkgconfig/cairo-glx.pc
-libdata/pkgconfig/cairo-gobject.pc
+%%GLIB%%libdata/pkgconfig/cairo-gobject.pc
 libdata/pkgconfig/cairo-pdf.pc
 libdata/pkgconfig/cairo-png.pc
 libdata/pkgconfig/cairo-ps.pc
@@ -55,6 +55,6 @@
 libdata/pkgconfig/cairo-tee.pc
 %%XCB%%libdata/pkgconfig/cairo-xcb.pc
 %%XCB%%libdata/pkgconfig/cairo-xcb-shm.pc
-libdata/pkgconfig/cairo-xlib.pc
- at comment %%XCB%%libdata/pkgconfig/cairo-xlib-xcb.pc
-libdata/pkgconfig/cairo-xlib-xrender.pc
+%%X11%%libdata/pkgconfig/cairo-xlib.pc
+ at comment %%X11%%%%XCB%%libdata/pkgconfig/cairo-xlib-xcb.pc
+%%X11%%libdata/pkgconfig/cairo-xlib-xrender.pc

