[Midnightbsd-cvs] mports [18095] trunk/graphics/cairo: cairo 1.12.18
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Mar 8 20:43:15 EDT 2015
Revision: 18095
http://svnweb.midnightbsd.org/mports/?rev=18095
Author: laffer1
Date: 2015-03-08 20:43:15 -0400 (Sun, 08 Mar 2015)
Log Message:
-----------
cairo 1.12.18
Modified Paths:
--------------
trunk/graphics/cairo/Makefile
trunk/graphics/cairo/distinfo
trunk/graphics/cairo/pkg-plist
Added Paths:
-----------
trunk/graphics/cairo/files/patch-util_cairo-sphinx_sphinx.c
Removed Paths:
-------------
trunk/graphics/cairo/files/patch-src_cairo-wideint-type-private.h
trunk/graphics/cairo/files/patch-src_cairo-xcb-surface-render.c
trunk/graphics/cairo/files/patch-src_cairoint.h
Modified: trunk/graphics/cairo/Makefile
===================================================================
--- trunk/graphics/cairo/Makefile 2015-03-09 00:30:57 UTC (rev 18094)
+++ trunk/graphics/cairo/Makefile 2015-03-09 00:43:15 UTC (rev 18095)
@@ -1,7 +1,7 @@
# $MidnightBSD$
PORTNAME= cairo
-PORTVERSION= 1.12.16
+PORTVERSION= 1.12.18
PORTREVISION= 0
PORTEPOCH?= 2
CATEGORIES= graphics
@@ -17,7 +17,7 @@
.if !defined(REFERENCE_PORT)
LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \
- libpng15.so:${PORTSDIR}/graphics/png \
+ libpng.so:${PORTSDIR}/graphics/png \
libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
GNU_CONFIGURE= yes
@@ -24,8 +24,8 @@
CONFIGURE_ARGS= --with-html-dir=${DOCSDIR} \
--disable-directfb \
--enable-tee
-USES+= libtool:keepla pathfix pkgconfig
-USE_XORG= pixman xext
+USES+= libtool pathfix pkgconfig
+USE_XORG= pixman
USE_GNOME= referencehack
USE_LDCONFIG= yes
INSTALL_TARGET= install-strip
@@ -43,7 +43,7 @@
XCB_DESC= Enable XCB (X C-language Binding) Support
GLIB_DESC= Enable GObject Functions Feature
OPTIONS_SUB= yes
-X11_USE= xorg=xrender
+X11_USE= xorg=xrender,xext
X11_CONFIGURE_ENABLE=xlib
OPENGL_USE= gl=gl xorg=glproto:both,dri2proto:both
OPENGL_CONFIGURE_ENABLE=gl
@@ -54,7 +54,7 @@
XCB_CONFIGURE_ENABLE= xcb
# this has another option --enable-xlib-xcb=auto but it is buggy.
-PLIST_SUB+= LIBVER=11202
+PLIST_SUB+= LIBVER=2.11200.18
.include <bsd.mport.options.mk>
Modified: trunk/graphics/cairo/distinfo
===================================================================
--- trunk/graphics/cairo/distinfo 2015-03-09 00:30:57 UTC (rev 18094)
+++ trunk/graphics/cairo/distinfo 2015-03-09 00:43:15 UTC (rev 18095)
@@ -1,2 +1,2 @@
-SHA256 (cairo-1.12.16.tar.xz) = 2505959eb3f1de3e1841023b61585bfd35684b9733c7b6a3643f4f4cbde6d846
-SIZE (cairo-1.12.16.tar.xz) = 35889824
+SHA256 (cairo-1.12.18.tar.xz) = dc59f0b7ac945ce4e138a03c227a29260915a8b05a4226c1f6f1be586ba7f5b6
+SIZE (cairo-1.12.18.tar.xz) = 38276736
Deleted: trunk/graphics/cairo/files/patch-src_cairo-wideint-type-private.h
===================================================================
--- trunk/graphics/cairo/files/patch-src_cairo-wideint-type-private.h 2015-03-09 00:30:57 UTC (rev 18094)
+++ trunk/graphics/cairo/files/patch-src_cairo-wideint-type-private.h 2015-03-09 00:43:15 UTC (rev 18095)
@@ -1,14 +0,0 @@
---- src/cairo-wideint-type-private.h.orig 2010-11-26 02:41:47.000000000 -0500
-+++ src/cairo-wideint-type-private.h 2010-11-26 02:42:07.000000000 -0500
-@@ -121,6 +121,11 @@ typedef struct _cairo_quorem64 {
- cairo_int64_t rem;
- } cairo_quorem64_t;
-
-+/* Intrinsic __uint128_t support is broken on gcc 3.4/sparc. */
-+#if __GNUC__ == 3 && __GNUC_MINOR__ == 4
-+#undef HAVE___UINT128_T
-+#endif
-+
- /* gcc has a non-standard name. */
- #if HAVE___UINT128_T && !HAVE_UINT128_T
- typedef __uint128_t uint128_t;
Deleted: trunk/graphics/cairo/files/patch-src_cairo-xcb-surface-render.c
===================================================================
--- trunk/graphics/cairo/files/patch-src_cairo-xcb-surface-render.c 2015-03-09 00:30:57 UTC (rev 18094)
+++ trunk/graphics/cairo/files/patch-src_cairo-xcb-surface-render.c 2015-03-09 00:43:15 UTC (rev 18095)
@@ -1,25 +0,0 @@
-From 18b3cce2f5812c357e4b6310e72d72dd9ec92ed4 Mon Sep 17 00:00:00 2001
-From: Bryce Harrington <b.harrington at samsung.com>
-Date: Tue, 06 May 2014 17:18:19 +0000
-Subject: Fix segfault in firefox when scrolling on certain pages
-
-Bug discovered by thorsten <fly_a320 at gmx.de>
-
-Patch from Chris Wilson <chris at chris-wilson.co.uk>
----
-diff --git a/src/cairo-xcb-surface-render.c b/src/cairo-xcb-surface-render.c
-index 9625953..75455e5 100644
---- src/cairo-xcb-surface-render.c
-+++ src/cairo-xcb-surface-render.c
-@@ -3121,6 +3121,9 @@ _clip_and_composite_boxes (cairo_xcb_surface_t *dst,
-
- clip = _cairo_clip_copy (extents->clip);
- clip = _cairo_clip_intersect_boxes (clip, boxes);
-+ if (_cairo_clip_is_all_clipped (clip))
-+ return CAIRO_INT_STATUS_NOTHING_TO_DO;
-+
- status = _cairo_clip_get_polygon (clip, &polygon,
- &fill_rule, &antialias);
- _cairo_clip_path_destroy (clip->path);
---
-cgit v0.9.0.2-2-gbebe
Deleted: trunk/graphics/cairo/files/patch-src_cairoint.h
===================================================================
--- trunk/graphics/cairo/files/patch-src_cairoint.h 2015-03-09 00:30:57 UTC (rev 18094)
+++ trunk/graphics/cairo/files/patch-src_cairoint.h 2015-03-09 00:43:15 UTC (rev 18095)
@@ -1,14 +0,0 @@
---- src/cairoint.h.orig Sun Oct 15 18:02:35 2006
-+++ src/cairoint.h Sun Oct 15 18:10:11 2006
-@@ -50,6 +50,11 @@
- #include "config.h"
- #endif
-
-+#ifndef INT16_MAX
-+#define INT16_MAX 0x7fff
-+#define INT16_MIN (-0x7fff-1)
-+#endif
-+
- #include <assert.h>
- #include <stdlib.h>
- #include <string.h>
Added: trunk/graphics/cairo/files/patch-util_cairo-sphinx_sphinx.c
===================================================================
--- trunk/graphics/cairo/files/patch-util_cairo-sphinx_sphinx.c (rev 0)
+++ trunk/graphics/cairo/files/patch-util_cairo-sphinx_sphinx.c 2015-03-09 00:43:15 UTC (rev 18095)
@@ -0,0 +1,11 @@
+--- util/cairo-sphinx/sphinx.c.orig 2014-10-06 15:22:24.000000000 -0400
++++ util/cairo-sphinx/sphinx.c 2014-10-06 15:23:04.000000000 -0400
+@@ -1325,7 +1325,7 @@ client_shm (const char *shm_path)
+
+ base = mmap (NULL, DATA_SIZE,
+ PROT_READ | PROT_WRITE,
+- MAP_SHARED | MAP_NORESERVE,
++ MAP_SHARED,
+ fd, 0);
+ close (fd);
+
Property changes on: trunk/graphics/cairo/files/patch-util_cairo-sphinx_sphinx.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/graphics/cairo/pkg-plist
===================================================================
--- trunk/graphics/cairo/pkg-plist 2015-03-09 00:30:57 UTC (rev 18094)
+++ trunk/graphics/cairo/pkg-plist 2015-03-09 00:43:15 UTC (rev 18095)
@@ -17,28 +17,28 @@
%%X11%%include/cairo/cairo-xlib.h
include/cairo/cairo.h
lib/cairo/cairo-fdr.a
-lib/cairo/cairo-fdr.la
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.la
lib/cairo/cairo-sphinx.so
lib/cairo/cairo-sphinx.so.0
+lib/cairo/cairo-sphinx.so.0.0.0
lib/cairo/libcairo-trace.a
-lib/cairo/libcairo-trace.la
lib/cairo/libcairo-trace.so
lib/cairo/libcairo-trace.so.0
+lib/cairo/libcairo-trace.so.0.0.0
%%GLIB%%lib/libcairo-gobject.a
-%%GLIB%%lib/libcairo-gobject.la
%%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.la
lib/libcairo-script-interpreter.so
+lib/libcairo-script-interpreter.so.2
lib/libcairo-script-interpreter.so.%%LIBVER%%
lib/libcairo.a
-lib/libcairo.la
lib/libcairo.so
+lib/libcairo.so.2
lib/libcairo.so.%%LIBVER%%
libdata/pkgconfig/cairo.pc
libdata/pkgconfig/cairo-fc.pc
@@ -57,5 +57,3 @@
%%X11%%libdata/pkgconfig/cairo-xlib.pc
@comment %%X11%%%%XCB%%libdata/pkgconfig/cairo-xlib-xcb.pc
%%X11%%libdata/pkgconfig/cairo-xlib-xrender.pc
- at dirrm include/cairo
- at dirrm lib/cairo
More information about the Midnightbsd-cvs
mailing list