Tue Oct 2 07:39:30 2012 UTC ()
The "cairo" package needs at least version 1.6 of the "libxcb" library.
Set the minimum version accordingly. The package now uses "libxcb" from
"pkgsrc" under Mac OS X Snow Leopard which fixes the build.

Bump package revision because of the dependence change.


(tron)
diff -r1.104 -r1.105 pkgsrc/graphics/cairo/Makefile
diff -r1.42 -r1.43 pkgsrc/graphics/cairo/buildlink3.mk
diff -r1.7 -r1.8 pkgsrc/graphics/cairo/options.mk
cvs diff -r1.104 -r1.105 pkgsrc/graphics/cairo/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/cairo/Makefile 2012/09/09 01:28:06 1.104
+++ pkgsrc/graphics/cairo/Makefile 2012/10/02 07:39:30 1.105
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.104 2012/09/09 01:28:06 dholland Exp $ 1# $NetBSD: Makefile,v 1.105 2012/10/02 07:39:30 tron Exp $
2 2
3DISTNAME= cairo-1.12.2 3DISTNAME= cairo-1.12.2
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= graphics 5CATEGORIES= graphics
6MASTER_SITES= http://cairographics.org/releases/ 6MASTER_SITES= http://cairographics.org/releases/
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://cairographics.org/ 10HOMEPAGE= http://cairographics.org/
11COMMENT= Vector graphics library with cross-device output support 11COMMENT= Vector graphics library with cross-device output support
12LICENSE= gnu-lgpl-v2.1 AND mpl-1.1 12LICENSE= gnu-lgpl-v2.1 AND mpl-1.1
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16USE_LANGUAGES= c99 16USE_LANGUAGES= c99
17USE_LIBTOOL= yes 17USE_LIBTOOL= yes
cvs diff -r1.42 -r1.43 pkgsrc/graphics/cairo/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/graphics/cairo/buildlink3.mk 2012/09/08 08:53:03 1.42
+++ pkgsrc/graphics/cairo/buildlink3.mk 2012/10/02 07:39:30 1.43
@@ -1,33 +1,34 @@ @@ -1,33 +1,34 @@
1# $NetBSD: buildlink3.mk,v 1.42 2012/09/08 08:53:03 obache Exp $ 1# $NetBSD: buildlink3.mk,v 1.43 2012/10/02 07:39:30 tron Exp $
2 2
3BUILDLINK_TREE+= cairo 3BUILDLINK_TREE+= cairo
4 4
5.if !defined(CAIRO_BUILDLINK3_MK) 5.if !defined(CAIRO_BUILDLINK3_MK)
6CAIRO_BUILDLINK3_MK:= 6CAIRO_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.cairo+= cairo>=1.0.0nb2 8BUILDLINK_API_DEPENDS.cairo+= cairo>=1.0.0nb2
9BUILDLINK_ABI_DEPENDS.cairo+= cairo>=1.12.2nb1 9BUILDLINK_ABI_DEPENDS.cairo+= cairo>=1.12.2nb1
10BUILDLINK_PKGSRCDIR.cairo?= ../../graphics/cairo 10BUILDLINK_PKGSRCDIR.cairo?= ../../graphics/cairo
11 11
12BUILDLINK_API_DEPENDS.Xrender+= Xrender>=0.8 12BUILDLINK_API_DEPENDS.Xrender+= Xrender>=0.8
13BUILDLINK_API_DEPENDS.pixman+= pixman>=0.22.0 13BUILDLINK_API_DEPENDS.pixman+= pixman>=0.22.0
14 14
15.include "../../mk/bsd.fast.prefs.mk" 15.include "../../mk/bsd.fast.prefs.mk"
16 16
17pkgbase := cairo 17pkgbase := cairo
18.include "../../mk/pkg-build-options.mk" 18.include "../../mk/pkg-build-options.mk"
19 19
20.if !empty(PKG_BUILD_OPTIONS.cairo:Mxcb) 20.if !empty(PKG_BUILD_OPTIONS.cairo:Mxcb)
 21BUILDLINK_API_DEPENDS.libxcb+= libxcb>=1.6
21.include "../../x11/libxcb/buildlink3.mk" 22.include "../../x11/libxcb/buildlink3.mk"
22.endif 23.endif
23 24
24.if !empty(PKG_BUILD_OPTIONS.cairo:Mx11) 25.if !empty(PKG_BUILD_OPTIONS.cairo:Mx11)
25.include "../../graphics/MesaLib/buildlink3.mk" 26.include "../../graphics/MesaLib/buildlink3.mk"
26.include "../../x11/libXrender/buildlink3.mk" 27.include "../../x11/libXrender/buildlink3.mk"
27.endif 28.endif
28 29
29.include "../../fonts/fontconfig/buildlink3.mk" 30.include "../../fonts/fontconfig/buildlink3.mk"
30.include "../../graphics/freetype2/buildlink3.mk" 31.include "../../graphics/freetype2/buildlink3.mk"
31.include "../../graphics/png/buildlink3.mk" 32.include "../../graphics/png/buildlink3.mk"
32.include "../../x11/pixman/buildlink3.mk" 33.include "../../x11/pixman/buildlink3.mk"
33.endif # CAIRO_BUILDLINK3_MK 34.endif # CAIRO_BUILDLINK3_MK
cvs diff -r1.7 -r1.8 pkgsrc/graphics/cairo/options.mk (expand / switch to unified diff)

--- pkgsrc/graphics/cairo/options.mk 2012/09/07 15:24:03 1.7
+++ pkgsrc/graphics/cairo/options.mk 2012/10/02 07:39:30 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.7 2012/09/07 15:24:03 adam Exp $ 1# $NetBSD: options.mk,v 1.8 2012/10/02 07:39:30 tron Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.cairo 3PKG_OPTIONS_VAR= PKG_OPTIONS.cairo
4PKG_SUPPORTED_OPTIONS= x11 xcb 4PKG_SUPPORTED_OPTIONS= x11 xcb
5PKG_SUGGESTED_OPTIONS= x11 xcb 5PKG_SUGGESTED_OPTIONS= x11 xcb
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9PLIST_VARS+= carbon x11 xcb 9PLIST_VARS+= carbon x11 xcb
10 10
11### 11###
12### X11 and XCB support (XCB implies X11) 12### X11 and XCB support (XCB implies X11)
13### 13###
14.if !empty(PKG_OPTIONS:Mx11) || !empty(PKG_OPTIONS:Mxcb) 14.if !empty(PKG_OPTIONS:Mx11) || !empty(PKG_OPTIONS:Mxcb)
@@ -17,21 +17,22 @@ CONFIGURE_ARGS+= --enable-xlib-xrender @@ -17,21 +17,22 @@ CONFIGURE_ARGS+= --enable-xlib-xrender
17PLIST.gl= yes 17PLIST.gl= yes
18PLIST.x11= yes 18PLIST.x11= yes
19.include "../../graphics/MesaLib/buildlink3.mk" 19.include "../../graphics/MesaLib/buildlink3.mk"
20.include "../../x11/libXext/buildlink3.mk" 20.include "../../x11/libXext/buildlink3.mk"
21.include "../../x11/libXft/buildlink3.mk" 21.include "../../x11/libXft/buildlink3.mk"
22.include "../../x11/libXrender/buildlink3.mk" 22.include "../../x11/libXrender/buildlink3.mk"
23.include "../../x11/libX11/buildlink3.mk" 23.include "../../x11/libX11/buildlink3.mk"
24BUILDLINK_DEPMETHOD.libXt?= build # only for configure 24BUILDLINK_DEPMETHOD.libXt?= build # only for configure
25.include "../../x11/libXt/buildlink3.mk" 25.include "../../x11/libXt/buildlink3.mk"
26 26
27. if !empty(PKG_OPTIONS:Mxcb) 27. if !empty(PKG_OPTIONS:Mxcb)
28CONFIGURE_ARGS+= --enable-xcb 28CONFIGURE_ARGS+= --enable-xcb
29PLIST.xcb= yes 29PLIST.xcb= yes
 30BUILDLINK_API_DEPENDS.libxcb+= libxcb>=1.6
30. include "../../x11/libxcb/buildlink3.mk" 31. include "../../x11/libxcb/buildlink3.mk"
31. endif 32. endif
32 33
33.else 34.else
34CONFIGURE_ARGS+= --disable-gl 35CONFIGURE_ARGS+= --disable-gl
35CONFIGURE_ARGS+= --disable-xlib 36CONFIGURE_ARGS+= --disable-xlib
36CONFIGURE_ARGS+= --disable-xlib-xrender 37CONFIGURE_ARGS+= --disable-xlib-xrender
37.endif 38.endif