Compare commits
31 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
fc05cf467c | ||
|
4bce92e396 | ||
|
7d38d8d3b1 | ||
|
e05bef6221 | ||
|
edaca86c22 | ||
|
71f8c43d53 | ||
|
c7a8ea7afd | ||
|
1777ff3701 | ||
|
ebf90ff844 | ||
|
e58a811642 | ||
|
118f85dfcd | ||
|
3e8ac4fd40 | ||
|
d0329bc1f8 | ||
|
e4da1f4b9e | ||
|
41840af9ee | ||
|
7f7a94e9df | ||
|
11cb2a0952 | ||
|
4cd8127088 | ||
|
13a6d4d5db | ||
|
b4fe0f4e9e | ||
|
c7afe62ad2 | ||
|
0b44c2a2b8 | ||
|
0950bcef35 | ||
|
42cbd9df4b | ||
|
a9b1b66ee6 | ||
|
cb59c26b8f | ||
|
152e9cb0a1 | ||
|
f943e9b45d | ||
|
9a25bfa43a | ||
|
0059b1880f | ||
|
d2de431b67 |
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,3 +1,4 @@
|
||||
/imageworks-OpenColorIO-v1.0.7-0-g87da508.tar.gz
|
||||
/OpenColorIO-1.0.8.tar.gz
|
||||
/OpenColorIO-1.0.9.tar.gz
|
||||
/OpenColorIO-1.1.0.tar.gz
|
||||
|
81
OpenColorIO-gcc.patch
Normal file
81
OpenColorIO-gcc.patch
Normal file
@ -0,0 +1,81 @@
|
||||
From f39552d70098a98f7c1fb3b4f020b550ce2dd75a 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] 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(-)
|
||||
|
||||
--- 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
|
||||
|
||||
#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)
|
||||
{
|
||||
{
|
||||
--- 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);
|
85
OpenColorIO-setuptools.patch
Normal file
85
OpenColorIO-setuptools.patch
Normal file
@ -0,0 +1,85 @@
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -39,7 +39,8 @@ option(OCIO_PYGLUE_LIB_PREFIX "If ON, pr
|
||||
if(UNIX AND NOT APPLE)
|
||||
option(USE_EXTERNAL_YAML "Use system installed yaml-cpp library." OFF)
|
||||
option(USE_EXTERNAL_TINYXML "Use system installed tinyxml library." OFF)
|
||||
- option(USE_EXTERNAL_LCMS "Use system install lcms2 library." OFF)
|
||||
+ option(USE_EXTERNAL_LCMS "Use system installed lcms2 library." OFF)
|
||||
+ option(USE_EXTERNAL_SETUPTOOLS "Use system installed python setuptools." OFF)
|
||||
endif()
|
||||
|
||||
# This does not include the SOVERSION override, on purpose, so that the
|
||||
--- a/docs/CMakeLists.txt
|
||||
+++ b/docs/CMakeLists.txt
|
||||
@@ -19,18 +19,22 @@ else()
|
||||
set(PYT_EXTDIST_BINPATH ${EXTDIST_BINPATH})
|
||||
endif()
|
||||
|
||||
-# setuptools
|
||||
-# https://pypi.python.org/pypi/setuptools
|
||||
-set(SETUPTOOLS_VERSION 1.1.6)
|
||||
-
|
||||
-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 ${PYT_PRE_CMD} ${PYTHON} setup.py build
|
||||
- INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT}
|
||||
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/setuptools-prefix/src/setuptools
|
||||
-)
|
||||
+if(USE_EXTERNAL_SETUPTOOLS)
|
||||
+ add_custom_target(setuptools /usr/bin/true)
|
||||
+else()
|
||||
+ # setuptools
|
||||
+ # https://pypi.python.org/pypi/setuptools
|
||||
+ set(SETUPTOOLS_VERSION 1.1.6)
|
||||
+
|
||||
+ 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 ${PYT_PRE_CMD} ${PYTHON} setup.py build
|
||||
+ INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT} --install-lib=${EXTDIST_PYTHONPATH}
|
||||
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/setuptools-prefix/src/setuptools
|
||||
+ )
|
||||
+endif()
|
||||
|
||||
# docutils
|
||||
# https://pypi.python.org/pypi/docutils
|
||||
@@ -41,7 +45,7 @@ ExternalProject_Add(docutils
|
||||
BUILD_IN_SOURCE 1
|
||||
CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
|
||||
BUILD_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py build
|
||||
- INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT}
|
||||
+ INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT} --install-lib=${EXTDIST_PYTHONPATH}
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/docutils-prefix/src/docutils
|
||||
)
|
||||
|
||||
@@ -54,7 +58,7 @@ ExternalProject_Add(Jinja2
|
||||
BUILD_IN_SOURCE 1
|
||||
CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
|
||||
BUILD_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py build
|
||||
- INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT}
|
||||
+ INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT} --install-lib=${EXTDIST_PYTHONPATH}
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Jinja2-prefix/src/Jinja2
|
||||
)
|
||||
|
||||
@@ -67,7 +71,7 @@ ExternalProject_Add(Pygments
|
||||
BUILD_IN_SOURCE 1
|
||||
CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
|
||||
BUILD_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py build
|
||||
- INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT}
|
||||
+ INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT} --install-lib=${EXTDIST_PYTHONPATH}
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Pygments-prefix/src/Pygments
|
||||
)
|
||||
|
||||
@@ -81,7 +85,7 @@ ExternalProject_Add(Sphinx
|
||||
BUILD_IN_SOURCE 1
|
||||
CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
|
||||
BUILD_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py build
|
||||
- INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT} --install-scripts=${PYT_EXTDIST_BINPATH}
|
||||
+ INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT} --install-scripts=${PYT_EXTDIST_BINPATH} --install-lib=${EXTDIST_PYTHONPATH}
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Sphinx-prefix/src/Sphinx
|
||||
)
|
||||
|
@ -1,24 +0,0 @@
|
||||
diff -Naur OpenColorIO-1.0.9.orig/CMakeLists.txt OpenColorIO-1.0.9/CMakeLists.txt
|
||||
--- OpenColorIO-1.0.9.orig/CMakeLists.txt 2013-10-08 17:59:34.000000000 -0500
|
||||
+++ OpenColorIO-1.0.9/CMakeLists.txt 2013-11-05 21:20:11.824239166 -0600
|
||||
@@ -190,7 +190,7 @@
|
||||
# Set minimum yaml version for non-patched sources.
|
||||
set(YAML_VERSION_MIN "0.3.0")
|
||||
include(FindPkgConfig)
|
||||
- pkg_check_modules(YAML_CPP yaml-cpp)
|
||||
+ pkg_search_module(YAML_CPP yaml-cpp yaml-cpp03)
|
||||
if(YAML_CPP_FOUND)
|
||||
if(YAML_CPP_VERSION VERSION_EQUAL ${YAML_VERSION_MIN} OR
|
||||
YAML_CPP_VERSION VERSION_GREATER ${YAML_VERSION_MIN})
|
||||
diff -Naur OpenColorIO-1.0.9.orig/src/core/OCIOYaml.h OpenColorIO-1.0.9/src/core/OCIOYaml.h
|
||||
--- OpenColorIO-1.0.9.orig/src/core/OCIOYaml.h 2013-10-08 17:59:34.000000000 -0500
|
||||
+++ OpenColorIO-1.0.9/src/core/OCIOYaml.h 2013-11-05 21:19:23.989303122 -0600
|
||||
@@ -68,7 +68,7 @@
|
||||
|
||||
#endif
|
||||
|
||||
-#include <yaml-cpp/yaml.h>
|
||||
+#include <yaml-cpp03/yaml.h>
|
||||
|
||||
#ifndef INCLUDED_OCIO_YAML_H
|
||||
#define INCLUDED_OCIO_YAML_H
|
160
OpenColorIO.spec
160
OpenColorIO.spec
@ -1,33 +1,67 @@
|
||||
# Filter provides from Python libraries
|
||||
%{?filter_setup:
|
||||
%filter_provides_in %{python_sitearch}.*\.so$
|
||||
%filter_setup
|
||||
}
|
||||
#%{?filter_setup:
|
||||
#%filter_provides_in %{python2_sitearch}.*\.so$
|
||||
#%filter_setup
|
||||
#}
|
||||
|
||||
%if ! 0%{?bootstrap}
|
||||
%global docs 1
|
||||
%global tests 1
|
||||
%endif
|
||||
|
||||
Name: OpenColorIO
|
||||
Version: 1.0.9
|
||||
Version: 1.1.0
|
||||
Release: 6%{?dist}
|
||||
Summary: Enables color transforms and image display across graphics apps
|
||||
|
||||
License: BSD
|
||||
URL: http://opencolorio.org/
|
||||
# Github archive was generated on the fly using the following URL:
|
||||
# https://github.com/imageworks/OpenColorIO/tarball/v1.0.9
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
Patch0: OpenColorIO-yaml_cpp3.patch
|
||||
Source0: https://github.com/imageworks/OpenColorIO/archive/v%{version}/%{name}-%{version}.tar.gz
|
||||
Patch0: OpenColorIO-gcc.patch
|
||||
Patch1: 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
|
||||
|
||||
# Utilities
|
||||
BuildRequires: cmake
|
||||
BuildRequires: cmake gcc-c++
|
||||
BuildRequires: help2man
|
||||
BuildRequires: python-markupsafe
|
||||
BuildRequires: python2-markupsafe
|
||||
BuildRequires: python2-setuptools
|
||||
|
||||
%if 0%{?docs}
|
||||
# Needed for pdf documentation generation
|
||||
BuildRequires: texlive-latex-bin-bin texlive-gsftopk-bin texlive-dvips
|
||||
# Fonts
|
||||
BuildRequires: texlive-cm texlive-ec texlive-times texlive-helvetic
|
||||
BuildRequires: texlive-courier
|
||||
# Map tables
|
||||
BuildRequires: texlive-cmap
|
||||
# Font maps
|
||||
BuildRequires: texlive-updmap-map
|
||||
# Babel
|
||||
BuildRequires: texlive-babel-english
|
||||
# Styles
|
||||
BuildRequires: texlive-fancyhdr texlive-fancybox texlive-mdwtools
|
||||
BuildRequires: texlive-parskip texlive-multirow texlive-titlesec
|
||||
BuildRequires: texlive-framed texlive-threeparttable texlive-wrapfig
|
||||
# Other
|
||||
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: python-devel
|
||||
BuildRequires: python2-devel
|
||||
BuildRequires: mesa-libGL-devel mesa-libGLU-devel
|
||||
BuildRequires: libX11-devel libXmu-devel libXi-devel
|
||||
BuildRequires: freeglut-devel
|
||||
@ -39,7 +73,7 @@ BuildRequires: zlib-devel
|
||||
#######################
|
||||
BuildRequires: tinyxml-devel
|
||||
BuildRequires: lcms2-devel
|
||||
BuildRequires: yaml-cpp03-devel >= 0.3.0
|
||||
BuildRequires: yaml-cpp-devel >= 0.5.0
|
||||
|
||||
# The following bundled projects are only used for document generation.
|
||||
#BuildRequires: python-docutils
|
||||
@ -48,6 +82,11 @@ BuildRequires: yaml-cpp03-devel >= 0.3.0
|
||||
#BuildRequires: python-setuptools
|
||||
#BuildRequires: python-sphinx
|
||||
|
||||
%if ! 0%{?docs}
|
||||
# upgrade path for when/if docs are not included
|
||||
Obsoletes: %{name}-doc < %{version}-%{release}
|
||||
%endif
|
||||
|
||||
|
||||
%description
|
||||
OCIO enables color transforms and image display to be handled in a consistent
|
||||
@ -84,8 +123,7 @@ Development libraries and headers for %{name}.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1 -b .yaml3
|
||||
%autosetup -p1
|
||||
|
||||
# Remove what bundled libraries
|
||||
rm -f ext/lcms*
|
||||
@ -96,18 +134,19 @@ rm -f ext/yaml*
|
||||
%build
|
||||
rm -rf build && mkdir build && pushd build
|
||||
%cmake -DOCIO_BUILD_STATIC=OFF \
|
||||
-DOCIO_BUILD_DOCS=ON \
|
||||
-DOCIO_BUILD_TESTS=ON \
|
||||
-DOCIO_BUILD_DOCS=%{?docs:ON}%{?!docs:OFF} \
|
||||
-DOCIO_BUILD_TESTS=%{?tests:ON}%{?!tests:OFF} \
|
||||
-DOCIO_PYGLUE_SONAME=OFF \
|
||||
-DUSE_EXTERNAL_YAML=TRUE \
|
||||
-DUSE_EXTERNAL_TINYXML=TRUE \
|
||||
-DUSE_EXTERNAL_LCMS=TRUE \
|
||||
-DUSE_EXTERNAL_SETUPTOOLS=TRUE \
|
||||
%ifnarch x86_64
|
||||
-DOCIO_USE_SSE=OFF \
|
||||
%endif
|
||||
../
|
||||
|
||||
make %{?_smp_mflags}
|
||||
%make_build
|
||||
|
||||
|
||||
%install
|
||||
@ -122,11 +161,17 @@ help2man -N -s 1 %{?fedora:--version-string=%{version}} \
|
||||
help2man -N -s 1 %{?fedora:--version-string=%{version}} \
|
||||
-o %{buildroot}%{_mandir}/man1/ociobakelut.1 \
|
||||
src/apps/ociobakelut/ociobakelut
|
||||
|
||||
# Move installed documentation back so it doesn't conflict with the main package
|
||||
popd
|
||||
|
||||
%if 0%{?docs}
|
||||
# Move installed documentation back so it doesn't conflict with the main package
|
||||
mkdir _tmpdoc
|
||||
mv %{buildroot}%{_docdir}/%{name}/* _tmpdoc/
|
||||
%endif
|
||||
|
||||
# Fix location of cmake files.
|
||||
mkdir -p %{buildroot}%{_datadir}/cmake/Modules
|
||||
find %{buildroot} -name "*.cmake" -exec mv {} %{buildroot}%{_datadir}/cmake/Modules/ \;
|
||||
|
||||
|
||||
%check
|
||||
@ -134,25 +179,28 @@ mv %{buildroot}%{_docdir}/%{name}/* _tmpdoc/
|
||||
#pushd build && make test
|
||||
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
%postun -p /sbin/ldconfig
|
||||
%ldconfig_scriptlets
|
||||
|
||||
|
||||
%files
|
||||
%doc ChangeLog LICENSE README
|
||||
%license LICENSE
|
||||
%doc ChangeLog README.md
|
||||
%{_libdir}/*.so.*
|
||||
%dir %{_datadir}/ocio
|
||||
%{_datadir}/ocio/setup_ocio.sh
|
||||
%{python_sitearch}/*.so
|
||||
%{python2_sitearch}/*.so
|
||||
|
||||
%files tools
|
||||
%{_bindir}/*
|
||||
%{_mandir}/man1/*
|
||||
|
||||
%if 0%{?docs}
|
||||
%files doc
|
||||
%doc _tmpdoc/*
|
||||
%endif
|
||||
|
||||
%files devel
|
||||
%{_datadir}/cmake/Modules/*
|
||||
%{_includedir}/OpenColorIO/
|
||||
%{_includedir}/PyOpenColorIO/
|
||||
%{_libdir}/*.so
|
||||
@ -160,6 +208,70 @@ mv %{buildroot}%{_docdir}/%{name}/* _tmpdoc/
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Feb 22 2018 Adam Williamson <awilliam@redhat.com> - 1.1.0-6
|
||||
- Rebuild with bootstrap disabled, so we get docs again
|
||||
|
||||
* Thu Feb 22 2018 Peter Robinson <pbrobinson@fedoraproject.org> 1.1.0-5
|
||||
- Rebuild
|
||||
|
||||
* Tue Feb 20 2018 Rex Dieter <rdieter@fedoraproject.org> - 1.1.0-4
|
||||
- support %%bootstrap (no docs, no tests)
|
||||
- enable bootstrap mode on f28+ to workaround bug #1546964
|
||||
|
||||
* Mon Feb 19 2018 Adam Williamson <awilliam@redhat.com> - 1.1.0-3
|
||||
- Fix build with yaml-cpp 0.6+ (patch out bogus hidden visibility)
|
||||
- Fix build with GCC 8 (issues in Python bindings, upstream PR #518)
|
||||
- Rebuild for yaml-cpp 0.6.1
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Fri Jan 12 2018 Richard Shaw <hobbes1069@gmail.com> - 1.1.0-1
|
||||
- Update to latest upstream release.
|
||||
|
||||
* Sun Jan 07 2018 Richard Shaw <hobbes1069@gmail.com> - 1.0.9-20
|
||||
- Rebuild for OpenImageIO 1.8.7.
|
||||
|
||||
* Wed Dec 06 2017 Richard Shaw <hobbes1069@gmail.com> - 1.0.9-19
|
||||
- Fix ambiguous Python 2 dependency declarations
|
||||
https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3
|
||||
|
||||
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.9-18
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.9-17
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Fri Jul 07 2017 Igor Gnatenko <ignatenko@redhat.com> - 1.0.9-16
|
||||
- Rebuild due to bug in RPM (RHBZ #1468476)
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.9-15
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Tue Jan 10 2017 Orion Poplawski <orion@cora.nwra.com> - 1.0.9-14
|
||||
- Rebuild for glew 2.0.0
|
||||
|
||||
* Mon Oct 03 2016 Richard Shaw <hobbes1069@gmail.com> - 1.0.9-13
|
||||
- Rebuild for new OpenImageIO.
|
||||
|
||||
* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.9-12
|
||||
- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
|
||||
|
||||
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.9-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Thu Jan 14 2016 Richard Shaw <hobbes1069@gmail.com> - 1.0.9-10
|
||||
- Rebuild for OpenImageIO 1.6.9.
|
||||
|
||||
* Thu Jan 14 2016 Adam Jackson <ajax@redhat.com> - 1.0.9-9
|
||||
- Rebuild for glew 1.13
|
||||
|
||||
* Tue Jun 16 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.9-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 1.0.9-7
|
||||
- Rebuilt for GCC 5 C++11 ABI change
|
||||
|
||||
* Wed Jan 28 2015 Richard Shaw <hobbes1069@gmail.com> - 1.0.9-6
|
||||
- Rebuild for OpenImageIO 1.5.11.
|
||||
|
||||
|
1870
ocio-1.1.0-gcc8.patch
Normal file
1870
ocio-1.1.0-gcc8.patch
Normal file
File diff suppressed because it is too large
Load Diff
46
ocio-1.1.0-yamlcpp060.patch
Normal file
46
ocio-1.1.0-yamlcpp060.patch
Normal file
@ -0,0 +1,46 @@
|
||||
--- 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 @@
|
||||
|
||||
#include <OpenColorIO/OpenColorIO.h>
|
||||
|
||||
-#ifndef WIN32
|
||||
-
|
||||
-// fwd declare yaml-cpp visibility
|
||||
-#pragma GCC visibility push(hidden)
|
||||
-namespace YAML {
|
||||
- class Exception;
|
||||
- class BadDereference;
|
||||
- class RepresentationException;
|
||||
- class EmitterException;
|
||||
- class ParserException;
|
||||
- class InvalidScalar;
|
||||
- class KeyNotFound;
|
||||
- template <typename T> class TypedKeyNotFound;
|
||||
- template <> class TypedKeyNotFound<OCIO_NAMESPACE::ColorSpace>;
|
||||
- template <> class TypedKeyNotFound<OCIO_NAMESPACE::Config>;
|
||||
- template <> class TypedKeyNotFound<OCIO_NAMESPACE::Exception>;
|
||||
- template <> class TypedKeyNotFound<OCIO_NAMESPACE::GpuShaderDesc>;
|
||||
- template <> class TypedKeyNotFound<OCIO_NAMESPACE::ImageDesc>;
|
||||
- template <> class TypedKeyNotFound<OCIO_NAMESPACE::Look>;
|
||||
- template <> class TypedKeyNotFound<OCIO_NAMESPACE::Processor>;
|
||||
- template <> class TypedKeyNotFound<OCIO_NAMESPACE::Transform>;
|
||||
- template <> class TypedKeyNotFound<OCIO_NAMESPACE::AllocationTransform>;
|
||||
- template <> class TypedKeyNotFound<OCIO_NAMESPACE::CDLTransform>;
|
||||
- template <> class TypedKeyNotFound<OCIO_NAMESPACE::ColorSpaceTransform>;
|
||||
- template <> class TypedKeyNotFound<OCIO_NAMESPACE::DisplayTransform>;
|
||||
- template <> class TypedKeyNotFound<OCIO_NAMESPACE::ExponentTransform>;
|
||||
- template <> class TypedKeyNotFound<OCIO_NAMESPACE::FileTransform>;
|
||||
- template <> class TypedKeyNotFound<OCIO_NAMESPACE::GroupTransform>;
|
||||
- template <> class TypedKeyNotFound<OCIO_NAMESPACE::LogTransform>;
|
||||
- template <> class TypedKeyNotFound<OCIO_NAMESPACE::LookTransform>;
|
||||
- template <> class TypedKeyNotFound<OCIO_NAMESPACE::MatrixTransform>;
|
||||
- template <> class TypedKeyNotFound<OCIO_NAMESPACE::TruelightTransform>;
|
||||
-}
|
||||
-#pragma GCC visibility pop
|
||||
-
|
||||
-#endif
|
||||
-
|
||||
#ifdef WIN32
|
||||
#pragma warning( push )
|
||||
#pragma warning( disable: 4146 )
|
Loading…
Reference in New Issue
Block a user