Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/files/
Date: Sun, 31 Jan 2021 20:38:23
Message-Id: 1612125490.db354dd4349928af2c7d2ce4bd9cbd5002b04db2.conikost@gentoo
1 commit: db354dd4349928af2c7d2ce4bd9cbd5002b04db2
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Sun Jan 31 18:50:58 2021 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 31 20:38:10 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db354dd4
7
8 media-libs/opencolorio: remove unused patch
9
10 Closes: https://github.com/gentoo/gentoo/pull/19277
11 Package-Manager: Portage-3.0.14, Repoman-3.0.2
12 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
13 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
14
15 ...-1.1.0-fix-compile-error-with-Lut1DOp.cpp.patch | 92 ----------------------
16 1 file changed, 92 deletions(-)
17
18 diff --git a/media-libs/opencolorio/files/opencolorio-1.1.0-fix-compile-error-with-Lut1DOp.cpp.patch b/media-libs/opencolorio/files/opencolorio-1.1.0-fix-compile-error-with-Lut1DOp.cpp.patch
19 deleted file mode 100644
20 index b5455d010b4..00000000000
21 --- a/media-libs/opencolorio/files/opencolorio-1.1.0-fix-compile-error-with-Lut1DOp.cpp.patch
22 +++ /dev/null
23 @@ -1,92 +0,0 @@
24 -From 8d38317f68d0e4663abbccdceca0bcd41f3dcf4a Mon Sep 17 00:00:00 2001
25 -From: Patrick Hodoul <patrick.hodoul@××××××××.com>
26 -Date: Mon, 27 Nov 2017 17:29:57 -0500
27 -Subject: [PATCH 1/3] Fix compile error with Lut1DOp.cpp
28 -
29 -Fix Linux compilation
30 -Fix gcc 5.4.0 build breaks
31 -Fix the temp filename for Linux
32 ----
33 - src/core/Lut1DOp.cpp | 4 +++-
34 - src/core/MathUtils.cpp | 23 ++++++++++++-----------
35 - src/pyglue/PyAllocationTransform.cpp | 1 -
36 - 3 files changed, 15 insertions(+), 13 deletions(-)
37 -
38 -diff --git a/src/core/Lut1DOp.cpp b/src/core/Lut1DOp.cpp
39 -index 404ee0b..180e30f 100644
40 ---- a/src/core/Lut1DOp.cpp
41 -+++ b/src/core/Lut1DOp.cpp
42 -@@ -188,7 +188,8 @@ OCIO_NAMESPACE_ENTER
43 - {
44 - return simple_lut[clamp(index, 0.0f, maxIndex)];
45 - }
46 --
47 -+
48 -+#if defined(OCIO_UNIT_TEST) || !defined(USE_SSE)
49 - void Lut1D_Nearest(float* rgbaBuffer, long numPixels, const Lut1D & lut)
50 - {
51 - float maxIndex[3];
52 -@@ -218,6 +219,7 @@ OCIO_NAMESPACE_ENTER
53 - rgbaBuffer += 4;
54 - }
55 - }
56 -+#endif
57 - #ifdef USE_SSE
58 - void Lut1D_Nearest_SSE(float* rgbaBuffer, long numPixels, const Lut1D & lut)
59 - {
60 -diff --git a/src/core/MathUtils.cpp b/src/core/MathUtils.cpp
61 -index e1a26c0..3881eb3 100644
62 ---- a/src/core/MathUtils.cpp
63 -+++ b/src/core/MathUtils.cpp
64 -@@ -327,17 +327,6 @@ OCIO_NAMESPACE_ENTER
65 - GetV4Sum(vout, vout, v2);
66 - }
67 -
68 -- namespace
69 -- {
70 --
71 -- void GetMxbResult(float* vout, float* m, float* x, float* v)
72 -- {
73 -- GetM44V4Product(vout, m, x);
74 -- GetV4Sum(vout, vout, v);
75 -- }
76 --
77 -- } // anon namespace
78 --
79 - bool GetMxbInverse(float* mout, float* vout,
80 - const float* m_, const float* v_)
81 - {
82 -@@ -372,6 +361,18 @@ OCIO_NAMESPACE_USING
83 -
84 - #include "UnitTest.h"
85 -
86 -+namespace
87 -+{
88 -+
89 -+ void GetMxbResult(float* vout, float* m, float* x, float* v)
90 -+ {
91 -+ GetM44V4Product(vout, m, x);
92 -+ GetV4Sum(vout, vout, v);
93 -+ }
94 -+
95 -+}
96 -+
97 -+
98 - OIIO_ADD_TEST(MathUtils, M44_is_diagonal)
99 - {
100 - {
101 -diff --git a/src/pyglue/PyAllocationTransform.cpp b/src/pyglue/PyAllocationTransform.cpp
102 -index 20bb50e..06b418a 100644
103 ---- a/src/pyglue/PyAllocationTransform.cpp
104 -+++ b/src/pyglue/PyAllocationTransform.cpp
105 -@@ -53,7 +53,6 @@ OCIO_NAMESPACE_ENTER
106 - ///
107 -
108 - int PyOCIO_AllocationTransform_init(PyOCIO_Transform * self, PyObject * args, PyObject * kwds);
109 -- PyObject * PyOCIO_AllocationTransform_equals(PyObject * self, PyObject * args);
110 - PyObject * PyOCIO_AllocationTransform_getAllocation(PyObject * self);
111 - PyObject * PyOCIO_AllocationTransform_setAllocation(PyObject * self, PyObject * args);
112 - PyObject * PyOCIO_AllocationTransform_getNumVars(PyObject * self);
113 ---
114 -2.15.1
115 -