update to cairo 1.10.0
proactive fallout handling and ok ajacoutot@ jasper@ landry@
This commit is contained in:
eric
parent
842da8d68a
commit
454cff8d2e
@ -1,19 +1,22 @@
|
||||
# $OpenBSD: Makefile,v 1.27 2010/04/02 08:21:14 eric Exp $
|
||||
# $OpenBSD: Makefile,v 1.28 2010/10/11 08:09:44 eric Exp $
|
||||
|
||||
COMMENT= vector graphics library
|
||||
|
||||
DISTNAME= cairo-1.8.10
|
||||
PKGNAME= ${DISTNAME}p0
|
||||
SHARED_LIBS= cairo 9.3
|
||||
DISTNAME= cairo-1.10.0
|
||||
SHARED_LIBS= cairo 10.0
|
||||
SHARED_LIBS+= cairo-trace 0.0
|
||||
SHARED_LIBS+= cairo-gobject 0.0
|
||||
SHARED_LIBS+= cairo-script-interpreter 0.0
|
||||
CATEGORIES= graphics
|
||||
|
||||
HOMEPAGE= http://cairographics.org/introduction
|
||||
|
||||
MAINTAINER= Eric Faurot <eric@openbsd.org>
|
||||
|
||||
WANTLIB= X11 Xau Xdmcp Xrender expat fontconfig freetype m \
|
||||
pixman-1.>=12.0 pthread-stubs xcb xcb-render \
|
||||
xcb-render-util z
|
||||
WANTLIB= GL X11 X11-xcb Xau Xdamage Xdmcp Xext Xfixes Xrender \
|
||||
Xxf86vm drm expat fontconfig freetype glib-2.0 \
|
||||
gobject-2.0 gthread-2.0 m pcre pixman-1 png \
|
||||
pthread-stubs xcb xcb-render xcb-shm z
|
||||
|
||||
# LGPLv2.1 / MPL 1.1
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
@ -23,18 +26,23 @@ PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
MASTER_SITES= http://cairographics.org/releases/
|
||||
|
||||
MODULES= devel/gettext
|
||||
|
||||
USE_X11= Yes
|
||||
USE_LIBTOOL= Yes
|
||||
USE_GMAKE= Yes
|
||||
|
||||
LIB_DEPENDS= png::graphics/png \
|
||||
glitz.>=2:glitz->=0.5.6:graphics/glitz
|
||||
LIB_DEPENDS= ::graphics/png \
|
||||
::devel/glib2
|
||||
|
||||
CONFIGURE_STYLE= gnu
|
||||
CONFIGURE_ARGS= --enable-glitz \
|
||||
--enable-pdf \
|
||||
--enable-ps \
|
||||
--enable-xcb
|
||||
CONFIGURE_ENV= PTHREAD_LIBS="-pthread"
|
||||
CONFIGURE_ARGS= --enable-gl \
|
||||
--enable-xml \
|
||||
--enable-xcb \
|
||||
--enable-xlib-xcb \
|
||||
--disable-silent-rules
|
||||
|
||||
|
||||
REGRESS_DEPENDS= :ghostscript-*:print/ghostscript/gnu
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (cairo-1.8.10.tar.gz) = tgqC9AX5QAu/3PhQsXKNJQ==
|
||||
RMD160 (cairo-1.8.10.tar.gz) = lTi68w+BK5UL7rk4k/RtEiP7RM4=
|
||||
SHA1 (cairo-1.8.10.tar.gz) = /V6MqC/w6FQupMUWEsrTh/KknfM=
|
||||
SHA256 (cairo-1.8.10.tar.gz) = VyutoVWW7IcIOS2xr4uToa91ykdpA0gVTihB86bwhDk=
|
||||
SIZE (cairo-1.8.10.tar.gz) = 7102657
|
||||
MD5 (cairo-1.10.0.tar.gz) = cKLs5mz0c9l24tsPdb8Zng==
|
||||
RMD160 (cairo-1.10.0.tar.gz) = +mXU85JjCIV9E/PtDBAPifB13AE=
|
||||
SHA1 (cairo-1.10.0.tar.gz) = 7+fkdAjVGIaQIozK3IUjZS9r9wI=
|
||||
SHA256 (cairo-1.10.0.tar.gz) = DyzkzEYVWUCI1064tTYLrXw8w8Pam2Gvm/2XntHtlLI=
|
||||
SIZE (cairo-1.10.0.tar.gz) = 24022822
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-src_Makefile_in,v 1.4 2010/03/29 13:13:53 eric Exp $
|
||||
--- src/Makefile.in.orig Sat Feb 20 01:25:38 2010
|
||||
+++ src/Makefile.in Thu Mar 4 21:47:57 2010
|
||||
@@ -1488,7 +1488,7 @@ cairo.def: cairo-features.h $(enabled_cairo_headers)
|
||||
$OpenBSD: patch-src_Makefile_in,v 1.5 2010/10/11 08:09:44 eric Exp $
|
||||
--- src/Makefile.in.orig Mon Sep 6 18:16:41 2010
|
||||
+++ src/Makefile.in Mon Sep 13 17:44:05 2010
|
||||
@@ -2425,7 +2425,7 @@ cairo.def: cairo-features.h $(enabled_cairo_headers)
|
||||
) >$@
|
||||
@ ! grep -q cairo_ERROR $@ || ($(RM) $@; false)
|
||||
|
||||
|
||||
12
graphics/cairo/patches/patch-src_cairo_h
Normal file
12
graphics/cairo/patches/patch-src_cairo_h
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-src_cairo_h,v 1.1 2010/10/11 08:09:44 eric Exp $
|
||||
--- src/cairo.h.orig Sat Oct 9 10:54:20 2010
|
||||
+++ src/cairo.h Sat Oct 9 10:54:10 2010
|
||||
@@ -1973,7 +1973,7 @@ typedef enum _cairo_device_type {
|
||||
CAIRO_DEVICE_TYPE_SCRIPT,
|
||||
CAIRO_DEVICE_TYPE_XCB,
|
||||
CAIRO_DEVICE_TYPE_XLIB,
|
||||
- CAIRO_DEVICE_TYPE_XML,
|
||||
+ CAIRO_DEVICE_TYPE_XML
|
||||
} cairo_device_type_t;
|
||||
|
||||
cairo_public cairo_device_type_t
|
||||
@ -1,2 +1,5 @@
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.3 2005/12/26 22:34:27 steven Exp $
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.4 2010/10/11 08:09:44 eric Exp $
|
||||
@lib lib/cairo/libcairo-trace.so.${LIBcairo-trace_VERSION}
|
||||
@lib lib/libcairo-gobject.so.${LIBcairo-gobject_VERSION}
|
||||
@lib lib/libcairo-script-interpreter.so.${LIBcairo-script-interpreter_VERSION}
|
||||
@lib lib/libcairo.so.${LIBcairo_VERSION}
|
||||
|
||||
@ -1,31 +1,47 @@
|
||||
@comment $OpenBSD: PLIST,v 1.7 2010/04/02 08:21:14 eric Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.8 2010/10/11 08:09:44 eric Exp $
|
||||
%%SHARED%%
|
||||
bin/cairo-trace
|
||||
include/cairo/
|
||||
include/cairo/cairo-deprecated.h
|
||||
include/cairo/cairo-features.h
|
||||
include/cairo/cairo-ft.h
|
||||
include/cairo/cairo-glitz.h
|
||||
include/cairo/cairo-gl.h
|
||||
include/cairo/cairo-gobject.h
|
||||
include/cairo/cairo-pdf.h
|
||||
include/cairo/cairo-ps.h
|
||||
include/cairo/cairo-script-interpreter.h
|
||||
include/cairo/cairo-svg.h
|
||||
include/cairo/cairo-version.h
|
||||
include/cairo/cairo-xcb-xrender.h
|
||||
include/cairo/cairo-xcb.h
|
||||
include/cairo/cairo-xlib-xrender.h
|
||||
include/cairo/cairo-xlib.h
|
||||
include/cairo/cairo-xml.h
|
||||
include/cairo/cairo.h
|
||||
lib/cairo/
|
||||
lib/cairo/libcairo-trace.a
|
||||
lib/cairo/libcairo-trace.la
|
||||
lib/libcairo-gobject.a
|
||||
lib/libcairo-gobject.la
|
||||
lib/libcairo-script-interpreter.a
|
||||
lib/libcairo-script-interpreter.la
|
||||
lib/libcairo.a
|
||||
lib/libcairo.la
|
||||
lib/pkgconfig/
|
||||
lib/pkgconfig/cairo-fc.pc
|
||||
lib/pkgconfig/cairo-ft.pc
|
||||
lib/pkgconfig/cairo-glitz.pc
|
||||
lib/pkgconfig/cairo-gl.pc
|
||||
lib/pkgconfig/cairo-glx.pc
|
||||
lib/pkgconfig/cairo-gobject.pc
|
||||
lib/pkgconfig/cairo-pdf.pc
|
||||
lib/pkgconfig/cairo-png.pc
|
||||
lib/pkgconfig/cairo-ps.pc
|
||||
lib/pkgconfig/cairo-svg.pc
|
||||
lib/pkgconfig/cairo-xcb-shm.pc
|
||||
lib/pkgconfig/cairo-xcb.pc
|
||||
lib/pkgconfig/cairo-xlib-xcb.pc
|
||||
lib/pkgconfig/cairo-xlib-xrender.pc
|
||||
lib/pkgconfig/cairo-xlib.pc
|
||||
lib/pkgconfig/cairo-xml.pc
|
||||
lib/pkgconfig/cairo.pc
|
||||
share/gtk-doc/
|
||||
share/gtk-doc/html/
|
||||
@ -39,38 +55,41 @@ 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-context.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-Regions.html
|
||||
share/gtk-doc/html/cairo/cairo-SVG-Surfaces.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-XLib-Surfaces.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-error-status.html
|
||||
share/gtk-doc/html/cairo/cairo-font-face.html
|
||||
share/gtk-doc/html/cairo/cairo-font-options.html
|
||||
share/gtk-doc/html/cairo/cairo-fonts.html
|
||||
share/gtk-doc/html/cairo/cairo-ft-font.html
|
||||
share/gtk-doc/html/cairo/cairo-image-surface.html
|
||||
share/gtk-doc/html/cairo/cairo-matrix.html
|
||||
share/gtk-doc/html/cairo/cairo-paths.html
|
||||
share/gtk-doc/html/cairo/cairo-pattern.html
|
||||
share/gtk-doc/html/cairo/cairo-pdf-surface.html
|
||||
share/gtk-doc/html/cairo/cairo-png-functions.html
|
||||
share/gtk-doc/html/cairo/cairo-ps-surface.html
|
||||
share/gtk-doc/html/cairo/cairo-quartz-font.html
|
||||
share/gtk-doc/html/cairo/cairo-quartz-surface.html
|
||||
share/gtk-doc/html/cairo/cairo-scaled-font.html
|
||||
share/gtk-doc/html/cairo/cairo-support.html
|
||||
share/gtk-doc/html/cairo/cairo-surface.html
|
||||
share/gtk-doc/html/cairo/cairo-surfaces.html
|
||||
share/gtk-doc/html/cairo/cairo-svg-surface.html
|
||||
share/gtk-doc/html/cairo/cairo-text.html
|
||||
share/gtk-doc/html/cairo/cairo-transformations.html
|
||||
share/gtk-doc/html/cairo/cairo-types.html
|
||||
share/gtk-doc/html/cairo/cairo-user-font.html
|
||||
share/gtk-doc/html/cairo/cairo-version-info.html
|
||||
share/gtk-doc/html/cairo/cairo-win32-font.html
|
||||
share/gtk-doc/html/cairo/cairo-win32-surface.html
|
||||
share/gtk-doc/html/cairo/cairo-xlib-surface.html
|
||||
share/gtk-doc/html/cairo/cairo.devhelp
|
||||
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.2.html
|
||||
share/gtk-doc/html/cairo/index-1.4.html
|
||||
share/gtk-doc/html/cairo/index-1.6.html
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user