* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/files/
@ 2016-11-17 12:14 Michael Palimaka
0 siblings, 0 replies; 3+ messages in thread
From: Michael Palimaka @ 2016-11-17 12:14 UTC (permalink / raw
To: gentoo-commits
commit: d1ad11166815a4ad3ad32065b21c38986d3bbda0
Author: Christophe Lermytte <gentoo <AT> lermytte <DOT> be>
AuthorDate: Wed Nov 16 17:28:50 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Nov 17 12:14:08 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1ad1116
media-libs/opencolorio: bring back deleted patch to fix bug #600022
.../opencolorio-1.0.8-documentation-gen.patch | 54 ++++++++++++++++++++++
1 file changed, 54 insertions(+)
diff --git a/media-libs/opencolorio/files/opencolorio-1.0.8-documentation-gen.patch b/media-libs/opencolorio/files/opencolorio-1.0.8-documentation-gen.patch
new file mode 100644
index 00000000..7a396b3
--- /dev/null
+++ b/media-libs/opencolorio/files/opencolorio-1.0.8-documentation-gen.patch
@@ -0,0 +1,54 @@
+--- a/docs/CMakeLists.txt 2013-01-08 03:19:23.649162615 +0400
++++ b/docs/CMakeLists.txt 2013-01-08 03:22:29.647329174 +0400
+@@ -81,7 +81,7 @@
+ ExtractRstCPP(${CMAKE_SOURCE_DIR}/export/OpenColorIO/OpenColorTypes.h developers/api/OpenColorTypes.rst)
+
+ add_custom_target(doc ALL
+- COMMAND PYTHONPATH=${PYTHONPATH} ${EXTDIST_BINPATH}/sphinx-build -b html . ${CMAKE_CURRENT_BINARY_DIR}/build-html
++ COMMAND sphinx-build -b html . ${CMAKE_CURRENT_BINARY_DIR}/build-html
+ DEPENDS
+ OpenColorIO
+ PyOpenColorIO
+@@ -93,20 +93,18 @@
+ COMMENT "Building html docs"
+ SOURCES ${DOCFILES})
+
+-# note: ExternalProject will not build when added to a add_custom_target this
+-# works around this problem. This seems to be fixed in the cmake ^HEAD
+-add_dependencies(doc Sphinx)
+-
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
+- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
++ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/$ENV{P}/html
+ PATTERN .* EXCLUDE
+ )
+
++if(OCIO_BUILD_PDF_DOCS)
++
+ find_package(LATEX)
+ if(PDFLATEX_COMPILER)
+
+ add_custom_target(latex
+- COMMAND PYTHONPATH=${PYTHONPATH} ${EXTDIST_BINPATH}/sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex
++ COMMAND sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex
+ DEPENDS
+ OpenColorIO
+ ${CMAKE_BINARY_DIR}/docs/conf.py
+@@ -116,7 +114,6 @@
+ ${RSTDOC_OUTPUT}
+ COMMENT "Building latex doc"
+ SOURCES ${DOCFILES})
+- add_dependencies(latex Sphinx)
+
+ add_custom_target(pdf ALL
+ COMMAND ${PDFLATEX_COMPILER} OpenColorIO.tex
+@@ -126,6 +123,8 @@
+ add_dependencies(pdf latex)
+
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
+- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
++ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/$ENV{P}/)
+
+ endif()
++
++endif()
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/files/
@ 2016-12-22 15:29 Michael Palimaka
0 siblings, 0 replies; 3+ messages in thread
From: Michael Palimaka @ 2016-12-22 15:29 UTC (permalink / raw
To: gentoo-commits
commit: c90d45982f19cdb94ba0471896916a379e84303d
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Dec 19 19:55:20 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Dec 22 15:29:20 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c90d4598
media-libs/opencolorio: remove unused patch
...lorio-1.0.8-remove-external-doc-utilities.patch | 65 ----------------------
1 file changed, 65 deletions(-)
diff --git a/media-libs/opencolorio/files/opencolorio-1.0.8-remove-external-doc-utilities.patch b/media-libs/opencolorio/files/opencolorio-1.0.8-remove-external-doc-utilities.patch
deleted file mode 100644
index 270e67a..00000000
--- a/media-libs/opencolorio/files/opencolorio-1.0.8-remove-external-doc-utilities.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- docs/CMakeLists.txt.orig 2013-01-22 08:58:12.426195213 +0400
-+++ docs/CMakeLists.txt 2013-01-22 08:58:25.201194476 +0400
-@@ -1,62 +1,3 @@
--
--###############################################################################
--### External Doc Apps ###
--
--# setuptools
--set(SETUPTOOLS_VERSION 0.6c11)
--ExternalProject_Add(setuptools
-- URL ${CMAKE_SOURCE_DIR}/ext/setuptools-${SETUPTOOLS_VERSION}.tar.gz
-- BUILD_IN_SOURCE 1
-- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
-- BUILD_COMMAND PYTHONPATH=${PYTHONPATH} python setup.py build
-- INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} python setup.py install --prefix=${EXTDIST_ROOT}
--)
--
--# docutils
--set(DOCUTILS_VERSION 0.7)
--ExternalProject_Add(docutils
-- DEPENDS setuptools
-- URL ${CMAKE_SOURCE_DIR}/ext/docutils-${DOCUTILS_VERSION}.tar.gz
-- BUILD_IN_SOURCE 1
-- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
-- BUILD_COMMAND PYTHONPATH=${PYTHONPATH} python setup.py build
-- INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} python setup.py install --prefix=${EXTDIST_ROOT}
--)
--
--# jinja2
--set(JINJA2_VERSION 2.5.5)
--ExternalProject_Add(Jinja2
-- DEPENDS setuptools
-- URL ${CMAKE_SOURCE_DIR}/ext/Jinja2-${JINJA2_VERSION}.tar.gz
-- BUILD_IN_SOURCE 1
-- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
-- BUILD_COMMAND PYTHONPATH=${PYTHONPATH} python setup.py build
-- INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} python setup.py install --prefix=${EXTDIST_ROOT}
--)
--
--# Pygments
--set(PYGMENTS_VERSION 1.3.1)
--ExternalProject_Add(Pygments
-- DEPENDS setuptools
-- URL ${CMAKE_SOURCE_DIR}/ext/Pygments-${PYGMENTS_VERSION}.tar.gz
-- BUILD_IN_SOURCE 1
-- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
-- BUILD_COMMAND PYTHONPATH=${PYTHONPATH} python setup.py build
-- INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} python setup.py install --prefix=${EXTDIST_ROOT}
--)
--
--# sphinx
--set(SPHINX_VERSION f52b631f501a) # 1.1pre
--ExternalProject_Add(Sphinx
-- DEPENDS setuptools docutils Jinja2 Pygments
-- URL ${CMAKE_SOURCE_DIR}/ext/sphinx-${SPHINX_VERSION}.tar.gz
-- PATCH_COMMAND patch -p1 < ${CMAKE_SOURCE_DIR}/ext/sphinx-${SPHINX_VERSION}.patch
-- BUILD_IN_SOURCE 1
-- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
-- BUILD_COMMAND PYTHONPATH=${PYTHONPATH} python setup.py build
-- INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} python setup.py install --prefix=${EXTDIST_ROOT} --install-scripts=${EXTDIST_ROOT}/bin
--)
--
- ###############################################################################
- ### Create Doc Targets ###
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/files/
@ 2021-01-31 20:38 Conrad Kostecki
0 siblings, 0 replies; 3+ messages in thread
From: Conrad Kostecki @ 2021-01-31 20:38 UTC (permalink / raw
To: gentoo-commits
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
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-01-31 20:38 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-12-22 15:29 [gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/files/ Michael Palimaka
-- strict thread matches above, loose matches on Subject: below --
2021-01-31 20:38 Conrad Kostecki
2016-11-17 12:14 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox