diff options
| author | dholland <dholland@pkgsrc.org> | 2012-12-26 21:55:37 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2012-12-26 21:55:37 +0000 |
| commit | 4f0c40284107eb0d8ab1d8e9ce67d7a914e43a4d (patch) | |
| tree | 7e1abc0da04923554f667a8a81bfa9769b84560b /graphics/radiance | |
| parent | db807910465d5cf0bc7606f0a4a860c951e0a9c1 (diff) | |
| download | pkgsrc-4f0c40284107eb0d8ab1d8e9ce67d7a914e43a4d.tar.gz | |
When looking inside FILE, don't assume that platforms without specific
handling that are using gcc are also using glibc. Might fix the Solaris
build.
XXX: looking inside FILE is gross, someone should sort this out
XXX: in collaboration with upstream.
Diffstat (limited to 'graphics/radiance')
| -rw-r--r-- | graphics/radiance/distinfo | 4 | ||||
| -rw-r--r-- | graphics/radiance/patches/patch-ab | 11 |
2 files changed, 10 insertions, 5 deletions
diff --git a/graphics/radiance/distinfo b/graphics/radiance/distinfo index 9ce110279f4..f9f3016f2a9 100644 --- a/graphics/radiance/distinfo +++ b/graphics/radiance/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.12 2011/11/14 02:35:25 dholland Exp $ +$NetBSD: distinfo,v 1.13 2012/12/26 21:55:37 dholland Exp $ SHA1 (rad3R6P1.tar.gz) = 71f46abd1c30be282a93237fa0c162d3bf0b1f99 RMD160 (rad3R6P1.tar.gz) = 3bcf40518a57cdb5455264c83a3e206b67b3d1fa @@ -7,7 +7,7 @@ SHA1 (rad3R6P1supp.tar.gz) = 8a13227eae507a7a4947a49b6aa741c95198ed4e RMD160 (rad3R6P1supp.tar.gz) = 9581a9f979044399e528114875c818b1de2f54ae Size (rad3R6P1supp.tar.gz) = 4632166 bytes SHA1 (patch-aa) = d417dbb99bebaa99e71e2ccfbf2db0d47777b0c8 -SHA1 (patch-ab) = 051d127e149280d127619d646dc8981b124e575e +SHA1 (patch-ab) = a2a6172a3f4c97251c52709dcb4f0ed5231c7b17 SHA1 (patch-ac) = 44ea632411e9db9caa6873588ce44413820eb77b SHA1 (patch-ad) = f3f7c68305964965851c9caeca53f0e534014085 SHA1 (patch-ae) = 83564e054b3832d5c1096c8cd7f5ba75cf75a0a5 diff --git a/graphics/radiance/patches/patch-ab b/graphics/radiance/patches/patch-ab index 882a9404555..cf02cd081f9 100644 --- a/graphics/radiance/patches/patch-ab +++ b/graphics/radiance/patches/patch-ab @@ -1,16 +1,21 @@ -$NetBSD: patch-ab,v 1.2 2006/02/26 21:26:32 joerg Exp $ +$NetBSD: patch-ab,v 1.3 2012/12/26 21:55:37 dholland Exp $ + +Looking inside FILE is gross, but if we're going to do it at least do +it ~correctly. --- src/hd/rhdisp.c.orig 2004-04-10 02:54:06.000000000 +0000 +++ src/hd/rhdisp.c -@@ -22,8 +22,10 @@ static const char RCSid[] = "$Id: rhdisp +@@ -22,9 +22,11 @@ static const char RCSid[] = "$Id: rhdisp #define FSIZDEF 0.125 /* default focus frame size */ #endif -#if defined(freebsd) +#if defined(freebsd) || defined(netbsd) #define fbufcnt(f) ((f)->_r) +-#elif defined(__GNUC__) +#elif defined(dragonfly) +#define fbufcnt(f) (((struct __FILE_public *)(f))->_r) - #elif defined(__GNUC__) ++#elif defined(__linux__) || defined(__GNU_LIBRARY__) #define fbufcnt(f) ((f)->_IO_read_end - (f)->_IO_read_ptr) #else + #define fbufcnt(f) ((f)->_cnt) |