Compare commits

...

62 Commits
master ... main

Author SHA1 Message Date
Fedora Release Engineering 71c2508c76 Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-18 19:58:25 +00:00
Richard Shaw 8e1fe0eace Update to 2.2.1. 2023-01-12 19:32:32 -06:00
Richard Shaw 844e48e00a Rebuild post OIIO bootstrap. 2022-11-15 08:15:23 -06:00
Richard Shaw d6388e01a2 Disable man page generation for now, some programs are having issues with help2man. 2022-11-14 21:59:11 -06:00
Richard Shaw 248baa9a75 Disable OIIO to bootstrap build. 2022-11-14 16:43:58 -06:00
Richard Shaw d6e5f35b94 Rebuild for yaml-cpp 0.7.0. 2022-11-14 16:36:49 -06:00
Richard Shaw 9e5df27780 Revert to previous version, too many problems with 2.2.0 right now. 2022-11-14 16:36:07 -06:00
Richard Shaw dfc27815d6 Add minizip-devel as BR. 2022-11-08 15:47:15 -06:00
Richard Shaw c78bb41a3c Bootstrap build without OIIO for soname bump. 2022-11-08 15:38:32 -06:00
Richard Shaw 46be853d06 Update to 2.2.0. 2022-11-08 15:30:12 -06:00
Richard Shaw d9f1bd13d0 Rebuild for OpenImageIO 2.4.4.2. 2022-10-07 08:13:52 -05:00
Fedora Release Engineering e69e62f66a Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-20 18:52:35 +00:00
Sérgio M. Basto 52240f7c34 Rebuild for Python 3.11 and openvdb-9.1.0 2022-06-21 15:05:17 +01:00
Richard Shaw a766a6e7f8 Fix changelog. 2022-06-01 21:53:52 -05:00
Richard Shaw 4937969052 Update to 2.1.1. 2022-06-01 21:53:19 -05:00
Orion Poplawski 21bbf2e9aa Rebuild for glew 2.2 2022-02-09 20:58:02 -07:00
Richard Shaw 60f4b305c8 Merge branch 'rawhide' of ssh://pkgs.fedoraproject.org/rpms/OpenColorIO into rawhide 2022-01-29 15:46:02 -06:00
Richard Shaw 80c57925b2 Add patch to fix gcc 12 related FTBFS. 2022-01-29 15:45:50 -06:00
Fedora Release Engineering f501fcb45d - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-19 19:32:47 +00:00
Richard Shaw bbe1193d6d Delete unused patches. 2021-12-20 07:55:25 -06:00
Richard Shaw d2dedcb606 Still need to remove static libs... 2021-12-20 07:13:06 -06:00
Richard Shaw 5bbb4f8a30 Update to 2.1.1. 2021-12-19 19:49:30 -06:00
Richard Shaw d2f7e7619f Add patch for compatibility with OIIO 2.3. 2021-10-04 11:41:51 -05:00
Richard Shaw 41deb404aa Update CXX minimum version from 11 to 14 for OpenImageIO. 2021-10-03 17:29:33 -05:00
Richard Shaw a0148c343a Rebuild for OpenImageIO 2.3. 2021-10-03 16:55:15 -05:00
Zbigniew Jędrzejewski-Szmek 497fc8566f Rebuild for OpenEXR/Imath 3.1 2021-10-02 13:10:56 +02:00
Richard Shaw 223854c548 Upload new source file. 2021-08-31 21:11:39 -05:00
Richard Shaw e00aceb3ac Update to 2.1.0. 2021-08-31 21:10:47 -05:00
Richard Shaw c7c7799882 Add patch to deal with multiple instantation issue. 2021-08-23 12:54:18 -05:00
Richard Shaw 01ded9b06a Add upstream patch. 2021-08-23 07:46:13 -05:00
Richard Shaw eb976f8069 Add install patch. 2021-08-23 07:45:53 -05:00
Richard Shaw 5f39649d11 Update to 2.0.1. 2021-08-23 07:45:29 -05:00
Fedora Release Engineering 5761f660a9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-21 15:57:27 +00:00
Fedora Release Engineering 80768f38d8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-21 11:02:55 +00:00
Richard Shaw 74873217aa Add patch to deal with null pointer in ImageDesc.cpp 2021-06-08 21:20:03 -05:00
Fedora Release Engineering 120ae78e7f - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-25 22:33:52 +00:00
Orion Poplawski 6108bd15e6 Add BR python3-sphinx-latex 2020-10-09 19:30:37 -06:00
Richard Shaw 2ce40dcb9b Rebuild for OpenImageIO 2.2. 2020-09-03 19:27:41 -05:00
Richard Shaw 91cf786839 Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
2020-08-03 22:06:49 -05:00
Fedora Release Engineering f79e691b85 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-08-01 06:50:20 +00:00
Fedora Release Engineering 3f24fde46f - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-27 10:31:56 +00:00
Richard Shaw 5c227c8b16 Update texlive package requirements. 2020-07-10 06:58:16 -05:00
Tom Callaway 68b1d90e6c add explicit tex BuildRequires 2020-05-20 11:29:48 -04:00
Richard Shaw 243e5295cd Rebuild to fix bad timing with mass rebuild and OIIO 2.0.x -> 2.1.x. 2020-03-14 06:56:36 -05:00
Fedora Release Engineering c1ca97e03f - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-28 09:36:46 +00:00
Richard Shaw c1696a0e8a Rebuild for OpenImageIO 2.1.10.1. 2020-01-27 13:41:01 -06:00
Richard Shaw 543c83a408 Rebuild for yaml-cpp 0.6.3. 2019-10-18 14:42:40 -05:00
Richard Shaw dd8fa20304 Rebuild for yaml-cpp 0.6.3. 2019-10-18 14:41:52 -05:00
Richard Shaw e50f63f9e7 Change URLs to new upstream with the Academy Software Foundation. 2019-10-18 14:41:28 -05:00
Gwyn Ciesla d222d2e6c2 Rebuild for new freeglut. 2019-10-04 08:03:36 -05:00
Richard Shaw 0d5eeb21f7 Add boost-devel as BR. 2019-08-17 10:46:24 -05:00
Fedora Release Engineering 935a70c2bd - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-24 16:02:18 +00:00
Richard Shaw 11751330b3 Remove unused patches. 2019-04-04 13:33:58 -05:00
Richard Shaw 4e736d1bdd Update to 1.1.1.
Removing python glue module as python 3 is not currently supported.
2019-04-04 13:33:12 -05:00
Fedora Release Engineering bdf51bff0a - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-01-31 11:45:08 +00:00
Igor Gnatenko f26265eed8 Remove obsolete Group tag
References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
2019-01-28 20:24:23 +01:00
Richard Shaw 659d32819f Add patch for OIIO 2.0 and mesa glext.h header changes. 2018-12-13 08:19:55 -06:00
Richard Shaw 4426e12d59 Obsolete Python2 library and build Python3 library. 2018-09-24 15:51:02 -05:00
Nicolas Chauvet 7496b6f8f6 - Rebuilt for glew 2.1.0 2018-08-23 13:22:39 +02:00
Richard Shaw da1f0029ba Merge branch 'master' of ssh://pkgs.fedoraproject.org/rpms/OpenColorIO 2018-07-20 13:24:40 -05:00
Richard Shaw 1759463cf4 Tell CMake where to find python2. 2018-07-20 13:24:27 -05:00
Fedora Release Engineering fe787a05ad - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-12 19:10:09 +00:00
8 changed files with 195 additions and 2188 deletions

6
.gitignore vendored
View File

@ -2,3 +2,9 @@
/OpenColorIO-1.0.8.tar.gz
/OpenColorIO-1.0.9.tar.gz
/OpenColorIO-1.1.0.tar.gz
/OpenColorIO-1.1.1.tar.gz
/OpenColorIO-2.0.1.tar.gz
/OpenColorIO-2.1.0.tar.gz
/OpenColorIO-2.1.1.tar.gz
/OpenColorIO-2.1.2.tar.gz
/OpenColorIO-2.2.1.tar.gz

12
OCIO-strlen.patch Normal file
View File

@ -0,0 +1,12 @@
Index: OpenColorIO-2.1.1/src/OpenColorIO/FileRules.cpp
===================================================================
--- OpenColorIO-2.1.1.orig/src/OpenColorIO/FileRules.cpp
+++ OpenColorIO-2.1.1/src/OpenColorIO/FileRules.cpp
@@ -3,6 +3,7 @@
#include <algorithm>
#include <cctype>
+#include <cstring>
#include <map>
#include <regex>
#include <sstream>

View File

@ -1,81 +0,0 @@
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

@ -1,85 +0,0 @@
--- 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,86 +1,66 @@
# Filter provides from Python libraries
#%{?filter_setup:
#%filter_provides_in %{python2_sitearch}.*\.so$
#%filter_setup
#}
%if ! 0%{?bootstrap}
%if ! 0%{?bootstrap} || ! 0%{?rhel}
%global docs 1
%global tests 1
%endif
Name: OpenColorIO
Version: 1.1.0
Release: 6%{?dist}
Version: 2.2.1
Release: 2%{?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
# 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
Source0: https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/v%{version}/%{name}-%{version}.tar.gz
# OIIO is only built for these arches due to Libraw
%if 0%{?rhel} >= 8 && 0%{?rhel} < 9
ExclusiveArch: x86_64 ppc64le
%endif
# Utilities
BuildRequires: cmake gcc-c++
BuildRequires: help2man
BuildRequires: python2-markupsafe
BuildRequires: python2-setuptools
BuildRequires: python3
BuildRequires: python3-markupsafe
BuildRequires: python3-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
# Libraries
BuildRequires: cmake(OpenEXR)
BuildRequires: boost-devel
BuildRequires: expat-devel
BuildRequires: freeglut-devel
BuildRequires: glew-devel
BuildRequires: libX11-devel libXmu-devel libXi-devel
BuildRequires: mesa-libGL-devel mesa-libGLU-devel
BuildRequires: minizip-ng-devel >= 3.0.6
BuildRequires: opencv-devel
BuildRequires: pybind11-devel
BuildRequires: python3-devel
BuildRequires: python3-pip
BuildRequires: pystring-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
# Libraries
BuildRequires: python2-devel
BuildRequires: mesa-libGL-devel mesa-libGLU-devel
BuildRequires: libX11-devel libXmu-devel libXi-devel
BuildRequires: freeglut-devel
BuildRequires: glew-devel
BuildRequires: zlib-devel
BuildRequires: cmake(OpenImageIO)
BuildRequires: OpenImageIO-iv
BuildRequires: OpenImageIO-utils
#######################
# Unbundled libraries #
#######################
BuildRequires: tinyxml-devel
BuildRequires: lcms2-devel
BuildRequires: yaml-cpp-devel >= 0.5.0
BuildRequires: yaml-cpp-devel >= 0.7.0
# The following bundled projects are only used for document generation.
#BuildRequires: python-docutils
#BuildRequires: python-jinja2
#BuildRequires: python-pygments
#BuildRequires: python-setuptools
#BuildRequires: python-sphinx
%if 0%{?docs}
BuildRequires: doxygen
BuildRequires: python3-breathe
BuildRequires: python3-recommonmark
BuildRequires: python3-sphinx-press-theme
BuildRequires: python3-sphinx-tabs
BuildRequires: python3-testresources
%endif
%if ! 0%{?docs}
# upgrade path for when/if docs are not included
@ -106,7 +86,6 @@ Command line tools for %{name}.
%package doc
BuildArch: noarch
Summary: API Documentation for %{name}
Group: Documentation
Requires: %{name} = %{version}-%{release}
%description doc
@ -115,7 +94,6 @@ API documentation for %{name}.
%package devel
Summary: Development libraries and headers for %{name}
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
@ -123,60 +101,49 @@ Development libraries and headers for %{name}.
%prep
%autosetup -p1
%autosetup -p1 -n %{name}-%{version}%{?relcan:-rc%{relcan}}
# Remove what bundled libraries
rm -f ext/lcms*
rm -f ext/tinyxml*
rm -f ext/yaml*
# Fedora maps minzip-ng back to minizip so work around it here:
sed -i "s/minizip-ng/minizip/g" src/OpenColorIO/OCIOZArchive.cpp src/apps/ocioarchive/main.cpp
%build
rm -rf build && mkdir build && pushd build
%cmake -DOCIO_BUILD_STATIC=OFF \
%cmake -DCMAKE_CXX_STANDARD=14 \
-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 \
-DOCIO_USE_HEADLESS=ON \
-DOCIO_INSTALL_EXT_PACKAGES=NONE \
%ifnarch x86_64
-DOCIO_USE_SSE=OFF \
%endif
../
-Dminizip-ng_LIBRARY=%{_libdir}/libminizip.so \
-Dminizip-ng_INCLUDE_DIR=%{_includedir}/minizip \
-Dminizip-ng_DIR=TRUE \
-DOpenGL_GL_PREFERENCE=GLVND
%make_build
%cmake_build
%install
pushd build
%make_install
%cmake_install
# Remove static libs
find %{buildroot} -type f -name "*.a" -exec rm -f {} \;
# Generate man pages
mkdir -p %{buildroot}%{_mandir}/man1
help2man -N -s 1 %{?fedora:--version-string=%{version}} \
-o %{buildroot}%{_mandir}/man1/ociocheck.1 \
src/apps/ociocheck/ociocheck
help2man -N -s 1 %{?fedora:--version-string=%{version}} \
-o %{buildroot}%{_mandir}/man1/ociobakelut.1 \
src/apps/ociobakelut/ociobakelut
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/ \;
#pushd %{__cmake_builddir}/src/apps
#mkdir -p %{buildroot}%{_mandir}/man1
#for app in ociobakelut ociocheck ociochecklut ocioconvert ociolutimage ociomakeclf ocioperf ociowrite; do \
#help2man -N -s 1 %{?fedora:--version-string=%{version}} \
# -o %{buildroot}%{_mandir}/man1/$app.1 \
# $app/$app
#done
#popd
%check
# Testing passes locally in mock but fails on the fedora build servers.
#pushd build && make test
# Testing gpu fails due to lack of diaplay. Can it be faked?
#ctest
%ldconfig_scriptlets
@ -184,30 +151,134 @@ find %{buildroot} -name "*.cmake" -exec mv {} %{buildroot}%{_datadir}/cmake/Modu
%files
%license LICENSE
%doc ChangeLog README.md
%doc CHANGELOG.md COMMITTERS.md CONTRIBUTING.md GOVERNANCE.md PROCESS.md
%doc README.md SECURITY.md THIRD-PARTY.md
%{_libdir}/*.so.*
%dir %{_datadir}/ocio
%{_datadir}/ocio/setup_ocio.sh
%{python2_sitearch}/*.so
%{python3_sitearch}/*.so
%files tools
%{_bindir}/*
%{_mandir}/man1/*
%{_datadir}/ocio/
#{_mandir}/man1/*
%if 0%{?docs}
%files doc
%doc _tmpdoc/*
%{_datadir}/doc/%{name}/html/
%endif
%files devel
%{_datadir}/cmake/Modules/*
%{_includedir}/OpenColorIO/
%{_includedir}/PyOpenColorIO/
%{_libdir}/cmake/%{name}/
%{_libdir}/*.so
%{_libdir}/pkgconfig/%{name}.pc
%changelog
* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Thu Jan 12 2023 Richard Shaw <hobbes1069@gmail.com> - 2.2.1-1
- Update to 2.2.1.
* Tue Nov 15 2022 Richard Shaw <hobbes1069@gmail.com> - 2.1.2-5.1
- Rebuild post OIIO bootstrap.
* Mon Nov 14 2022 Richard Shaw <hobbes1069@gmail.com> - 2.1.2-5
- Rebuild for yaml-cpp 0.7.0.
- Disable BR for OIIO to bootstrap.
* Fri Oct 07 2022 Richard Shaw <hobbes1069@gmail.com> - 2.1.2-4
- Rebuild for OpenImageIO 2.4.4.2.
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Tue Jun 21 2022 Sérgio Basto <sergio@serjux.com> - 2.1.2-2
- Rebuild for Python 3.11 and openvdb-9.1.0
* Thu Jun 02 2022 Richard Shaw <hobbes1069@gmail.com> - 2.1.2-1
- Update to 2.1.2.
* Thu Feb 10 2022 Orion Poplawski <orion@nwra.com> - 2.1.1-3
- Rebuild for glew 2.2
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Dec 17 2021 Richard Shaw <hobbes1069@gmail.com> - 2.1.1-1
- Update to 2.1.1.
* Sun Oct 03 2021 Richard Shaw <hobbes1069@gmail.com> - 2.1.0-3
- Rebuild for OpenImageIO 2.3.
* Sat Oct 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.1.0-2
- Rebuild for OpenEXR/Imath 3.1
* Wed Sep 01 2021 Richard Shaw <hobbes1069@gmail.com> - 2.1.0-1
- Update to 2.1.0.
* Fri Aug 13 2021 Richard Shaw <hobbes1069@gmail.com> - 2.0.1-1
- Update to 2.0.1.
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Fri Oct 9 2020 Orion Poplawski <orion@nwra.com> - 1.1.1-12
- Add BR python3-sphinx-latex
* Fri Sep 04 2020 Richard Shaw <hobbes1069@gmail.com> - 1.1.1-11
- Rebuild for OpenImageIO 2.2.
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-10
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed May 20 2020 Tom Callaway <spot@fedoraproject.org> - 1.1.1-8
- update tex buildrequires
* Sat Mar 14 2020 Richard Shaw <hobbes1069@gmail.com> - 1.1.1-7
- Rebuild to fix bad timing with mass rebuild and OIIO 2.0.x -> 2.1.x.
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Mon Jan 27 2020 Richard Shaw <hobbes1069@gmail.com> - 1.1.1-5
- Rebuild for OpenImageIO 2.1.10.1.
* Fri Oct 18 2019 Richard Shaw <hobbes1069@gmail.com> - 1.1.1-4
- Rebuild for yaml-cpp 0.6.3.
* Tue Sep 17 2019 Gwyn Ciesla <gwync@protonmail.com> - 1.1.1-3
- Rebuilt for new freeglut
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* 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
* Thu Dec 13 2018 Richard Shaw <hobbes1069@gmail.com> - 1.1.0-10
- Add patch for OIIO 2.0 and mesa glext.h header changes.
* Mon Sep 24 2018 Richard Shaw <hobbes1069@gmail.com> - 1.1.0-9
- Obsolete Python2 library and build Python3 library.
* Thu Aug 23 2018 Nicolas Chauvet <kwizart@gmail.com> - 1.1.0-8
- Rebuilt for glew 2.1.0
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Thu Feb 22 2018 Adam Williamson <awilliam@redhat.com> - 1.1.0-6
- Rebuild with bootstrap disabled, so we get docs again

File diff suppressed because it is too large Load Diff

View File

@ -1,46 +0,0 @@
--- 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 @@
SHA512 (OpenColorIO-1.1.0.tar.gz) = 909874a9f91a8d229622810fc70233680c6e75203bd8555179322de2873da00bf302432e19f189b787ffcda3157ddec1e4601c97f75a36e16f644fe7d42f6998
SHA512 (OpenColorIO-2.2.1.tar.gz) = d5f3a4b5bd661af7336c015d07e0feccb286464a08239a3c259a97217001161e7571f5137475fc2f4d1b9af6381bbfa03c0b60f41de282f114307961b8d84fc9