summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoragc <agc>2002-03-15 09:20:04 +0000
committeragc <agc>2002-03-15 09:20:04 +0000
commit9f8e2fc97ac100fd46eea4c2aec8486948e6f3d9 (patch)
treeb75dd152bf27696714731baa72935ef6a56f8c1a
parentc3eadcf29eee3ec6084251b6d9ae0964a2608b49 (diff)
downloadpkgsrc-9f8e2fc97ac100fd46eea4c2aec8486948e6f3d9.tar.gz
Do the previous change a bit differently.
NetBSD 1.5.x (including 1.5.2) doesn't have the C99 types, so use u_int64_t if we're on a 4.4-based platform, uint64_t otherwise.
-rw-r--r--graphics/lcms/distinfo4
-rw-r--r--graphics/lcms/patches/patch-ab19
2 files changed, 18 insertions, 5 deletions
diff --git a/graphics/lcms/distinfo b/graphics/lcms/distinfo
index b9097131a25..ca312007d7a 100644
--- a/graphics/lcms/distinfo
+++ b/graphics/lcms/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2002/03/15 03:58:44 markd Exp $
+$NetBSD: distinfo,v 1.4 2002/03/15 09:20:04 agc Exp $
SHA1 (lcms-1.06.tar.gz) = 3c9e99eb50598a0346c07fb1cacbf6cc4841001b
Size (lcms-1.06.tar.gz) = 644116 bytes
SHA1 (patch-aa) = 52102849563445b39eb8e504e9c6001af84bdbd5
-SHA1 (patch-ab) = bbc0b74a1813293361d0ad38fa9e1c270f94ca81
+SHA1 (patch-ab) = 1d20f39c33c1d2b68ac3e4d1dfa6b0a464eec120
diff --git a/graphics/lcms/patches/patch-ab b/graphics/lcms/patches/patch-ab
index a39bf799387..62c612156f6 100644
--- a/graphics/lcms/patches/patch-ab
+++ b/graphics/lcms/patches/patch-ab
@@ -1,13 +1,26 @@
-$NetBSD: patch-ab,v 1.2 2002/03/15 03:58:45 markd Exp $
+$NetBSD: patch-ab,v 1.3 2002/03/15 09:20:06 agc Exp $
--- source/cmsmtrx.c Thu May 18 18:08:13 2000
+++ source/cmsmtrx.c Mon Oct 30 09:53:39 2000
-@@ -33,2 +33,3 @@
+@@ -31,6 +31,7 @@
+ // Vector & Matrix stuff
+
#include "lcms.h"
+#include <sys/types.h>
-@@ -250,3 +251,3 @@
+
+ void cdecl VEC3init(LPVEC3 r, double x, double y, double z);
+@@ -248,7 +249,12 @@
+ // 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 = (uint64_t) a * b + (uint64_t)0x8000;
++#else
+ uint64_t l = (uint64_t) a * b + (uint64_t)0x8000;
++#endif
return (Fixed32) (l >> 16);
+ #else
+ return DOUBLE_TO_FIXED(FIXED_TO_DOUBLE(a) * FIXED_TO_DOUBLE(b));