From a28109fb5a1783393715fec409e184a6b845d8a4 Mon Sep 17 00:00:00 2001 From: recht Date: Sun, 27 Mar 2005 10:29:20 +0000 Subject: update to libgdiplus-1.1.5 (part of the mono 1.1.5 release) changes: - bugfixes, more complete .Net API support changes to the package: - don't depend on lang/mono any longer - use the included cairo/libpixman --- graphics/libgdiplus/Makefile | 18 ++++++++++------ graphics/libgdiplus/buildlink3.mk | 11 +++++----- graphics/libgdiplus/distinfo | 10 ++++----- graphics/libgdiplus/patches/patch-ac | 42 +++++++++++++++++++++--------------- 4 files changed, 48 insertions(+), 33 deletions(-) (limited to 'graphics') diff --git a/graphics/libgdiplus/Makefile b/graphics/libgdiplus/Makefile index 1e7766be950..e9fc9eff709 100644 --- a/graphics/libgdiplus/Makefile +++ b/graphics/libgdiplus/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.13 2004/12/28 23:18:17 reed Exp $ +# $NetBSD: Makefile,v 1.14 2005/03/27 10:29:20 recht Exp $ # -DISTNAME= libgdiplus-1.0.1 -PKGREVISION= 2 +DISTNAME= libgdiplus-1.1.5 CATEGORIES= graphics -MASTER_SITES= http://www.go-mono.com/archive/1.0.1/ +MASTER_SITES= http://www.go-mono.com/archive/1.1.5/ MAINTAINER= recht@NetBSD.org HOMEPAGE= http://www.mono-project.com/ @@ -17,19 +16,26 @@ USE_GNU_TOOLS+= make USE_LIBTOOL= yes PKGCONFIG_OVERRIDE+= libgdiplus.pc.in GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --disable-glitz pre-configure: cd ${WRKSRC}; \ ${AUTOHEADER}; \ ${AUTOCONF} +BUILDLINK_DEPENDS.freetype2+= freetype2>=2.1.5 +BUILDLINK_DEPENDS.Xft2+= Xft2>=2.1.2 +BUILDLINK_DEPENDS.Xrender+= Xrender>=0.8 + .include "../../devel/pkgconfig/buildlink3.mk" -.include "../../graphics/cairo/buildlink3.mk" +.include "../../devel/glib2/buildlink3.mk" +.include "../../fonts/Xft2/buildlink3.mk" +.include "../../graphics/freetype2/buildlink3.mk" +#.include "../../graphics/glitz/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" diff --git a/graphics/libgdiplus/buildlink3.mk b/graphics/libgdiplus/buildlink3.mk index e3a7dcada0d..4d80307b249 100644 --- a/graphics/libgdiplus/buildlink3.mk +++ b/graphics/libgdiplus/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2004/12/28 23:18:17 reed Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2005/03/27 10:29:20 recht Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBGDIPLUS_BUILDLINK3_MK:= ${LIBGDIPLUS_BUILDLINK3_MK}+ @@ -11,16 +11,17 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgdiplus} BUILDLINK_PACKAGES+= libgdiplus .if !empty(LIBGDIPLUS_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.libgdiplus+= libgdiplus>=1.0.1 -BUILDLINK_RECOMMENDED.libgdiplus+= libgdiplus>=1.0.1nb2 +BUILDLINK_DEPENDS.libgdiplus+= libgdiplus>=1.1.5 BUILDLINK_PKGSRCDIR.libgdiplus?= ../../graphics/libgdiplus .endif # LIBGDIPLUS_BUILDLINK3_MK -.include "../../graphics/cairo/buildlink3.mk" +.include "../../devel/glib2/buildlink3.mk" +.include "../../fonts/Xft2/buildlink3.mk" +.include "../../graphics/freetype2/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" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/graphics/libgdiplus/distinfo b/graphics/libgdiplus/distinfo index d92fb5a48f1..f20b7580a0e 100644 --- a/graphics/libgdiplus/distinfo +++ b/graphics/libgdiplus/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.8 2005/02/24 08:45:09 agc Exp $ +$NetBSD: distinfo,v 1.9 2005/03/27 10:29:20 recht Exp $ -SHA1 (libgdiplus-1.0.1.tar.gz) = 0d2a0d348ca83a898f621a1513b6b9e955bc601e -RMD160 (libgdiplus-1.0.1.tar.gz) = 6ebbbeeb522bed8476c2b37030dccda0522587f5 -Size (libgdiplus-1.0.1.tar.gz) = 329190 bytes -SHA1 (patch-ac) = b813765984bfb995b6fdad9a18efe21d639bac1d +SHA1 (libgdiplus-1.1.5.tar.gz) = 51cb2664c5fd62c59b58fb418d994c9d2e0089d2 +RMD160 (libgdiplus-1.1.5.tar.gz) = 8455224cd5934d623b3752ba3cdd66dd2576b434 +Size (libgdiplus-1.1.5.tar.gz) = 1316565 bytes +SHA1 (patch-ac) = fc505ada943a1cdbb9c9d101c40a01aafdfd6bcb diff --git a/graphics/libgdiplus/patches/patch-ac b/graphics/libgdiplus/patches/patch-ac index e5fe71a41b2..7a77b1cb0e5 100644 --- a/graphics/libgdiplus/patches/patch-ac +++ b/graphics/libgdiplus/patches/patch-ac @@ -1,10 +1,10 @@ -$NetBSD: patch-ac,v 1.3 2004/08/27 22:04:45 recht Exp $ +$NetBSD: patch-ac,v 1.4 2005/03/27 10:29:20 recht Exp $ ---- configure.in.orig 2004-08-27 22:37:25.000000000 +0200 -+++ configure.in 2004-08-27 22:38:39.000000000 +0200 -@@ -6,24 +6,25 @@ - AM_MAINTAINER_MODE - AM_PROG_LIBTOOL +--- configure.in.orig Fri Mar 25 17:39:38 2005 ++++ configure.in +@@ -8,11 +8,12 @@ AM_PROG_LIBTOOL + + AC_C_BIGENDIAN +AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no) AC_PATH_PROG(PKG_CONFIG, pkg-config, no) @@ -16,19 +16,27 @@ $NetBSD: patch-ac,v 1.3 2004/08/27 22:04:45 recht Exp $ 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 +@@ -31,18 +32,18 @@ then + CAIRO_CFLAGS='-I$(top_srcdir)/libpixman/src -I$(top_srcdir)/cairo/src' + AC_DEFINE(USE_INCLUDED_CAIRO,1,[Use Cairo bundled in libgdiplus]) else - AC_MSG_ERROR("Did not find Cairo 0.1.22"); +- if pkg-config --exact-version 0.3.0 cairo; then ++ if $PKG_CONFIG --exact-version 0.3.0 cairo; then + echo Cairo installation OK + else + AC_MSG_ERROR("Did not find Cairo == 0.3.0"); + fi + +- CAIRO_LIBS="`pkg-config --libs cairo`" +- CAIRO_CFLAGS="`pkg-config --cflags cairo`" ++ CAIRO_LIBS="`$PKG_CONFIG --libs cairo`" ++ CAIRO_CFLAGS="`$PKG_CONFIG --cflags cairo`" 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`" +-GDIPLUS_LIBS="$CAIRO_LIBS `pkg-config --libs glib-2.0 ` `freetype-config --libs`" +-GDIPLUS_CFLAGS="$CAIRO_CFLAGS `pkg-config --cflags glib-2.0 ` `freetype-config --cflags`" ++GDIPLUS_LIBS="$CAIRO_LIBS `$PKG_CONFIG --libs glib-2.0 ` `freetype-config --libs`" ++GDIPLUS_CFLAGS="$CAIRO_CFLAGS `$PKG_CONFIG --cflags glib-2.0 ` `freetype-config --cflags`" + AC_CHECK_HEADERS(byteswap.h) - AC_MSG_CHECKING([host threading settings]) -- cgit v1.2.3