public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Conrad Kostecki" <conikost@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/files/
Date: Sun, 31 Jan 2021 20:38:18 +0000 (UTC)	[thread overview]
Message-ID: <1612125490.db354dd4349928af2c7d2ce4bd9cbd5002b04db2.conikost@gentoo> (raw)

commit:     db354dd4349928af2c7d2ce4bd9cbd5002b04db2
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Jan 31 18:50:58 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Jan 31 20:38:10 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db354dd4

media-libs/opencolorio: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/19277
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 ...-1.1.0-fix-compile-error-with-Lut1DOp.cpp.patch | 92 ----------------------
 1 file changed, 92 deletions(-)

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 b5455d010b4..00000000000
--- 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
-


             reply	other threads:[~2021-01-31 20:38 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-31 20:38 Conrad Kostecki [this message]
  -- strict thread matches above, loose matches on Subject: below --
2016-12-22 15:29 [gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/files/ Michael Palimaka
2016-11-17 12:14 Michael Palimaka

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1612125490.db354dd4349928af2c7d2ce4bd9cbd5002b04db2.conikost@gentoo \
    --to=conikost@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox