Fri Apr 29 12:07:43 2022 UTC ()
py-openexr: updated to 1.3.8

1.3.8
Unknown changes


(adam)
diff -r1.11 -r1.12 pkgsrc/graphics/py-openexr/Makefile
diff -r1.8 -r1.9 pkgsrc/graphics/py-openexr/distinfo
diff -r1.2 -r1.3 pkgsrc/graphics/py-openexr/patches/patch-OpenEXR.cpp
cvs diff -r1.11 -r1.12 pkgsrc/graphics/py-openexr/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/py-openexr/Makefile 2022/01/10 21:49:42 1.11
+++ pkgsrc/graphics/py-openexr/Makefile 2022/04/29 12:07:43 1.12
@@ -1,23 +1,22 @@ @@ -1,23 +1,22 @@
1# $NetBSD: Makefile,v 1.11 2022/01/10 21:49:42 wiz Exp $ 1# $NetBSD: Makefile,v 1.12 2022/04/29 12:07:43 adam Exp $
2 2
3DISTNAME= OpenEXR-1.3.2 3DISTNAME= OpenEXR-1.3.8
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl}
5PKGREVISION= 4 
6CATEGORIES= graphics python 5CATEGORIES= graphics python
7MASTER_SITES= ${MASTER_SITE_PYPI:=O/OpenEXR/} 6MASTER_SITES= ${MASTER_SITE_PYPI:=O/OpenEXR/}
8 7
9MAINTAINER= markd@NetBSD.org 8MAINTAINER= markd@NetBSD.org
10HOMEPAGE= https://www.excamera.com/sphinx/articles-openexr.html 9HOMEPAGE= https://github.com/sanguinariojoe/pip-openexr
11COMMENT= Python module for ILM's OpenEXR image format and library 10COMMENT= Python module for ILM's OpenEXR image format and library
12#LICENSE= unknown 11#LICENSE= unknown
13 12
14USE_LANGUAGES= c c++ 13USE_LANGUAGES= c c++
15 14
16SUBST_CLASSES= fix-path 15SUBST_CLASSES= fix-path
17SUBST_MESSAGE.fix-path= Fixing paths. 16SUBST_MESSAGE.fix-path= Fixing paths.
18SUBST_STAGE.fix-path= pre-configure 17SUBST_STAGE.fix-path= pre-configure
19SUBST_FILES.fix-path= setup.py 18SUBST_FILES.fix-path= setup.py
20SUBST_SED.fix-path= -e 's,/usr/include/OpenEXR,${BUILDLINK_PREFIX.openexr}/include/OpenEXR,' 19SUBST_SED.fix-path= -e 's,/usr/include/OpenEXR,${BUILDLINK_PREFIX.openexr}/include/OpenEXR,'
21SUBST_SED.fix-path+= -e 's,/usr/local/include/OpenEXR,${BUILDLINK_PREFIX.imath}/include/Imath,' 20SUBST_SED.fix-path+= -e 's,/usr/local/include/OpenEXR,${BUILDLINK_PREFIX.imath}/include/Imath,'
22SUBST_SED.fix-path+= -e 's,/usr/local/lib,${BUILDLINK_PREFIX.openexr}/lib,' 21SUBST_SED.fix-path+= -e 's,/usr/local/lib,${BUILDLINK_PREFIX.openexr}/lib,'
23SUBST_SED.fix-path+= -e 's,Half,OpenEXR,' 22SUBST_SED.fix-path+= -e 's,Half,OpenEXR,'
cvs diff -r1.8 -r1.9 pkgsrc/graphics/py-openexr/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/py-openexr/distinfo 2021/10/26 10:46:47 1.8
+++ pkgsrc/graphics/py-openexr/distinfo 2022/04/29 12:07:43 1.9
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.8 2021/10/26 10:46:47 nia Exp $ 1$NetBSD: distinfo,v 1.9 2022/04/29 12:07:43 adam Exp $
2 2
3BLAKE2s (OpenEXR-1.3.2.tar.gz) = 60286995fc1992a1110f34864db66d4b19ec537fbb57f5aac5b4294adc9ec560 3BLAKE2s (OpenEXR-1.3.8.tar.gz) = 04f901a93f1d5f4f690209eb447605510da5ec7b29f9afb529a3d410035ad162
4SHA512 (OpenEXR-1.3.2.tar.gz) = b4b85f3f8860639c4f65a3fe59c721e08573ffe9b2af5cc7e398d9ff249bac604b43fa5bda6f05f8cd248ed7346df1a2972ac7c5a3df12fe0a73b859c618e33d 4SHA512 (OpenEXR-1.3.8.tar.gz) = c6191bbd4bd42e1f7cb267b2059d80ef62c246baa2a7df5279b50c46d0c6b876b2b789cd703a829ad665bf3fd5491aa416d50172d9334d20779c70a43fb31df7
5Size (OpenEXR-1.3.2.tar.gz) = 10927 bytes 5Size (OpenEXR-1.3.8.tar.gz) = 11587 bytes
6SHA1 (patch-OpenEXR.cpp) = f49eafd7188802593b23fe6632327e21cabd8525 6SHA1 (patch-OpenEXR.cpp) = cd3fab27f63da893b19ed0494c9061b351519bd3
cvs diff -r1.2 -r1.3 pkgsrc/graphics/py-openexr/patches/patch-OpenEXR.cpp (expand / switch to unified diff)

--- pkgsrc/graphics/py-openexr/patches/patch-OpenEXR.cpp 2021/07/08 21:23:23 1.2
+++ pkgsrc/graphics/py-openexr/patches/patch-OpenEXR.cpp 2022/04/29 12:07:43 1.3
@@ -1,104 +1,104 @@ @@ -1,104 +1,104 @@
1$NetBSD: patch-OpenEXR.cpp,v 1.2 2021/07/08 21:23:23 markd Exp $ 1$NetBSD: patch-OpenEXR.cpp,v 1.3 2022/04/29 12:07:43 adam Exp $
2 2
3Avoid CS define on SunOS. 3Avoid CS define on SunOS.
4openexr3 deprecates Int64 4openexr3 deprecates Int64
5 5
6--- OpenEXR.cpp.orig 2018-08-30 14:53:51.000000000 +0000 6--- OpenEXR.cpp.orig 2022-04-17 06:27:41.000000000 +0000
7+++ OpenEXR.cpp 7+++ OpenEXR.cpp
8@@ -1,5 +1,9 @@ 8@@ -1,5 +1,9 @@
9 #include <Python.h> 9 #include <Python.h>
10  10
11+#ifdef __sun 11+#ifdef __sun
12+#undef CS 12+#undef CS
13+#endif 13+#endif
14+ 14+
15 #if PY_VERSION_HEX < 0x02050000 && !defined(PY_SSIZE_T_MIN) 15 #if PY_VERSION_HEX < 0x02050000 && !defined(PY_SSIZE_T_MIN)
16 typedef int Py_ssize_t; 16 typedef int Py_ssize_t;
17 #define PY_SSIZE_T_MAX INT_MAX 17 #define PY_SSIZE_T_MAX INT_MAX
18@@ -44,6 +48,7 @@ typedef int Py_ssize_t; 18@@ -43,6 +47,7 @@ typedef int Py_ssize_t;
19 #include <ImfChannelListAttribute.h> 19 #include <ImfChannelListAttribute.h>
20 #include <ImfChromaticitiesAttribute.h> 20 #include <ImfChromaticitiesAttribute.h>
21 #include <ImfCompressionAttribute.h> 21 #include <ImfCompressionAttribute.h>
22+#include <ImfFrameBuffer.h> 22+#include <ImfFrameBuffer.h>
23 #include <ImfDoubleAttribute.h> 23 #include <ImfDoubleAttribute.h>
24 #include <ImfEnvmapAttribute.h> 24 #include <ImfEnvmapAttribute.h>
25 #include <ImfFloatAttribute.h> 25 #include <ImfFloatAttribute.h>
26@@ -72,6 +77,7 @@ typedef int Py_ssize_t; 26@@ -73,6 +78,7 @@ typedef int Py_ssize_t;
27 #include <iostream> 27 #include <iostream>
28 #include <iomanip> 28 #include <iomanip>
29 #include <iostream> 29 #include <iostream>
30+#include <fstream> 30+#include <fstream>
31 #include <vector> 31 #include <vector>
32  32
33 using namespace std; 33 #define IMATH_VERSION IMATH_VERSION_MAJOR * 10000 + \
34@@ -105,8 +111,8 @@ class C_IStream: public IStream 34@@ -115,8 +121,8 @@ class C_IStream: public IStream
35 C_IStream (PyObject *fo): 35 C_IStream (PyObject *fo):
36 IStream(""), _fo(fo) {} 36 IStream(""), _fo(fo) {}
37 virtual bool read (char c[], int n); 37 virtual bool read (char c[], int n);
38- virtual Int64 tellg (); 38- virtual Int64 tellg ();
39- virtual void seekg (Int64 pos); 39- virtual void seekg (Int64 pos);
40+ virtual uint64_t tellg (); 40+ virtual uint64_t tellg ();
41+ virtual void seekg (uint64_t pos); 41+ virtual void seekg (uint64_t pos);
42 virtual void clear (); 42 virtual void clear ();
43 virtual const char* fileName() const; 43 virtual const char* fileName() const;
44 private: 44 private:
45@@ -132,7 +138,7 @@ const char* C_IStream::fileName() const 45@@ -142,7 +148,7 @@ const char* C_IStream::fileName() const
46 } 46 }
47  47
48  48
49-Int64 49-Int64
50+uint64_t 50+uint64_t
51 C_IStream::tellg () 51 C_IStream::tellg ()
52 { 52 {
53 PyObject *rv = PyObject_CallMethod(_fo, (char*)"tell", NULL); 53 PyObject *rv = PyObject_CallMethod(_fo, (char*)"tell", NULL);
54@@ -141,14 +147,14 @@ C_IStream::tellg () 54@@ -151,14 +157,14 @@ C_IStream::tellg ()
55 long long t = PyLong_AsLong(lrv); 55 long long t = PyLong_AsLong(lrv);
56 Py_DECREF(lrv); 56 Py_DECREF(lrv);
57 Py_DECREF(rv); 57 Py_DECREF(rv);
58- return (Int64)t; 58- return (Int64)t;
59+ return (uint64_t)t; 59+ return (uint64_t)t;
60 } else { 60 } else {
61 throw Iex::InputExc("tell failed"); 61 throw Iex::InputExc("tell failed");
62 } 62 }
63 } 63 }
64  64
65 void 65 void
66-C_IStream::seekg (Int64 pos) 66-C_IStream::seekg (Int64 pos)
67+C_IStream::seekg (uint64_t pos) 67+C_IStream::seekg (uint64_t pos)
68 { 68 {
69 PyObject *data = PyObject_CallMethod(_fo, (char*)"seek", (char*)"(L)", pos); 69 PyObject *data = PyObject_CallMethod(_fo, (char*)"seek", (char*)"(L)", pos);
70 if (data != NULL) { 70 if (data != NULL) {
71@@ -170,8 +176,8 @@ class C_OStream: public OStream 71@@ -180,8 +186,8 @@ class C_OStream: public OStream
72 public: 72 public:
73 C_OStream (PyObject *fo): OStream(""), _fo(fo) {} 73 C_OStream (PyObject *fo): OStream(""), _fo(fo) {}
74 virtual void write (const char *c, int n); 74 virtual void write (const char *c, int n);
75- virtual Int64 tellp (); 75- virtual Int64 tellp ();
76- virtual void seekp (Int64 pos); 76- virtual void seekp (Int64 pos);
77+ virtual uint64_t tellp (); 77+ virtual uint64_t tellp ();
78+ virtual void seekp (uint64_t pos); 78+ virtual void seekp (uint64_t pos);
79 virtual void clear (); 79 virtual void clear ();
80 virtual const char* fileName() const; 80 virtual const char* fileName() const;
81 private: 81 private:
82@@ -196,7 +202,7 @@ const char* C_OStream::fileName() const 82@@ -206,7 +212,7 @@ const char* C_OStream::fileName() const
83 } 83 }
84  84
85  85
86-Int64 86-Int64
87+uint64_t 87+uint64_t
88 C_OStream::tellp () 88 C_OStream::tellp ()
89 { 89 {
90 PyObject *rv = PyObject_CallMethod(_fo, (char*)"tell", NULL); 90 PyObject *rv = PyObject_CallMethod(_fo, (char*)"tell", NULL);
91@@ -205,14 +211,14 @@ C_OStream::tellp () 91@@ -215,14 +221,14 @@ C_OStream::tellp ()
92 long long t = PyLong_AsLong(lrv); 92 long long t = PyLong_AsLong(lrv);
93 Py_DECREF(lrv); 93 Py_DECREF(lrv);
94 Py_DECREF(rv); 94 Py_DECREF(rv);
95- return (Int64)t; 95- return (Int64)t;
96+ return (uint64_t)t; 96+ return (uint64_t)t;
97 } else { 97 } else {
98 throw Iex::InputExc("tell failed"); 98 throw Iex::InputExc("tell failed");
99 } 99 }
100 } 100 }
101  101
102 void 102 void
103-C_OStream::seekp (Int64 pos) 103-C_OStream::seekp (Int64 pos)
104+C_OStream::seekp (uint64_t pos) 104+C_OStream::seekp (uint64_t pos)