diff options
| author | schwarz <schwarz> | 2006-10-01 20:31:13 +0000 |
|---|---|---|
| committer | schwarz <schwarz> | 2006-10-01 20:31:13 +0000 |
| commit | 402c19ef6eb3a21b2c298407e2a6ccfbac1fa967 (patch) | |
| tree | 41d62b93b45a0cf0989174f2a17ed002eb132c06 /graphics/MesaLib | |
| parent | 74a27e0236a8f215164fa25f955bfca81f2b68dc (diff) | |
| download | pkgsrc-402c19ef6eb3a21b2c298407e2a6ccfbac1fa967.tar.gz | |
added support for IRIX 5. Including inttypes.h, as introduced through patch-am,
is necessary on IRIX 5 to have int64_t defined whereas it is not needed on
IRIX 6, but should not hurt there either.
Diffstat (limited to 'graphics/MesaLib')
| -rw-r--r-- | graphics/MesaLib/distinfo | 4 | ||||
| -rw-r--r-- | graphics/MesaLib/hacks.mk | 17 | ||||
| -rw-r--r-- | graphics/MesaLib/patches/patch-am | 17 |
3 files changed, 32 insertions, 6 deletions
diff --git a/graphics/MesaLib/distinfo b/graphics/MesaLib/distinfo index fabe6c9f813..b31fef6bf8c 100644 --- a/graphics/MesaLib/distinfo +++ b/graphics/MesaLib/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.41 2006/07/06 12:27:43 markd Exp $ +$NetBSD: distinfo,v 1.42 2006/10/01 20:31:13 schwarz Exp $ SHA1 (Mesa-6.4.2/MesaLib-6.4.2.tar.bz2) = 4f042bdf38c9eb62e04660bd18566e7ca50d8640 RMD160 (Mesa-6.4.2/MesaLib-6.4.2.tar.bz2) = 6bf1afc0d3bd3f5e3b5c1a019838f40603446509 @@ -20,4 +20,4 @@ SHA1 (patch-ah) = 94faa48a6945aa6e7a0fc8806129a463d99d4338 SHA1 (patch-ai) = 3c5e4cc1e054514111d50c1d01257f4647b14558 SHA1 (patch-aj) = a805947e1aaf73a798fd3a8c6e39bf1bd62afc3a SHA1 (patch-al) = 8ccbc370bc52882ee72ba76b72a99f163f7b89a7 -SHA1 (patch-am) = 9738bb842646980fccfd7f9eb5f830d1dc994c8c +SHA1 (patch-am) = 9b5679fea4c98ce620386fb50ea787727aaed20b diff --git a/graphics/MesaLib/hacks.mk b/graphics/MesaLib/hacks.mk new file mode 100644 index 00000000000..355e1b8cc28 --- /dev/null +++ b/graphics/MesaLib/hacks.mk @@ -0,0 +1,17 @@ +# $NetBSD: hacks.mk,v 1.1 2006/10/01 20:31:13 schwarz Exp $ + +.if !defined(MESALIBS_HACKS_MK) +MESALIBS_HACKS_MK= # defined + +### [Fri Dec 30 21:00:59 CET 2005 : schwarz] +### make sys/types.h not conflict with inttypes.h +### (issue is specific to IRIX 5.3) +### +.if ${LOWER_OPSYS} == "irix5.3" +PKG_HACKS+= sys_types_h-inttypes_h-conflict +post-wrapper: + ${MKDIR} ${BUILDLINK_DIR}/include/sys && ${GREP} -v '^typedef.*[^u_]int[12368]*_t;' /usr/include/sys/types.h > ${BUILDLINK_DIR}/include/sys/types.h +# should match int8_t, int16_t, and int32_t (only) +.endif + +.endif diff --git a/graphics/MesaLib/patches/patch-am b/graphics/MesaLib/patches/patch-am index 32e255ff197..78810323238 100644 --- a/graphics/MesaLib/patches/patch-am +++ b/graphics/MesaLib/patches/patch-am @@ -1,8 +1,8 @@ -$NetBSD: patch-am,v 1.3 2006/07/06 12:27:43 markd Exp $ +$NetBSD: patch-am,v 1.4 2006/10/01 20:31:13 schwarz Exp $ ---- include/GL/glxext.h.orig 2005-11-08 10:20:29.000000000 +1300 -+++ include/GL/glxext.h -@@ -334,7 +334,7 @@ typedef struct { +--- include/GL/glxext.h.orig 2005-11-07 22:20:29.000000000 +0100 ++++ include/GL/glxext.h 2006-10-01 17:27:07.000000000 +0200 +@@ -334,7 +334,7 @@ #if defined(__sun__) #include <inttypes.h> #if defined(__STDC__) @@ -11,3 +11,12 @@ $NetBSD: patch-am,v 1.3 2006/07/06 12:27:43 markd Exp $ typedef long int int64_t; #else typedef long long int int64_t; +@@ -343,7 +343,7 @@ + #elif defined(__UNIXOS2__) || defined(__SOL64__) + typedef long int int32_t; + typedef long long int int64_t; +-#elif defined( __VMS ) ++#elif defined( __VMS ) || defined(__sgi) + #include <inttypes.h> + #elif defined(__SCO__) || defined(__USLC__) + #include <stdint.h> |