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.diff -r1.104 -r1.105 pkgsrc/graphics/cairo/Makefile
(tron)
@@ -1,59 +1,59 @@ | @@ -1,59 +1,59 @@ | |||
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 | |||
3 | DISTNAME= cairo-1.12.2 | 3 | DISTNAME= cairo-1.12.2 | |
4 | PKGREVISION= 1 | 4 | PKGREVISION= 2 | |
5 | CATEGORIES= graphics | 5 | CATEGORIES= graphics | |
6 | MASTER_SITES= http://cairographics.org/releases/ | 6 | MASTER_SITES= http://cairographics.org/releases/ | |
7 | EXTRACT_SUFX= .tar.xz | 7 | EXTRACT_SUFX= .tar.xz | |
8 | 8 | |||
9 | MAINTAINER= pkgsrc-users@NetBSD.org | 9 | MAINTAINER= pkgsrc-users@NetBSD.org | |
10 | HOMEPAGE= http://cairographics.org/ | 10 | HOMEPAGE= http://cairographics.org/ | |
11 | COMMENT= Vector graphics library with cross-device output support | 11 | COMMENT= Vector graphics library with cross-device output support | |
12 | LICENSE= gnu-lgpl-v2.1 AND mpl-1.1 | 12 | LICENSE= gnu-lgpl-v2.1 AND mpl-1.1 | |
13 | 13 | |||
14 | PKG_DESTDIR_SUPPORT= user-destdir | 14 | PKG_DESTDIR_SUPPORT= user-destdir | |
15 | 15 | |||
16 | USE_LANGUAGES= c99 | 16 | USE_LANGUAGES= c99 | |
17 | USE_LIBTOOL= yes | 17 | USE_LIBTOOL= yes | |
18 | USE_PKGLOCALEDIR= yes | 18 | USE_PKGLOCALEDIR= yes | |
19 | USE_TOOLS+= pkg-config | 19 | USE_TOOLS+= pkg-config | |
20 | GNU_CONFIGURE= yes | 20 | GNU_CONFIGURE= yes | |
21 | CONFIGURE_ARGS+= --enable-gl | 21 | CONFIGURE_ARGS+= --enable-gl | |
22 | CONFIGURE_ARGS+= --enable-pdf | 22 | CONFIGURE_ARGS+= --enable-pdf | |
23 | CONFIGURE_ARGS+= --enable-ps | 23 | CONFIGURE_ARGS+= --enable-ps | |
24 | CONFIGURE_ARGS+= --enable-tee | 24 | CONFIGURE_ARGS+= --enable-tee | |
25 | 25 | |||
26 | PKGCONFIG_OVERRIDE+= src/cairo.pc.in | 26 | PKGCONFIG_OVERRIDE+= src/cairo.pc.in | |
27 | PKGCONFIG_OVERRIDE+= src/cairo-features.pc.in | 27 | PKGCONFIG_OVERRIDE+= src/cairo-features.pc.in | |
28 | 28 | |||
29 | .include "options.mk" | 29 | .include "options.mk" | |
30 | 30 | |||
31 | .if exists(/System/Library/Frameworks/Carbon.framework) | 31 | .if exists(/System/Library/Frameworks/Carbon.framework) | |
32 | CONFIGURE_ARGS+= --enable-quartz | 32 | CONFIGURE_ARGS+= --enable-quartz | |
33 | CONFIGURE_ARGS+= --enable-quartz-font | 33 | CONFIGURE_ARGS+= --enable-quartz-font | |
34 | CONFIGURE_ARGS+= --enable-quartz-image | 34 | CONFIGURE_ARGS+= --enable-quartz-image | |
35 | PLIST.carbon= yes | 35 | PLIST.carbon= yes | |
36 | .endif | 36 | .endif | |
37 | 37 | |||
38 | # For snprintf() and ctime_r() | 38 | # For snprintf() and ctime_r() | |
39 | CPPFLAGS.SunOS+= -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS | 39 | CPPFLAGS.SunOS+= -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS | |
40 | 40 | |||
41 | TEST_TARGET= check | 41 | TEST_TARGET= check | |
42 | 42 | |||
43 | # PR#43928 | 43 | # PR#43928 | |
44 | .include "../../mk/compiler.mk" | 44 | .include "../../mk/compiler.mk" | |
45 | .if ${MACHINE_PLATFORM:MDragonFly-*-x86_64} && ${CC_VERSION:Mgcc-4.1.*} | 45 | .if ${MACHINE_PLATFORM:MDragonFly-*-x86_64} && ${CC_VERSION:Mgcc-4.1.*} | |
46 | CONFIGURE_ENV+= ac_cv_type___uint128_t=no | 46 | CONFIGURE_ENV+= ac_cv_type___uint128_t=no | |
47 | .endif | 47 | .endif | |
48 | 48 | |||
49 | .include "../../devel/zlib/buildlink3.mk" | 49 | .include "../../devel/zlib/buildlink3.mk" | |
50 | .include "../../fonts/fontconfig/buildlink3.mk" | 50 | .include "../../fonts/fontconfig/buildlink3.mk" | |
51 | BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.1.9 | 51 | BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.1.9 | |
52 | .include "../../graphics/freetype2/buildlink3.mk" | 52 | .include "../../graphics/freetype2/buildlink3.mk" | |
53 | .include "../../graphics/png/buildlink3.mk" | 53 | .include "../../graphics/png/buildlink3.mk" | |
54 | # include? | 54 | # include? | |
55 | #.include "../../print/libspectre/buildlink3.mk" | 55 | #.include "../../print/libspectre/buildlink3.mk" | |
56 | BUILDLINK_API_DEPENDS.pixman+= pixman>=0.22.0 | 56 | BUILDLINK_API_DEPENDS.pixman+= pixman>=0.22.0 | |
57 | .include "../../x11/pixman/buildlink3.mk" | 57 | .include "../../x11/pixman/buildlink3.mk" | |
58 | .include "../../mk/pthread.buildlink3.mk" | 58 | .include "../../mk/pthread.buildlink3.mk" | |
59 | .include "../../mk/bsd.pkg.mk" | 59 | .include "../../mk/bsd.pkg.mk" |
@@ -1,35 +1,36 @@ | @@ -1,35 +1,36 @@ | |||
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 | |||
3 | BUILDLINK_TREE+= cairo | 3 | BUILDLINK_TREE+= cairo | |
4 | 4 | |||
5 | .if !defined(CAIRO_BUILDLINK3_MK) | 5 | .if !defined(CAIRO_BUILDLINK3_MK) | |
6 | CAIRO_BUILDLINK3_MK:= | 6 | CAIRO_BUILDLINK3_MK:= | |
7 | 7 | |||
8 | BUILDLINK_API_DEPENDS.cairo+= cairo>=1.0.0nb2 | 8 | BUILDLINK_API_DEPENDS.cairo+= cairo>=1.0.0nb2 | |
9 | BUILDLINK_ABI_DEPENDS.cairo+= cairo>=1.12.2nb1 | 9 | BUILDLINK_ABI_DEPENDS.cairo+= cairo>=1.12.2nb1 | |
10 | BUILDLINK_PKGSRCDIR.cairo?= ../../graphics/cairo | 10 | BUILDLINK_PKGSRCDIR.cairo?= ../../graphics/cairo | |
11 | 11 | |||
12 | BUILDLINK_API_DEPENDS.Xrender+= Xrender>=0.8 | 12 | BUILDLINK_API_DEPENDS.Xrender+= Xrender>=0.8 | |
13 | BUILDLINK_API_DEPENDS.pixman+= pixman>=0.22.0 | 13 | BUILDLINK_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 | |||
17 | pkgbase := cairo | 17 | pkgbase := 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) | |
21 | BUILDLINK_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 | |
34 | 35 | |||
35 | BUILDLINK_TREE+= -cairo | 36 | BUILDLINK_TREE+= -cairo |
@@ -1,37 +1,38 @@ | @@ -1,37 +1,38 @@ | |||
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 | |||
3 | PKG_OPTIONS_VAR= PKG_OPTIONS.cairo | 3 | PKG_OPTIONS_VAR= PKG_OPTIONS.cairo | |
4 | PKG_SUPPORTED_OPTIONS= x11 xcb | 4 | PKG_SUPPORTED_OPTIONS= x11 xcb | |
5 | PKG_SUGGESTED_OPTIONS= x11 xcb | 5 | PKG_SUGGESTED_OPTIONS= x11 xcb | |
6 | 6 | |||
7 | .include "../../mk/bsd.options.mk" | 7 | .include "../../mk/bsd.options.mk" | |
8 | 8 | |||
9 | PLIST_VARS+= carbon x11 xcb | 9 | PLIST_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) | |
15 | CONFIGURE_ARGS+= --enable-xlib | 15 | CONFIGURE_ARGS+= --enable-xlib | |
16 | CONFIGURE_ARGS+= --enable-xlib-xrender | 16 | CONFIGURE_ARGS+= --enable-xlib-xrender | |
17 | PLIST.gl= yes | 17 | PLIST.gl= yes | |
18 | PLIST.x11= yes | 18 | PLIST.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" | |
24 | BUILDLINK_DEPMETHOD.libXt?= build # only for configure | 24 | BUILDLINK_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) | |
28 | CONFIGURE_ARGS+= --enable-xcb | 28 | CONFIGURE_ARGS+= --enable-xcb | |
29 | PLIST.xcb= yes | 29 | PLIST.xcb= yes | |
30 | BUILDLINK_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 | |
34 | CONFIGURE_ARGS+= --disable-gl | 35 | CONFIGURE_ARGS+= --disable-gl | |
35 | CONFIGURE_ARGS+= --disable-xlib | 36 | CONFIGURE_ARGS+= --disable-xlib | |
36 | CONFIGURE_ARGS+= --disable-xlib-xrender | 37 | CONFIGURE_ARGS+= --disable-xlib-xrender | |
37 | .endif | 38 | .endif |