gentoo (valentine's day) resync : 14.02.2021

2 files changed, 0 insertions, 93 deletions

diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index 8a8a26c54202..9333d52cbdb3 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -1,4 +1,3 @@
-AUX opencolorio-1.1.0-fix-compile-error-with-Lut1DOp.cpp.patch 2786 BLAKE2B 91747af3ceac6477d6847c1f87fa69cd77e2cdaaced18cc038ca231af006d453ce4382229b642e8c38ae1642c1f4788c7e9062951e867881bd20012c26a6dcd4 SHA512 2338e1b0994486a7be896d4edddcef67b3b84df9d609e7aebe7a87172163b5f6e7636341e0bfeb0e45d7fdb663932c273ca0568a49ac9d4aa2b827d3808493bc
 AUX opencolorio-1.1.0-remove-Werror.patch 473 BLAKE2B add95a92f243df8abe26f51dbde7992ad398748ace899ead9346e6d640e2142ec895f9abe4601d5c5310f58b411d6fe0902720ba0f1319c027efd53361b39b33 SHA512 6eb2ee8567ba0c0cbe3be5468136834e8b8a62d6f2358f792d05fbf35aaebc17fb62b4bcbfc2f131ea6166236b6ea7b9951faeb916d61e09e5ce8636a18bdc35
 AUX opencolorio-1.1.0-remove-building-of-bundled-programs.patch 6108 BLAKE2B dfd13c22cdcf23e7af75b0c92dd1b85f86e9046c76eadb22b0c1b2bad06f1937bc0d2220a4e2c9a85c0b1b5e6d356b9257fd149ba503944d1bd1356b3d0d51bf SHA512 e14370a15e3e6fc5e3dc70fa52d4e11cf7ac35c2dbc8635e94c52cb02a47f10936e57b1b713f8ee2ca8481ed467e2e6835bf392468bd82d1236a50289df6584e
 AUX opencolorio-1.1.0-use-GNUInstallDirs-and-fix-cmake-install-location.patch 4002 BLAKE2B 8cadf37f7e4ccc2f14268ef71c5765fa43493f6c93ce651d1d2a7a2d5859238ba77802907ee84b0d5efcd6bd75f4ccd13d585f7822a4c8d285be586207e58752 SHA512 37f852d4f0620dd799a7aa09f0c651c72a311656c6ecb72429a440563ca936852a1227a92dca01afd97632f401babf875796f222a82362727ff7074bbe251ac5
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
deleted file mode 100644
index b5455d010b42..000000000000
--- a/media-libs/opencolorio/files/opencolorio-1.1.0-fix-compile-error-with-Lut1DOp.cpp.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 8d38317f68d0e4663abbccdceca0bcd41f3dcf4a Mon Sep 17 00:00:00 2001
-From: Patrick Hodoul <patrick.hodoul@autodesk.com>
-Date: Mon, 27 Nov 2017 17:29:57 -0500
-Subject: [PATCH 1/3] Fix compile error with Lut1DOp.cpp
-
-Fix Linux compilation
-Fix gcc 5.4.0 build breaks
-Fix the temp filename for Linux
----
- src/core/Lut1DOp.cpp                 |  4 +++-
- src/core/MathUtils.cpp               | 23 ++++++++++++-----------
- src/pyglue/PyAllocationTransform.cpp |  1 -
- 3 files changed, 15 insertions(+), 13 deletions(-)
-
-diff --git a/src/core/Lut1DOp.cpp b/src/core/Lut1DOp.cpp
-index 404ee0b..180e30f 100644
---- a/src/core/Lut1DOp.cpp
-+++ b/src/core/Lut1DOp.cpp
-@@ -188,7 +188,8 @@ OCIO_NAMESPACE_ENTER
-         {
-             return simple_lut[clamp(index, 0.0f, maxIndex)];
-         }
--        
-+
-+#if defined(OCIO_UNIT_TEST) || !defined(USE_SSE)
-         void Lut1D_Nearest(float* rgbaBuffer, long numPixels, const Lut1D & lut)
-         {
-             float maxIndex[3];
-@@ -218,6 +219,7 @@ OCIO_NAMESPACE_ENTER
-                 rgbaBuffer += 4;
-             }
-         }
-+#endif
- #ifdef USE_SSE
-         void Lut1D_Nearest_SSE(float* rgbaBuffer, long numPixels, const Lut1D & lut)
-         {
-diff --git a/src/core/MathUtils.cpp b/src/core/MathUtils.cpp
-index e1a26c0..3881eb3 100644
---- a/src/core/MathUtils.cpp
-+++ b/src/core/MathUtils.cpp
-@@ -327,17 +327,6 @@ OCIO_NAMESPACE_ENTER
-         GetV4Sum(vout, vout, v2);
-     }
-     
--    namespace
--    {
--    
--    void GetMxbResult(float* vout, float* m, float* x, float* v)
--    {
--        GetM44V4Product(vout, m, x);
--        GetV4Sum(vout, vout, v);
--    }
--    
--    } // anon namespace
--    
-     bool GetMxbInverse(float* mout, float* vout,
-                        const float* m_, const float* v_)
-     {
-@@ -372,6 +361,18 @@ OCIO_NAMESPACE_USING
- 
- #include "UnitTest.h"
- 
-+namespace
-+{
-+
-+    void GetMxbResult(float* vout, float* m, float* x, float* v)
-+    {
-+        GetM44V4Product(vout, m, x);
-+        GetV4Sum(vout, vout, v);
-+    }
-+
-+}
-+
-+
- OIIO_ADD_TEST(MathUtils, M44_is_diagonal)
- {
-     {
-diff --git a/src/pyglue/PyAllocationTransform.cpp b/src/pyglue/PyAllocationTransform.cpp
-index 20bb50e..06b418a 100644
---- a/src/pyglue/PyAllocationTransform.cpp
-+++ b/src/pyglue/PyAllocationTransform.cpp
-@@ -53,7 +53,6 @@ OCIO_NAMESPACE_ENTER
-         ///
-         
-         int PyOCIO_AllocationTransform_init(PyOCIO_Transform * self, PyObject * args, PyObject * kwds);
--        PyObject * PyOCIO_AllocationTransform_equals(PyObject * self,  PyObject * args);
-         PyObject * PyOCIO_AllocationTransform_getAllocation(PyObject * self);
-         PyObject * PyOCIO_AllocationTransform_setAllocation(PyObject * self,  PyObject * args);
-         PyObject * PyOCIO_AllocationTransform_getNumVars(PyObject * self);
--- 
-2.15.1
-