From 65eef7479058c6d8e3c49ee627cf37c6ce76150b Mon Sep 17 00:00:00 2001 From: recht Date: Fri, 27 Aug 2004 22:04:45 +0000 Subject: update to libgdiplus-1.0.1 changes: * Fixes #60787: Libgdiplus pthreads check (Jordi Mas). --- graphics/libgdiplus/Makefile | 6 +-- graphics/libgdiplus/buildlink3.mk | 4 +- graphics/libgdiplus/distinfo | 8 ++-- graphics/libgdiplus/patches/patch-ac | 84 +++--------------------------------- 4 files changed, 14 insertions(+), 88 deletions(-) (limited to 'graphics') diff --git a/graphics/libgdiplus/Makefile b/graphics/libgdiplus/Makefile index 68428f48fa7..9aa8cbd172f 100644 --- a/graphics/libgdiplus/Makefile +++ b/graphics/libgdiplus/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.10 2004/07/03 23:04:22 recht Exp $ +# $NetBSD: Makefile,v 1.11 2004/08/27 22:04:45 recht Exp $ # -DISTNAME= libgdiplus-1.0 +DISTNAME= libgdiplus-1.0.1 CATEGORIES= graphics -MASTER_SITES= http://mono2.ximian.com/archive/1.0/ +MASTER_SITES= http://www.go-mono.com/archive/1.0.1/ MAINTAINER= recht@NetBSD.org HOMEPAGE= http://www.mono-project.com/ diff --git a/graphics/libgdiplus/buildlink3.mk b/graphics/libgdiplus/buildlink3.mk index c3229b10234..80061fe761f 100644 --- a/graphics/libgdiplus/buildlink3.mk +++ b/graphics/libgdiplus/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2004/07/03 23:03:22 recht Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2004/08/27 22:04:45 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>=1.0 +BUILDLINK_DEPENDS.libgdiplus+= libgdiplus>=1.0.1 BUILDLINK_PKGSRCDIR.libgdiplus?= ../../graphics/libgdiplus .endif # LIBGDIPLUS_BUILDLINK3_MK diff --git a/graphics/libgdiplus/distinfo b/graphics/libgdiplus/distinfo index bd0674dad08..1c12ea2f62b 100644 --- a/graphics/libgdiplus/distinfo +++ b/graphics/libgdiplus/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.6 2004/07/03 23:03:22 recht Exp $ +$NetBSD: distinfo,v 1.7 2004/08/27 22:04:45 recht Exp $ -SHA1 (libgdiplus-1.0.tar.gz) = 18e65a4d8aec195b78aa9f509f82ad8e8b09faba -Size (libgdiplus-1.0.tar.gz) = 327197 bytes -SHA1 (patch-ac) = 189a32aa425926c04982ac2f8375ab8fd541b713 +SHA1 (libgdiplus-1.0.1.tar.gz) = 0d2a0d348ca83a898f621a1513b6b9e955bc601e +Size (libgdiplus-1.0.1.tar.gz) = 329190 bytes +SHA1 (patch-ac) = b813765984bfb995b6fdad9a18efe21d639bac1d diff --git a/graphics/libgdiplus/patches/patch-ac b/graphics/libgdiplus/patches/patch-ac index 70174d8ff14..e5fe71a41b2 100644 --- a/graphics/libgdiplus/patches/patch-ac +++ b/graphics/libgdiplus/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.2 2004/07/03 23:03:22 recht Exp $ +$NetBSD: patch-ac,v 1.3 2004/08/27 22:04:45 recht Exp $ ---- configure.in.orig 2004-07-04 00:21:40.000000000 +0200 -+++ configure.in 2004-07-04 00:21:46.000000000 +0200 -@@ -6,26 +6,99 @@ +--- 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 @@ -31,78 +31,4 @@ $NetBSD: patch-ac,v 1.2 2004/07/03 23:03:22 recht Exp $ +GDIPLUS_CFLAGS="`$PKG_CONFIG --cflags cairo glib-2.0 ` `$FREETYPE_CONFIG --cflags`" AC_CHECK_HEADERS(byteswap.h) -+AC_MSG_CHECKING([host threading settings]) -+case "$host" in -+ *-*-mingw*|*-*-cygwin*) -+ AC_DEFINE_UNQUOTED(CYGWIN,1,[Win32]) -+ AC_CHECK_LIB(intl, gettext) -+ ;; -+ -+ *-*-*netbsd*) -+ AC_DEFINE_UNQUOTED(BSDOS,1,[NetBSD]) -+ ;; -+ -+ *-*-*freebsd*) -+ AC_DEFINE_UNQUOTED(BSDOS,1,[FreeBSD]) -+ CFLAGS="-D_THREAD_SAFE $CFLAGS" -+ ;; -+ -+ *-*-*openbsd*) -+ AC_DEFINE_UNQUOTED(BSDOS,1,[OpenBSD]) -+ CFLAGS="$CFLAGS" -+ LIBS="$LIBS" -+ ;; -+ -+ *-*-linux*) -+ AC_DEFINE_UNQUOTED(LINUX,1,[Linux]) -+ AC_CHECK_LIB(pthread, pthread_create) -+ ;; -+ -+ *-*-solaris*) -+ AC_DEFINE_UNQUOTED(SOLARIS,1,[Solaris]) -+ AC_DEFINE_UNQUOTED(_REENTRANT,1,[For libc reentrancy]) -+ CFLAGS="-pthreads $CFLAGS" -+ ;; -+ -+ *-*-darwin*) -+ AC_DEFINE_UNQUOTED(OSX,1,[OS X]) -+ CFLAGS="-no-cpp-precomp $CFLAGS" -+ LDFLAGS="-flat_namespace -undefined suppress $LDFLAGS" -+ ;; -+ -+ *) -+ AC_MSG_RESULT(Unrecognized host $host) -+ AC_DEFINE_UNQUOTED(OTHEROS,1,[Unknown]) -+ ;; -+esac -+ -+# Apparently for BSD special handling needs to happen -+# See http://archives/neohapsis.com/archives/openbsd/2001-11/2142.html -+# by Miod Vallat -+AC_CACHE_CHECK( -+ [if compiler recognizes -pthread], -+ myapp_cv_gcc_pthread, -+ ac_save_CFLAGS=$CFLAGS -+ CFLAGS="$CFLAGS -pthread" -+ AC_LANG_SAVE -+ AC_LANG_C -+ AC_TRY_LINK([#include ], -+ [void *p = pthread_create;], -+ myapp_cv_gcc_pthread=yes, -+ myapp_cv_gcc_pthread=no) -+ AC_LANG_RESTORE -+ CFLAGS=$ac_save_CFLAGS -+) -+if test $myapp_cv_gcc_pthread = yes -+then -+ myapp_threads="" -+ CFLAGS="$CFLAGS -pthread" -+else -+ AC_CHECK_LIB(pthread,pthread_create,myapp_threads=-lpthread, -+ [AC_CHECK_LIB(c_r,pthread_create,myapp_threads=-lc_r)]) -+fi -+ -+ - # sigsetjmp is a macro on some platforms, so can't use AC_CHECK_FUNCS - AC_MSG_CHECKING(for sigsetjmp) - AC_TRY_LINK([#include ], [ + AC_MSG_CHECKING([host threading settings]) -- cgit v1.2.3