diff options
Diffstat (limited to 'graphics/libgdiplus')
| -rw-r--r-- | graphics/libgdiplus/Makefile | 19 | ||||
| -rw-r--r-- | graphics/libgdiplus/buildlink3.mk | 4 | ||||
| -rw-r--r-- | graphics/libgdiplus/distinfo | 9 | ||||
| -rw-r--r-- | graphics/libgdiplus/patches/patch-aa | 14 | ||||
| -rw-r--r-- | graphics/libgdiplus/patches/patch-ab | 16 | ||||
| -rw-r--r-- | graphics/libgdiplus/patches/patch-ac | 34 |
6 files changed, 56 insertions, 40 deletions
diff --git a/graphics/libgdiplus/Makefile b/graphics/libgdiplus/Makefile index fcf85c3e95e..a061d3467fe 100644 --- a/graphics/libgdiplus/Makefile +++ b/graphics/libgdiplus/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.7 2004/05/11 17:37:48 recht Exp $ +# $NetBSD: Makefile,v 1.8 2004/06/26 20:19:42 recht Exp $ # -DISTNAME= libgdiplus-0.5 +DISTNAME= libgdiplus-0.10 CATEGORIES= graphics -MASTER_SITES= http://www.go-mono.com/archive/beta1/ +MASTER_SITES= http://www.go-mono.com/archive/rc/ MAINTAINER= recht@NetBSD.org HOMEPAGE= http://www.go-mono.com/archive/ @@ -17,12 +17,25 @@ USE_LIBTOOL= yes PKGCONFIG_OVERRIDE+= libgdiplus.pc.in GNU_CONFIGURE= yes +# XXX gdip_win32.c uses pthread, but +# configure doesn't check for it... +CFLAGS+= ${PTHREAD_CFLAGS} +LDFLAGS+= ${PTHREAD_LDFLAGS} + +pre-configure: + cd ${WRKSRC}; \ + ${AUTOHEADER}; \ + ${AUTOCONF} + .include "../../devel/pkgconfig/buildlink3.mk" .include "../../graphics/cairo/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/libungif/buildlink3.mk" +.include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../lang/mono/buildlink3.mk" .include "../../x11/Xrender/buildlink3.mk" +.include "../../mk/pthread.buildlink3.mk" +.include "../../mk/autoconf.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/libgdiplus/buildlink3.mk b/graphics/libgdiplus/buildlink3.mk index 09d01e35196..1fbcbeec0e8 100644 --- a/graphics/libgdiplus/buildlink3.mk +++ b/graphics/libgdiplus/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2004/05/11 17:37:48 recht Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2004/06/26 20:19:42 recht Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBGDIPLUS_BUILDLINK3_MK:= ${LIBGDIPLUS_BUILDLINK3_MK}+ @@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgdiplus} BUILDLINK_PACKAGES+= libgdiplus .if !empty(LIBGDIPLUS_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.libgdiplus+= libgdiplus>=0.5 +BUILDLINK_DEPENDS.libgdiplus+= libgdiplus>=0.10 BUILDLINK_PKGSRCDIR.libgdiplus?= ../../graphics/libgdiplus .endif # LIBGDIPLUS_BUILDLINK3_MK diff --git a/graphics/libgdiplus/distinfo b/graphics/libgdiplus/distinfo index 4f2ef84c8e2..ad54cb91e57 100644 --- a/graphics/libgdiplus/distinfo +++ b/graphics/libgdiplus/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.4 2004/05/11 17:37:48 recht Exp $ +$NetBSD: distinfo,v 1.5 2004/06/26 20:19:42 recht Exp $ -SHA1 (libgdiplus-0.5.tar.gz) = 65c96314bd5989d018667f130b58e6126efbae33 -Size (libgdiplus-0.5.tar.gz) = 286361 bytes -SHA1 (patch-aa) = 9e1416427846f1341fb136759a58956ce591c67a -SHA1 (patch-ab) = 53376dad81edd615c9eb7b27e993361d1b520f78 +SHA1 (libgdiplus-0.10.tar.gz) = 5fa20d0e60c3f7607be6af3084c2b0a5583c7743 +Size (libgdiplus-0.10.tar.gz) = 327050 bytes +SHA1 (patch-ac) = d223c7eba94470d6441d9fd19e9d5436027e3c59 diff --git a/graphics/libgdiplus/patches/patch-aa b/graphics/libgdiplus/patches/patch-aa deleted file mode 100644 index 34a27e25faa..00000000000 --- a/graphics/libgdiplus/patches/patch-aa +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2004/05/11 17:37:48 recht Exp $ - ---- src/jpegcodec.c.orig 2004-05-11 18:20:03.000000000 +0200 -+++ src/jpegcodec.c -@@ -20,6 +20,9 @@ - #ifdef HAVE_LIBJPEG - - #include <setjmp.h> -+ -+/* pkgsrc */ -+#undef HAVE_STDLIB_H - #include <jpeglib.h> - - /* Codecinfo related data*/ diff --git a/graphics/libgdiplus/patches/patch-ab b/graphics/libgdiplus/patches/patch-ab deleted file mode 100644 index 4de4fd726fb..00000000000 --- a/graphics/libgdiplus/patches/patch-ab +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2004/05/11 17:37:48 recht Exp $ - ---- src/tiffcodec.c.orig 2004-05-11 18:19:51.000000000 +0200 -+++ src/tiffcodec.c -@@ -14,7 +14,10 @@ - #endif - - #include <stdio.h> --#include <byteswap.h> -+ -+/* pkgsrc */ -+/* #include <byteswap.h> */ -+ - #include "tiffcodec.h" - - #ifdef HAVE_LIBTIFF diff --git a/graphics/libgdiplus/patches/patch-ac b/graphics/libgdiplus/patches/patch-ac new file mode 100644 index 00000000000..3aa5693ee1c --- /dev/null +++ b/graphics/libgdiplus/patches/patch-ac @@ -0,0 +1,34 @@ +$NetBSD: patch-ac,v 1.1 2004/06/26 20:19:42 recht Exp $ + +--- configure.in.orig 2004-06-26 19:11:38.000000000 +0200 ++++ configure.in 2004-06-26 19:13:36.000000000 +0200 +@@ -6,24 +6,25 @@ + AM_MAINTAINER_MODE + AM_PROG_LIBTOOL + ++AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no) + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + if test "x$PKG_CONFIG" = "xno"; then + AC_MSG_ERROR([You need to install pkg-config]) + fi +-if pkg-config --atleast-version 2.2.3 glib-2.0; then ++if $PKG_CONFIG --atleast-version 2.2.3 glib-2.0; then + echo GLIB 2.0 installation OK + else + AC_MSG_ERROR("Did not find Glib >= 2.2.3"); + fi + +-if pkg-config --atleast-version 0.1.22 cairo; then ++if $PKG_CONFIG --atleast-version 0.1.22 cairo; then + echo Cairo installation OK + else + AC_MSG_ERROR("Did not find Cairo 0.1.22"); + fi + +-GDIPLUS_LIBS="`pkg-config --libs cairo glib-2.0 ` `freetype-config --libs`" +-GDIPLUS_CFLAGS="`pkg-config --cflags cairo glib-2.0 ` `freetype-config --cflags`" ++GDIPLUS_LIBS="`$PKG_CONFIG --libs cairo glib-2.0 ` `$FREETYPE_CONFIG --libs`" ++GDIPLUS_CFLAGS="`$PKG_CONFIG --cflags cairo glib-2.0 ` `$FREETYPE_CONFIG --cflags`" + AC_CHECK_HEADERS(byteswap.h) + + # sigsetjmp is a macro on some platforms, so can't use AC_CHECK_FUNCS |