head 1.3; access; symbols pkgsrc-2026Q1:1.3.0.32 pkgsrc-2026Q1-base:1.3 pkgsrc-2025Q4:1.3.0.30 pkgsrc-2025Q4-base:1.3 pkgsrc-2025Q3:1.3.0.28 pkgsrc-2025Q3-base:1.3 pkgsrc-2025Q2:1.3.0.26 pkgsrc-2025Q2-base:1.3 pkgsrc-2025Q1:1.3.0.24 pkgsrc-2025Q1-base:1.3 pkgsrc-2024Q4:1.3.0.22 pkgsrc-2024Q4-base:1.3 pkgsrc-2024Q3:1.3.0.20 pkgsrc-2024Q3-base:1.3 pkgsrc-2024Q2:1.3.0.18 pkgsrc-2024Q2-base:1.3 pkgsrc-2024Q1:1.3.0.16 pkgsrc-2024Q1-base:1.3 pkgsrc-2023Q4:1.3.0.14 pkgsrc-2023Q4-base:1.3 pkgsrc-2023Q3:1.3.0.12 pkgsrc-2023Q3-base:1.3 pkgsrc-2023Q2:1.3.0.10 pkgsrc-2023Q2-base:1.3 pkgsrc-2023Q1:1.3.0.8 pkgsrc-2023Q1-base:1.3 pkgsrc-2022Q4:1.3.0.6 pkgsrc-2022Q4-base:1.3 pkgsrc-2022Q3:1.3.0.4 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.3.0.2 pkgsrc-2022Q2-base:1.3 pkgsrc-2022Q1:1.2.0.6 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.4 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.2 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.1.0.22 pkgsrc-2021Q2-base:1.1 pkgsrc-2021Q1:1.1.0.20 pkgsrc-2021Q1-base:1.1 pkgsrc-2020Q4:1.1.0.18 pkgsrc-2020Q4-base:1.1 pkgsrc-2020Q3:1.1.0.16 pkgsrc-2020Q3-base:1.1 pkgsrc-2020Q2:1.1.0.14 pkgsrc-2020Q2-base:1.1 pkgsrc-2020Q1:1.1.0.10 pkgsrc-2020Q1-base:1.1 pkgsrc-2019Q4:1.1.0.12 pkgsrc-2019Q4-base:1.1 pkgsrc-2019Q3:1.1.0.8 pkgsrc-2019Q3-base:1.1 pkgsrc-2019Q2:1.1.0.6 pkgsrc-2019Q2-base:1.1 pkgsrc-2019Q1:1.1.0.4 pkgsrc-2019Q1-base:1.1 pkgsrc-2018Q4:1.1.0.2 pkgsrc-2018Q4-base:1.1; locks; strict; comment @// @; 1.3 date 2022.04.29.12.07.43; author adam; state Exp; branches; next 1.2; commitid AdYhez48ptchJ5CD; 1.2 date 2021.07.08.21.23.23; author markd; state Exp; branches; next 1.1; commitid kt0UBDPTkWoLhe0D; 1.1 date 2018.10.26.12.45.47; author jperkin; state Exp; branches; next ; commitid NnmZu3n8jMMg7tXA; desc @@ 1.3 log @py-openexr: updated to 1.3.8 1.3.8 Unknown changes @ text @$NetBSD: patch-OpenEXR.cpp,v 1.2 2021/07/08 21:23:23 markd Exp $ Avoid CS define on SunOS. openexr3 deprecates Int64 --- OpenEXR.cpp.orig 2022-04-17 06:27:41.000000000 +0000 +++ OpenEXR.cpp @@@@ -1,5 +1,9 @@@@ #include +#ifdef __sun +#undef CS +#endif + #if PY_VERSION_HEX < 0x02050000 && !defined(PY_SSIZE_T_MIN) typedef int Py_ssize_t; #define PY_SSIZE_T_MAX INT_MAX @@@@ -43,6 +47,7 @@@@ typedef int Py_ssize_t; #include #include #include +#include #include #include #include @@@@ -73,6 +78,7 @@@@ typedef int Py_ssize_t; #include #include #include +#include #include #define IMATH_VERSION IMATH_VERSION_MAJOR * 10000 + \ @@@@ -115,8 +121,8 @@@@ class C_IStream: public IStream C_IStream (PyObject *fo): IStream(""), _fo(fo) {} virtual bool read (char c[], int n); - virtual Int64 tellg (); - virtual void seekg (Int64 pos); + virtual uint64_t tellg (); + virtual void seekg (uint64_t pos); virtual void clear (); virtual const char* fileName() const; private: @@@@ -142,7 +148,7 @@@@ const char* C_IStream::fileName() const } -Int64 +uint64_t C_IStream::tellg () { PyObject *rv = PyObject_CallMethod(_fo, (char*)"tell", NULL); @@@@ -151,14 +157,14 @@@@ C_IStream::tellg () long long t = PyLong_AsLong(lrv); Py_DECREF(lrv); Py_DECREF(rv); - return (Int64)t; + return (uint64_t)t; } else { throw Iex::InputExc("tell failed"); } } void -C_IStream::seekg (Int64 pos) +C_IStream::seekg (uint64_t pos) { PyObject *data = PyObject_CallMethod(_fo, (char*)"seek", (char*)"(L)", pos); if (data != NULL) { @@@@ -180,8 +186,8 @@@@ class C_OStream: public OStream public: C_OStream (PyObject *fo): OStream(""), _fo(fo) {} virtual void write (const char *c, int n); - virtual Int64 tellp (); - virtual void seekp (Int64 pos); + virtual uint64_t tellp (); + virtual void seekp (uint64_t pos); virtual void clear (); virtual const char* fileName() const; private: @@@@ -206,7 +212,7 @@@@ const char* C_OStream::fileName() const } -Int64 +uint64_t C_OStream::tellp () { PyObject *rv = PyObject_CallMethod(_fo, (char*)"tell", NULL); @@@@ -215,14 +221,14 @@@@ C_OStream::tellp () long long t = PyLong_AsLong(lrv); Py_DECREF(lrv); Py_DECREF(rv); - return (Int64)t; + return (uint64_t)t; } else { throw Iex::InputExc("tell failed"); } } void -C_OStream::seekp (Int64 pos) +C_OStream::seekp (uint64_t pos) { PyObject *data = PyObject_CallMethod(_fo, (char*)"seek", (char*)"(L)", pos); if (data != NULL) { @ 1.2 log @py-openexr: build with openexr3 @ text @d1 1 a1 1 $NetBSD: patch-OpenEXR.cpp,v 1.1 2018/10/26 12:45:47 jperkin Exp $ d6 1 a6 1 --- OpenEXR.cpp.orig 2018-08-30 14:53:51.000000000 +0000 d18 1 a18 1 @@@@ -44,6 +48,7 @@@@ typedef int Py_ssize_t; d26 1 a26 1 @@@@ -72,6 +77,7 @@@@ typedef int Py_ssize_t; d33 2 a34 2 using namespace std; @@@@ -105,8 +111,8 @@@@ class C_IStream: public IStream d45 1 a45 1 @@@@ -132,7 +138,7 @@@@ const char* C_IStream::fileName() const d54 1 a54 1 @@@@ -141,14 +147,14 @@@@ C_IStream::tellg () d71 1 a71 1 @@@@ -170,8 +176,8 @@@@ class C_OStream: public OStream d82 1 a82 1 @@@@ -196,7 +202,7 @@@@ const char* C_OStream::fileName() const d91 1 a91 1 @@@@ -205,14 +211,14 @@@@ C_OStream::tellp () @ 1.1 log @py-openexr: Fix build on SunOS. @ text @d1 1 a1 1 $NetBSD$ d4 1 d18 90 @