Update to 1.1.1.
Removing python glue module as python 3 is not currently supported.
This commit is contained in:
Richard Shaw
parent
bdf51bff0a
commit
4e736d1bdd
|
|
@ -2,3 +2,4 @@
|
|||
/OpenColorIO-1.0.8.tar.gz
|
||||
/OpenColorIO-1.0.9.tar.gz
|
||||
/OpenColorIO-1.1.0.tar.gz
|
||||
/OpenColorIO-1.1.1.tar.gz
|
||||
|
|
|
|||
|
|
@ -10,47 +10,9 @@ Subject: [PATCH] Fix Linux compilation Fix gcc 5.4.0 build breaks Fix the temp
|
|||
src/pyglue/PyAllocationTransform.cpp | 1 -
|
||||
3 files changed, 15 insertions(+), 13 deletions(-)
|
||||
|
||||
--- 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)
|
||||
{
|
||||
--- 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
|
||||
@@ -374,6 +374,18 @@ OCIO_NAMESPACE_USING
|
||||
|
||||
#include "UnitTest.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -4,32 +4,51 @@
|
|||
%endif
|
||||
|
||||
Name: OpenColorIO
|
||||
Version: 1.1.0
|
||||
Release: 11%{?dist}
|
||||
Version: 1.1.1
|
||||
Release: 1%{?dist}
|
||||
Summary: Enables color transforms and image display across graphics apps
|
||||
|
||||
License: BSD
|
||||
URL: http://opencolorio.org/
|
||||
Source0: https://github.com/imageworks/OpenColorIO/archive/v%{version}/%{name}-%{version}.tar.gz
|
||||
Patch0: OpenColorIO-gcc.patch
|
||||
Patch1: OpenColorIO-setuptools.patch
|
||||
|
||||
# Work with system libraries instead of bundled.
|
||||
Patch0: OpenColorIO-setuptools.patch
|
||||
# Fix build against yaml-cpp 0.6.0+
|
||||
# This patch is fine for our case (building against system yaml-cpp)
|
||||
# but probably a bit too simple-minded to upstream as-is. See
|
||||
# https://github.com/imageworks/OpenColorIO/issues/517
|
||||
Patch2: ocio-1.1.0-yamlcpp060.patch
|
||||
# Fix build of Python bindings with GCC 8
|
||||
# https://github.com/imageworks/OpenColorIO/pull/518
|
||||
Patch3: ocio-1.1.0-gcc8.patch
|
||||
Patch4: ocio-oiio2.patch
|
||||
Patch5: ocio-glext_h.patch
|
||||
Patch1: ocio-1.1.0-yamlcpp060.patch
|
||||
Patch2: ocio-glext_h.patch
|
||||
|
||||
# Utilities
|
||||
BuildRequires: cmake gcc-c++
|
||||
BuildRequires: help2man
|
||||
BuildRequires: python3
|
||||
BuildRequires: python3-markupsafe
|
||||
BuildRequires: python3-setuptools
|
||||
|
||||
# Libraries
|
||||
BuildRequires: mesa-libGL-devel mesa-libGLU-devel
|
||||
BuildRequires: libX11-devel libXmu-devel libXi-devel
|
||||
BuildRequires: freeglut-devel
|
||||
BuildRequires: glew-devel
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: zlib-devel
|
||||
|
||||
# WARNING: OpenColorIO and OpenImageIO are cross dependent.
|
||||
# If an ABI incompatible update is done in one, the other also needs to be
|
||||
# rebuilt.
|
||||
BuildRequires: OpenImageIO-devel
|
||||
BuildRequires: OpenEXR-devel
|
||||
|
||||
#######################
|
||||
# Unbundled libraries #
|
||||
#######################
|
||||
BuildRequires: tinyxml-devel
|
||||
BuildRequires: lcms2-devel
|
||||
BuildRequires: yaml-cpp-devel >= 0.5.0
|
||||
|
||||
%if 0%{?docs}
|
||||
# Needed for pdf documentation generation
|
||||
BuildRequires: texlive-latex-bin-bin texlive-gsftopk-bin texlive-dvips
|
||||
|
|
@ -50,26 +69,6 @@ BuildRequires: texlive-framed texlive-threeparttable texlive-wrapfig
|
|||
BuildRequires: texlive-hyphen-base
|
||||
%endif
|
||||
|
||||
# WARNING: OpenColorIO and OpenImageIO are cross dependent.
|
||||
# If an ABI incompatible update is done in one, the other also needs to be
|
||||
# rebuilt.
|
||||
BuildRequires: OpenImageIO-devel
|
||||
BuildRequires: OpenEXR-devel
|
||||
|
||||
# Libraries
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: mesa-libGL-devel mesa-libGLU-devel
|
||||
BuildRequires: libX11-devel libXmu-devel libXi-devel
|
||||
BuildRequires: freeglut-devel
|
||||
BuildRequires: glew-devel
|
||||
BuildRequires: zlib-devel
|
||||
|
||||
#######################
|
||||
# Unbundled libraries #
|
||||
#######################
|
||||
BuildRequires: tinyxml-devel
|
||||
BuildRequires: lcms2-devel
|
||||
BuildRequires: yaml-cpp-devel >= 0.5.0
|
||||
|
||||
# The following bundled projects are only used for document generation.
|
||||
#BuildRequires: python-docutils
|
||||
|
|
@ -129,8 +128,8 @@ rm -f ext/yaml*
|
|||
rm -rf build && mkdir build && pushd build
|
||||
%cmake -DOCIO_BUILD_STATIC=OFF \
|
||||
-DOCIO_BUILD_DOCS=%{?docs:ON}%{?!docs:OFF} \
|
||||
-DOCIO_BUILD_PYGLUE=OFF \
|
||||
-DOCIO_BUILD_TESTS=%{?tests:ON}%{?!tests:OFF} \
|
||||
-DOCIO_PYGLUE_SONAME=OFF \
|
||||
-DPYTHON=%{__python3} \
|
||||
-DUSE_EXTERNAL_YAML=TRUE \
|
||||
-DUSE_EXTERNAL_TINYXML=TRUE \
|
||||
|
|
@ -184,7 +183,7 @@ find %{buildroot} -name "*.cmake" -exec mv {} %{buildroot}%{_datadir}/cmake/Modu
|
|||
%{_libdir}/*.so.*
|
||||
%dir %{_datadir}/ocio
|
||||
%{_datadir}/ocio/setup_ocio.sh
|
||||
%{python3_sitearch}/*.so
|
||||
#{python3_sitearch}/*.so
|
||||
|
||||
%files tools
|
||||
%{_bindir}/*
|
||||
|
|
@ -198,12 +197,16 @@ find %{buildroot} -name "*.cmake" -exec mv {} %{buildroot}%{_datadir}/cmake/Modu
|
|||
%files devel
|
||||
%{_datadir}/cmake/Modules/*
|
||||
%{_includedir}/OpenColorIO/
|
||||
%{_includedir}/PyOpenColorIO/
|
||||
#{_includedir}/PyOpenColorIO/
|
||||
%{_libdir}/*.so
|
||||
%{_libdir}/pkgconfig/%{name}.pc
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Apr 03 2019 Richard Shaw <hobbes1069@gmail.com> - 1.1.1-1
|
||||
- Update to 1.1.1.
|
||||
- Removing python glue module as python 3 is not currently supported.
|
||||
|
||||
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- OpenColorIO-1.1.0/src/core/OCIOYaml.cpp 2018-01-04 17:38:27.000000000 -0800
|
||||
+++ OpenColorIO-1.1.0/src/core/OCIOYaml.cpp.new 2018-02-19 16:37:56.733948242 -0800
|
||||
@@ -30,43 +30,6 @@
|
||||
--- a/src/core/OCIOYaml.cpp
|
||||
+++ b/src/core/OCIOYaml.cpp
|
||||
@@ -30,43 +30,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
|
||||
#include <OpenColorIO/OpenColorIO.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- a/src/apps/ociodisplay/main.cpp
|
||||
+++ b/src/apps/ociodisplay/main.cpp
|
||||
@@ -52,7 +52,6 @@ namespace OCIO = OCIO_NAMESPACE;
|
||||
@@ -56,7 +56,6 @@ namespace OCIO = OCIO_NAMESPACE;
|
||||
#else
|
||||
#include <GL/glew.h>
|
||||
#include <GL/gl.h>
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (OpenColorIO-1.1.0.tar.gz) = 909874a9f91a8d229622810fc70233680c6e75203bd8555179322de2873da00bf302432e19f189b787ffcda3157ddec1e4601c97f75a36e16f644fe7d42f6998
|
||||
SHA512 (OpenColorIO-1.1.1.tar.gz) = bed722f9ddce1887d28aacef2882debccd7c3f3c0c708d2723fea58a097de9f02721af9e85453e089ffda5406aef593ab6536c6886307823c132aa787e492e33
|
||||
|
|
|
|||
Loading…
Reference in New Issue