Compare commits

..

31 Commits
f22 ... master

Author SHA1 Message Date
Richard Shaw
fc05cf467c Modernize spec file to meet current packaging guidelines. 2018-04-25 07:22:37 -05:00
Adam Williamson
4bce92e396 Really build docs when docs is 1
This conditional was typoed. It's 'docs' not 'doc'.
2018-02-22 14:16:17 -08:00
Adam Williamson
7d38d8d3b1 Rebuild with bootstrap disabled, so we get docs again 2018-02-22 13:58:00 -08:00
Peter Robinson
e05bef6221 rebuild 2018-02-22 20:20:12 +00:00
Rex Dieter
edaca86c22 support %bootstrap (no docs, no tests)
enable bootstrap mode on f28+ to workaround bug #1546964
2018-02-20 08:23:23 -06:00
Adam Williamson
71f8c43d53 Update the Python / GCC 8 patch a bit 2018-02-20 00:58:44 -08:00
Adam Williamson
c7a8ea7afd Fix build with GCC 8 and yaml-cpp 0.6 (thanks Kevin Kofler)
This adds patches that make the thing build with yaml-cpp 0.6
and GCC 8, the latter submitted upstream (the former is a bit
too hacky to go upstream as-is), and reverts the changes to try
and build with a bundled yaml-cpp. Thanks to Kevin Kofler for
helping to figure out both issues.
2018-02-19 22:18:50 -08:00
Richard Shaw
1777ff3701 Fix cmake option for yaml. 2018-02-14 11:39:58 -06:00
Richard Shaw
ebf90ff844 Still have circular dependency problem. 2018-02-14 11:20:27 -06:00
Richard Shaw
e58a811642 Temporarily use bundled yaml-cpp until patched for 0.6.0. 2018-02-14 10:46:52 -06:00
Richard Shaw
118f85dfcd Bootstrap build without OpenImageIO to fix circular dependency. 2018-02-14 10:34:23 -06:00
Richard Shaw
3e8ac4fd40 Rebuild for yaml-cpp 0.6.0. 2018-02-14 10:18:35 -06:00
Fedora Release Engineering
d0329bc1f8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-07 00:51:59 +00:00
Richard Shaw
e4da1f4b9e Update to latest upstream release. 2018-01-13 07:48:44 -06:00
Richard Shaw
41840af9ee Rebuild for OpenImageIO 1.8.7. 2018-01-07 08:50:33 -06:00
Richard Shaw
7f7a94e9df Fix ambiguous Python 2 dependency declarations
https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3
2017-12-06 07:35:06 -06:00
Fedora Release Engineering
11cb2a0952 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild 2017-08-02 17:03:18 +00:00
Fedora Release Engineering
4cd8127088 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-26 01:58:26 +00:00
Igor Gnatenko
13a6d4d5db Rebuild due to bug in RPM (RHBZ #1468476)
Signed-off-by: Igor Gnatenko <ignatenko@redhat.com>
2017-07-07 12:24:46 +02:00
Richard Shaw
b4fe0f4e9e Correct github source URL and implement %license. 2017-02-19 08:43:43 -06:00
Fedora Release Engineering
c7afe62ad2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild 2017-02-10 05:15:59 +00:00
Orion Poplawski
0b44c2a2b8 Rebuild for glew 2.0.0 2017-01-10 08:47:50 -07:00
Richard M. Shaw
0950bcef35 Add OpenEXR-devel due to BR for OpenImageIO) 2016-10-03 13:44:04 -05:00
Richard M. Shaw
42cbd9df4b Rebuild for new OpenImageIO. 2016-10-03 11:35:05 -05:00
Fedora Release Engineering
a9b1b66ee6 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages 2016-07-19 06:23:57 +00:00
Dennis Gilmore
cb59c26b8f - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild 2016-02-03 15:33:19 +00:00
Richard M. Shaw
152e9cb0a1 Actually bump release. 2016-01-14 15:36:19 -06:00
Richard M. Shaw
f943e9b45d Rebuild for OpenImageIO 1.6.9. 2016-01-14 15:35:40 -06:00
Adam Jackson
9a25bfa43a Rebuild for glew 1.13 2016-01-14 13:09:45 -05:00
Dennis Gilmore
0059b1880f - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild 2015-06-16 23:00:48 +00:00
Kalev Lember
d2de431b67 Rebuilt for GCC 5 C++11 ABI change 2015-05-03 00:04:37 +02:00
8 changed files with 2220 additions and 49 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
/imageworks-OpenColorIO-v1.0.7-0-g87da508.tar.gz /imageworks-OpenColorIO-v1.0.7-0-g87da508.tar.gz
/OpenColorIO-1.0.8.tar.gz /OpenColorIO-1.0.8.tar.gz
/OpenColorIO-1.0.9.tar.gz /OpenColorIO-1.0.9.tar.gz
/OpenColorIO-1.1.0.tar.gz

81
OpenColorIO-gcc.patch Normal file
View 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);

View 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
)

View File

@ -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

View File

@ -1,33 +1,67 @@
# Filter provides from Python libraries # Filter provides from Python libraries
%{?filter_setup: #%{?filter_setup:
%filter_provides_in %{python_sitearch}.*\.so$ #%filter_provides_in %{python2_sitearch}.*\.so$
%filter_setup #%filter_setup
} #}
%if ! 0%{?bootstrap}
%global docs 1
%global tests 1
%endif
Name: OpenColorIO Name: OpenColorIO
Version: 1.0.9 Version: 1.1.0
Release: 6%{?dist} Release: 6%{?dist}
Summary: Enables color transforms and image display across graphics apps Summary: Enables color transforms and image display across graphics apps
License: BSD License: BSD
URL: http://opencolorio.org/ URL: http://opencolorio.org/
# Github archive was generated on the fly using the following URL: Source0: https://github.com/imageworks/OpenColorIO/archive/v%{version}/%{name}-%{version}.tar.gz
# https://github.com/imageworks/OpenColorIO/tarball/v1.0.9 Patch0: OpenColorIO-gcc.patch
Source0: %{name}-%{version}.tar.gz Patch1: OpenColorIO-setuptools.patch
Patch0: OpenColorIO-yaml_cpp3.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 # Utilities
BuildRequires: cmake BuildRequires: cmake gcc-c++
BuildRequires: help2man 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. # WARNING: OpenColorIO and OpenImageIO are cross dependent.
# If an ABI incompatible update is done in one, the other also needs to be # If an ABI incompatible update is done in one, the other also needs to be
# rebuilt. # rebuilt.
BuildRequires: OpenImageIO-devel BuildRequires: OpenImageIO-devel
BuildRequires: OpenEXR-devel
# Libraries # Libraries
BuildRequires: python-devel BuildRequires: python2-devel
BuildRequires: mesa-libGL-devel mesa-libGLU-devel BuildRequires: mesa-libGL-devel mesa-libGLU-devel
BuildRequires: libX11-devel libXmu-devel libXi-devel BuildRequires: libX11-devel libXmu-devel libXi-devel
BuildRequires: freeglut-devel BuildRequires: freeglut-devel
@ -39,7 +73,7 @@ BuildRequires: zlib-devel
####################### #######################
BuildRequires: tinyxml-devel BuildRequires: tinyxml-devel
BuildRequires: lcms2-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. # The following bundled projects are only used for document generation.
#BuildRequires: python-docutils #BuildRequires: python-docutils
@ -48,6 +82,11 @@ BuildRequires: yaml-cpp03-devel >= 0.3.0
#BuildRequires: python-setuptools #BuildRequires: python-setuptools
#BuildRequires: python-sphinx #BuildRequires: python-sphinx
%if ! 0%{?docs}
# upgrade path for when/if docs are not included
Obsoletes: %{name}-doc < %{version}-%{release}
%endif
%description %description
OCIO enables color transforms and image display to be handled in a consistent OCIO enables color transforms and image display to be handled in a consistent
@ -84,8 +123,7 @@ Development libraries and headers for %{name}.
%prep %prep
%setup -q %autosetup -p1
%patch0 -p1 -b .yaml3
# Remove what bundled libraries # Remove what bundled libraries
rm -f ext/lcms* rm -f ext/lcms*
@ -96,18 +134,19 @@ rm -f ext/yaml*
%build %build
rm -rf build && mkdir build && pushd build rm -rf build && mkdir build && pushd build
%cmake -DOCIO_BUILD_STATIC=OFF \ %cmake -DOCIO_BUILD_STATIC=OFF \
-DOCIO_BUILD_DOCS=ON \ -DOCIO_BUILD_DOCS=%{?docs:ON}%{?!docs:OFF} \
-DOCIO_BUILD_TESTS=ON \ -DOCIO_BUILD_TESTS=%{?tests:ON}%{?!tests:OFF} \
-DOCIO_PYGLUE_SONAME=OFF \ -DOCIO_PYGLUE_SONAME=OFF \
-DUSE_EXTERNAL_YAML=TRUE \ -DUSE_EXTERNAL_YAML=TRUE \
-DUSE_EXTERNAL_TINYXML=TRUE \ -DUSE_EXTERNAL_TINYXML=TRUE \
-DUSE_EXTERNAL_LCMS=TRUE \ -DUSE_EXTERNAL_LCMS=TRUE \
-DUSE_EXTERNAL_SETUPTOOLS=TRUE \
%ifnarch x86_64 %ifnarch x86_64
-DOCIO_USE_SSE=OFF \ -DOCIO_USE_SSE=OFF \
%endif %endif
../ ../
make %{?_smp_mflags} %make_build
%install %install
@ -122,11 +161,17 @@ help2man -N -s 1 %{?fedora:--version-string=%{version}} \
help2man -N -s 1 %{?fedora:--version-string=%{version}} \ help2man -N -s 1 %{?fedora:--version-string=%{version}} \
-o %{buildroot}%{_mandir}/man1/ociobakelut.1 \ -o %{buildroot}%{_mandir}/man1/ociobakelut.1 \
src/apps/ociobakelut/ociobakelut src/apps/ociobakelut/ociobakelut
# Move installed documentation back so it doesn't conflict with the main package
popd popd
%if 0%{?docs}
# Move installed documentation back so it doesn't conflict with the main package
mkdir _tmpdoc mkdir _tmpdoc
mv %{buildroot}%{_docdir}/%{name}/* _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 %check
@ -134,25 +179,28 @@ mv %{buildroot}%{_docdir}/%{name}/* _tmpdoc/
#pushd build && make test #pushd build && make test
%post -p /sbin/ldconfig %ldconfig_scriptlets
%postun -p /sbin/ldconfig
%files %files
%doc ChangeLog LICENSE README %license LICENSE
%doc ChangeLog README.md
%{_libdir}/*.so.* %{_libdir}/*.so.*
%dir %{_datadir}/ocio %dir %{_datadir}/ocio
%{_datadir}/ocio/setup_ocio.sh %{_datadir}/ocio/setup_ocio.sh
%{python_sitearch}/*.so %{python2_sitearch}/*.so
%files tools %files tools
%{_bindir}/* %{_bindir}/*
%{_mandir}/man1/* %{_mandir}/man1/*
%if 0%{?docs}
%files doc %files doc
%doc _tmpdoc/* %doc _tmpdoc/*
%endif
%files devel %files devel
%{_datadir}/cmake/Modules/*
%{_includedir}/OpenColorIO/ %{_includedir}/OpenColorIO/
%{_includedir}/PyOpenColorIO/ %{_includedir}/PyOpenColorIO/
%{_libdir}/*.so %{_libdir}/*.so
@ -160,6 +208,70 @@ mv %{buildroot}%{_docdir}/%{name}/* _tmpdoc/
%changelog %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 * Wed Jan 28 2015 Richard Shaw <hobbes1069@gmail.com> - 1.0.9-6
- Rebuild for OpenImageIO 1.5.11. - Rebuild for OpenImageIO 1.5.11.

1870
ocio-1.1.0-gcc8.patch Normal file

File diff suppressed because it is too large Load Diff

View 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 )

View File

@ -1 +1 @@
06d0efe9cc1b32d7b14134779c9d1251 OpenColorIO-1.0.9.tar.gz SHA512 (OpenColorIO-1.1.0.tar.gz) = 909874a9f91a8d229622810fc70233680c6e75203bd8555179322de2873da00bf302432e19f189b787ffcda3157ddec1e4601c97f75a36e16f644fe7d42f6998