summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskrll <skrll@pkgsrc.org>2002-05-14 22:06:56 +0000
committerskrll <skrll@pkgsrc.org>2002-05-14 22:06:56 +0000
commit0e9301d432cf4b1689934a5d94422e3207a6b97a (patch)
treeaf71ef2117a776a9b7be7413519fbfbbd01242f7
parent38a7373d8578b72172589e8a43ef9425627aa36b (diff)
downloadpkgsrc-0e9301d432cf4b1689934a5d94422e3207a6b97a.tar.gz
Don't include <sys/param.h> in function scope. This make lcms compile when
using nathanw_sa sources.
-rw-r--r--graphics/lcms/distinfo4
-rw-r--r--graphics/lcms/patches/patch-ab16
2 files changed, 12 insertions, 8 deletions
diff --git a/graphics/lcms/distinfo b/graphics/lcms/distinfo
index 2c2c67b929c..3e5dac3f22e 100644
--- a/graphics/lcms/distinfo
+++ b/graphics/lcms/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2002/03/15 11:12:57 markd Exp $
+$NetBSD: distinfo,v 1.6 2002/05/14 22:06:56 skrll Exp $
SHA1 (lcms-1.06.tar.gz) = 3c9e99eb50598a0346c07fb1cacbf6cc4841001b
Size (lcms-1.06.tar.gz) = 644116 bytes
SHA1 (patch-aa) = 52102849563445b39eb8e504e9c6001af84bdbd5
-SHA1 (patch-ab) = 1b1112ce3b412dde44d9daf367b5f3a7c6566b92
+SHA1 (patch-ab) = a1b7b2bcc710b9671bc082ddda981b5a6cd5c5b8
diff --git a/graphics/lcms/patches/patch-ab b/graphics/lcms/patches/patch-ab
index 339317a9032..4de93f1a4f9 100644
--- a/graphics/lcms/patches/patch-ab
+++ b/graphics/lcms/patches/patch-ab
@@ -1,7 +1,5 @@
-$NetBSD: patch-ab,v 1.4 2002/03/15 11:12:57 markd Exp $
-
---- source/cmsmtrx.c Thu May 18 18:08:13 2000
-+++ source/cmsmtrx.c Mon Oct 30 09:53:39 2000
+--- source/cmsmtrx.c.orig Thu May 18 23:08:13 2000
++++ source/cmsmtrx.c Tue May 14 22:38:58 2002
@@ -31,6 +31,7 @@
// Vector & Matrix stuff
@@ -10,12 +8,18 @@ $NetBSD: patch-ab,v 1.4 2002/03/15 11:12:57 markd Exp $
void cdecl VEC3init(LPVEC3 r, double x, double y, double z);
-@@ -248,7 +249,12 @@
+@@ -242,13 +243,18 @@
+ // support asm at all. Use with care, since this will slow down
+ // all operations
+
++#include <sys/param.h>
+ Fixed32 FixedMul(Fixed32 a, Fixed32 b)
+ {
+
// If newest __int64 defined, then use it
#ifdef USE_INT64
- __int64 l = (__int64) a * b + 0x8000i64;
-+#include <sys/param.h>
+#if (defined(BSD) && BSD >= 199506)
+ u_int64_t l = (u_int64_t) a * b + (u_int64_t)0x8000;
+#else