Wed Aug 13 19:23:09 2014 UTC ()
Fix build on 32bit platforms.

Bump the package revision as it is possible that the broken code compiled
on some platforms but won't work properly.


(tron)
diff -r1.32 -r1.33 pkgsrc/graphics/openexr/Makefile
diff -r1.23 -r1.24 pkgsrc/graphics/openexr/distinfo
diff -r0 -r1.1 pkgsrc/graphics/openexr/patches/patch-IlmImf_ImfFastHuf.cpp
cvs diff -r1.32 -r1.33 pkgsrc/graphics/openexr/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/openexr/Makefile 2014/08/11 19:42:46 1.32
+++ pkgsrc/graphics/openexr/Makefile 2014/08/13 19:23:08 1.33
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.32 2014/08/11 19:42:46 adam Exp $ 1# $NetBSD: Makefile,v 1.33 2014/08/13 19:23:08 tron Exp $
2 2
3DISTNAME= openexr-2.2.0 3DISTNAME= openexr-2.2.0
 4PKGREVISION= 1
4CATEGORIES= graphics 5CATEGORIES= graphics
5MASTER_SITES= http://download.savannah.nongnu.org/releases/openexr/ 6MASTER_SITES= http://download.savannah.nongnu.org/releases/openexr/
6 7
7MAINTAINER= adam@NetBSD.org 8MAINTAINER= adam@NetBSD.org
8HOMEPAGE= http://www.openexr.com/ 9HOMEPAGE= http://www.openexr.com/
9COMMENT= High dynamic-range (HDR) image file format library and tools 10COMMENT= High dynamic-range (HDR) image file format library and tools
10LICENSE= modified-bsd 11LICENSE= modified-bsd
11 12
12USE_LANGUAGES= c c++ 13USE_LANGUAGES= c c++
13USE_LIBTOOL= yes 14USE_LIBTOOL= yes
14USE_TOOLS+= gmake pkg-config 15USE_TOOLS+= gmake pkg-config
15GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
16PKGCONFIG_OVERRIDE= OpenEXR.pc.in 17PKGCONFIG_OVERRIDE= OpenEXR.pc.in
cvs diff -r1.23 -r1.24 pkgsrc/graphics/openexr/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/openexr/distinfo 2014/08/11 19:42:46 1.23
+++ pkgsrc/graphics/openexr/distinfo 2014/08/13 19:23:08 1.24
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.23 2014/08/11 19:42:46 adam Exp $ 1$NetBSD: distinfo,v 1.24 2014/08/13 19:23:08 tron Exp $
2 2
3SHA1 (openexr-2.2.0.tar.gz) = d09a68c4443b7a12a0484c073adaef348b44cb92 3SHA1 (openexr-2.2.0.tar.gz) = d09a68c4443b7a12a0484c073adaef348b44cb92
4RMD160 (openexr-2.2.0.tar.gz) = a825ed42e731da3bc39f25ce2a310712a5b0f956 4RMD160 (openexr-2.2.0.tar.gz) = a825ed42e731da3bc39f25ce2a310712a5b0f956
5Size (openexr-2.2.0.tar.gz) = 14489661 bytes 5Size (openexr-2.2.0.tar.gz) = 14489661 bytes
 6SHA1 (patch-IlmImf_ImfFastHuf.cpp) = bf583b5e0efb1af6e00d671b07d4cc154e13ac44
6SHA1 (patch-IlmImf_ImfSystemSpecific.h) = f36d049085e42beabcf5f7af5354009391a1f9f2 7SHA1 (patch-IlmImf_ImfSystemSpecific.h) = f36d049085e42beabcf5f7af5354009391a1f9f2
7SHA1 (patch-aa) = 08b38d81338fc755c321911a9ffa3cccb53e99f3 8SHA1 (patch-aa) = 08b38d81338fc755c321911a9ffa3cccb53e99f3
8SHA1 (patch-ab) = 0efe7155350e1976d1d7bad9da8b1a037fd84572 9SHA1 (patch-ab) = 0efe7155350e1976d1d7bad9da8b1a037fd84572
File Added: pkgsrc/graphics/openexr/patches/Attic/patch-IlmImf_ImfFastHuf.cpp
$NetBSD: patch-IlmImf_ImfFastHuf.cpp,v 1.1 2014/08/13 19:23:09 tron Exp $

Fix build on 32bit systems.

--- IlmImf/ImfFastHuf.cpp.orig	2014-08-10 05:23:56.000000000 +0100
+++ IlmImf/ImfFastHuf.cpp	2014-08-13 19:36:21.000000000 +0100
@@ -107,7 +107,7 @@
     for (int i = 0; i <= MAX_CODE_LEN; ++i)
     {
         codeCount[i] = 0;
-        base[i]      = 0xffffffffffffffffL;
+        base[i]      = 0xffffffffffffffffULL;
         offset[i]    = 0;
     }
 
@@ -352,7 +352,7 @@
 
     for (int i = 0; i <= MAX_CODE_LEN; ++i)
     {
-        if (base[i] != 0xffffffffffffffffL)
+        if (base[i] != 0xffffffffffffffffULL)
         {
             _ljBase[i] = base[i] << (64 - i);
         }
@@ -362,7 +362,7 @@
             // Unused code length - insert dummy values
             //
 
-            _ljBase[i] = 0xffffffffffffffffL;
+            _ljBase[i] = 0xffffffffffffffffULL;
         }
     }
 
@@ -417,7 +417,7 @@
 
     int minIdx = TABLE_LOOKUP_BITS;
 
-    while (minIdx > 0 && _ljBase[minIdx] == 0xffffffffffffffffL)
+    while (minIdx > 0 && _ljBase[minIdx] == 0xffffffffffffffffULL)
         minIdx--;
 
     if (minIdx < 0)
@@ -427,7 +427,7 @@
         // Set the min value such that the table is never tested.
         //
 
-        _tableMin = 0xffffffffffffffffL;
+        _tableMin = 0xffffffffffffffffULL;
     }
     else
     {