summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2008-05-19 13:47:45 +0000
committertnn <tnn@pkgsrc.org>2008-05-19 13:47:45 +0000
commitdb051de52c6d53775fdb34b2cc1633f7fb70cd7a (patch)
tree778e0640c8fc5be93a7c8ad5ea0e2323225d29ed
parent4aa5709b486f27bae35f30597933b460cab0238c (diff)
downloadpkgsrc-db051de52c6d53775fdb34b2cc1633f7fb70cd7a.tar.gz
Fix build on IRIX
-rw-r--r--graphics/glitz/Makefile10
-rw-r--r--graphics/glitz/distinfo4
-rw-r--r--graphics/glitz/patches/patch-ab11
3 files changed, 18 insertions, 7 deletions
diff --git a/graphics/glitz/Makefile b/graphics/glitz/Makefile
index 54254fb302b..32ea87ffd9a 100644
--- a/graphics/glitz/Makefile
+++ b/graphics/glitz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2008/04/12 22:43:01 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2008/05/19 13:47:45 tnn Exp $
DISTNAME= glitz-0.5.6
PKGREVISION= 2
@@ -23,6 +23,14 @@ PLIST.agl= yes
CONFIGURE_ENV+= AGL_LIBS="-framework AGL"
.endif
+.include "../../mk/bsd.prefs.mk"
+
+# This is for the benefit of the configure test; libglitz-glx already
+# links against libpthread.
+.if ${OPSYS} == "IRIX"
+BUILDLINK_TRANSFORM+= l:GL:GL:pthread
+.endif
+
.include "options.mk"
.include "../../mk/pthread.buildlink3.mk"
diff --git a/graphics/glitz/distinfo b/graphics/glitz/distinfo
index 290366bceeb..dcbbebd050e 100644
--- a/graphics/glitz/distinfo
+++ b/graphics/glitz/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.18 2007/08/08 22:43:47 joerg Exp $
+$NetBSD: distinfo,v 1.19 2008/05/19 13:47:45 tnn Exp $
SHA1 (glitz-0.5.6.tar.gz) = 81604bf02ceda85ea32b52423f78a883aaec6dc6
RMD160 (glitz-0.5.6.tar.gz) = 547ef1be273856942e0fa36c097c4acb367336b2
Size (glitz-0.5.6.tar.gz) = 459224 bytes
SHA1 (patch-aa) = d725f03f96082b6d9b31c608a0e4c1beb71e87f1
-SHA1 (patch-ab) = 1eb96f935320fb1046276c3417ca041b633ef068
+SHA1 (patch-ab) = 1ca48981d416ecde5a3034edb7ca2a060ecaee17
SHA1 (patch-ac) = a619818f4a6a2c471be544c39c5f3d4486723052
diff --git a/graphics/glitz/patches/patch-ab b/graphics/glitz/patches/patch-ab
index 90a8466c202..0779aa66ed1 100644
--- a/graphics/glitz/patches/patch-ab
+++ b/graphics/glitz/patches/patch-ab
@@ -1,10 +1,13 @@
-$NetBSD: patch-ab,v 1.6 2007/01/30 20:53:23 tv Exp $
+$NetBSD: patch-ab,v 1.7 2008/05/19 13:47:45 tnn Exp $
---- src/glitzint.h.orig 2006-03-13 08:43:57.000000000 -0500
+--- src/glitzint.h.orig 2006-03-13 14:43:57.000000000 +0100
+++ src/glitzint.h
-@@ -51,12 +51,16 @@
+@@ -49,14 +49,18 @@
+ typedef __int64 int64_t;
+ typedef unsigned __int64 uint64_t;
#else
- # if defined(__OpenBSD__)
+-# if defined(__OpenBSD__)
++# if defined(__OpenBSD__) || defined(__sgi)
# include <inttypes.h>
+# elif defined(__INTERIX)
+# include <sys/types.h>