diff options
| author | jmmv <jmmv@pkgsrc.org> | 2005-10-02 10:54:37 +0000 |
|---|---|---|
| committer | jmmv <jmmv@pkgsrc.org> | 2005-10-02 10:54:37 +0000 |
| commit | ca72e40e9476bbc15c9ff7073c02890c6135e9c6 (patch) | |
| tree | 4261aba69b9460bfaa74f04fd92cdddb22d3ce10 | |
| parent | 59b8ceabdcee5086f62d093e0c023939b2b0f99c (diff) | |
| download | pkgsrc-ca72e40e9476bbc15c9ff7073c02890c6135e9c6.tar.gz | |
Cairo uses pthreads, so link it against the threading library.
Fixes build problems of other packages using cairo (nothing could be linked
with -lcairo before), at least under NetBSD 2.0. Bump PKGREVISION to 2.
| -rw-r--r-- | graphics/cairo/Makefile | 5 | ||||
| -rw-r--r-- | graphics/cairo/buildlink3.mk | 4 | ||||
| -rw-r--r-- | graphics/cairo/distinfo | 3 | ||||
| -rw-r--r-- | graphics/cairo/patches/patch-aa | 22 |
4 files changed, 29 insertions, 5 deletions
diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile index 8d1c86280f6..bfc20984219 100644 --- a/graphics/cairo/Makefile +++ b/graphics/cairo/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.24 2005/10/02 08:09:43 rh Exp $ +# $NetBSD: Makefile,v 1.25 2005/10/02 10:54:37 jmmv Exp $ DISTNAME= cairo-1.0.0 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://cairographics.org/releases/ @@ -43,4 +43,5 @@ BUILDLINK_DEPENDS.libpixman+= libpixman>=0.1.5 .include "../../graphics/libpixman/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../x11/Xrender/buildlink3.mk" +.include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/cairo/buildlink3.mk b/graphics/cairo/buildlink3.mk index 71e9ef62e96..111e91daad5 100644 --- a/graphics/cairo/buildlink3.mk +++ b/graphics/cairo/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2005/03/27 12:29:17 recht Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2005/10/02 10:54:37 jmmv Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ CAIRO_BUILDLINK3_MK:= ${CAIRO_BUILDLINK3_MK}+ @@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncairo} BUILDLINK_PACKAGES+= cairo .if !empty(CAIRO_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.cairo+= cairo>=0.4.0 +BUILDLINK_DEPENDS.cairo+= cairo>=1.0.0nb2 BUILDLINK_PKGSRCDIR.cairo?= ../../graphics/cairo BUILDLINK_DEPENDS.freetype2+= freetype2>=2.1.5 diff --git a/graphics/cairo/distinfo b/graphics/cairo/distinfo index b51fc3a6a82..db4b6400f32 100644 --- a/graphics/cairo/distinfo +++ b/graphics/cairo/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.12 2005/09/30 13:51:24 adam Exp $ +$NetBSD: distinfo,v 1.13 2005/10/02 10:54:37 jmmv Exp $ SHA1 (cairo-1.0.0.tar.gz) = abc50d6a657cba15b3956c8c3aaea080b71172bb RMD160 (cairo-1.0.0.tar.gz) = cd81c235d62d816983233b3e87004144001cfe7f Size (cairo-1.0.0.tar.gz) = 1439299 bytes +SHA1 (patch-aa) = dd3557cd52a7ceb1ed688c08a2de87483c5d8a1f diff --git a/graphics/cairo/patches/patch-aa b/graphics/cairo/patches/patch-aa new file mode 100644 index 00000000000..9bb06885fbc --- /dev/null +++ b/graphics/cairo/patches/patch-aa @@ -0,0 +1,22 @@ +$NetBSD: patch-aa,v 1.5 2005/10/02 10:54:37 jmmv Exp $ + +--- src/Makefile.in.orig 2005-08-24 18:28:42.000000000 +0200 ++++ src/Makefile.in +@@ -145,7 +145,7 @@ AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ +-CAIRO_CFLAGS = @CAIRO_CFLAGS@ ++CAIRO_CFLAGS = @CAIRO_CFLAGS@ ${PTHREAD_CFLAGS} + CAIRO_HAS_ATSUI_FONT_FALSE = @CAIRO_HAS_ATSUI_FONT_FALSE@ + CAIRO_HAS_ATSUI_FONT_TRUE = @CAIRO_HAS_ATSUI_FONT_TRUE@ + CAIRO_HAS_FT_FONT_FALSE = @CAIRO_HAS_FT_FONT_FALSE@ +@@ -168,7 +168,7 @@ CAIRO_HAS_XCB_SURFACE_FALSE = @CAIRO_HAS + CAIRO_HAS_XCB_SURFACE_TRUE = @CAIRO_HAS_XCB_SURFACE_TRUE@ + CAIRO_HAS_XLIB_SURFACE_FALSE = @CAIRO_HAS_XLIB_SURFACE_FALSE@ + CAIRO_HAS_XLIB_SURFACE_TRUE = @CAIRO_HAS_XLIB_SURFACE_TRUE@ +-CAIRO_LIBS = @CAIRO_LIBS@ ++CAIRO_LIBS = @CAIRO_LIBS@ ${PTHREAD_LDFLAGS} + CAIRO_VERSION_MAJOR = @CAIRO_VERSION_MAJOR@ + CAIRO_VERSION_MICRO = @CAIRO_VERSION_MICRO@ + CAIRO_VERSION_MINOR = @CAIRO_VERSION_MINOR@ |