Compare commits
63 Commits
master
...
f38-riscv6
Author | SHA1 | Date | |
---|---|---|---|
b896a722b3 | |||
|
71c2508c76 | ||
|
8e1fe0eace | ||
|
844e48e00a | ||
|
d6388e01a2 | ||
|
248baa9a75 | ||
|
d6e5f35b94 | ||
|
9e5df27780 | ||
|
dfc27815d6 | ||
|
c78bb41a3c | ||
|
46be853d06 | ||
|
d9f1bd13d0 | ||
|
e69e62f66a | ||
|
52240f7c34 | ||
|
a766a6e7f8 | ||
|
4937969052 | ||
|
21bbf2e9aa | ||
|
60f4b305c8 | ||
|
80c57925b2 | ||
|
f501fcb45d | ||
|
bbe1193d6d | ||
|
d2dedcb606 | ||
|
5bbb4f8a30 | ||
|
d2f7e7619f | ||
|
41deb404aa | ||
|
a0148c343a | ||
|
497fc8566f | ||
|
223854c548 | ||
|
e00aceb3ac | ||
|
c7c7799882 | ||
|
01ded9b06a | ||
|
eb976f8069 | ||
|
5f39649d11 | ||
|
5761f660a9 | ||
|
80768f38d8 | ||
|
74873217aa | ||
|
120ae78e7f | ||
|
6108bd15e6 | ||
|
2ce40dcb9b | ||
|
91cf786839 | ||
|
f79e691b85 | ||
|
3f24fde46f | ||
|
5c227c8b16 | ||
|
68b1d90e6c | ||
|
243e5295cd | ||
|
c1ca97e03f | ||
|
c1696a0e8a | ||
|
543c83a408 | ||
|
dd8fa20304 | ||
|
e50f63f9e7 | ||
|
d222d2e6c2 | ||
|
0d5eeb21f7 | ||
|
935a70c2bd | ||
|
11751330b3 | ||
|
4e736d1bdd | ||
|
bdf51bff0a | ||
|
f26265eed8 | ||
|
659d32819f | ||
|
4426e12d59 | ||
|
7496b6f8f6 | ||
|
da1f0029ba | ||
|
1759463cf4 | ||
|
fe787a05ad |
6
.gitignore
vendored
6
.gitignore
vendored
@ -2,3 +2,9 @@
|
|||||||
/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
|
/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
12
OCIO-strlen.patch
Normal 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>
|
@ -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);
|
|
@ -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
|
|
||||||
)
|
|
||||||
|
|
284
OpenColorIO.spec
284
OpenColorIO.spec
@ -1,86 +1,66 @@
|
|||||||
# Filter provides from Python libraries
|
%if ! 0%{?bootstrap} || ! 0%{?rhel}
|
||||||
#%{?filter_setup:
|
|
||||||
#%filter_provides_in %{python2_sitearch}.*\.so$
|
|
||||||
#%filter_setup
|
|
||||||
#}
|
|
||||||
|
|
||||||
%if ! 0%{?bootstrap}
|
|
||||||
%global docs 1
|
%global docs 1
|
||||||
%global tests 1
|
%global tests 1
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
Name: OpenColorIO
|
Name: OpenColorIO
|
||||||
Version: 1.1.0
|
Version: 2.2.1
|
||||||
Release: 6%{?dist}
|
Release: 2.0.riscv64%{?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/
|
||||||
Source0: https://github.com/imageworks/OpenColorIO/archive/v%{version}/%{name}-%{version}.tar.gz
|
Source0: https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/v%{version}/%{name}-%{version}.tar.gz
|
||||||
Patch0: OpenColorIO-gcc.patch
|
|
||||||
Patch1: OpenColorIO-setuptools.patch
|
# OIIO is only built for these arches due to Libraw
|
||||||
# Fix build against yaml-cpp 0.6.0+
|
%if 0%{?rhel} >= 8 && 0%{?rhel} < 9
|
||||||
# This patch is fine for our case (building against system yaml-cpp)
|
ExclusiveArch: x86_64 ppc64le
|
||||||
# but probably a bit too simple-minded to upstream as-is. See
|
%endif
|
||||||
# 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 gcc-c++
|
BuildRequires: cmake gcc-c++
|
||||||
BuildRequires: help2man
|
BuildRequires: help2man
|
||||||
BuildRequires: python2-markupsafe
|
BuildRequires: python3
|
||||||
BuildRequires: python2-setuptools
|
BuildRequires: python3-markupsafe
|
||||||
|
BuildRequires: python3-setuptools
|
||||||
|
|
||||||
%if 0%{?docs}
|
# Libraries
|
||||||
# Needed for pdf documentation generation
|
BuildRequires: cmake(OpenEXR)
|
||||||
BuildRequires: texlive-latex-bin-bin texlive-gsftopk-bin texlive-dvips
|
BuildRequires: boost-devel
|
||||||
# Fonts
|
BuildRequires: expat-devel
|
||||||
BuildRequires: texlive-cm texlive-ec texlive-times texlive-helvetic
|
BuildRequires: freeglut-devel
|
||||||
BuildRequires: texlive-courier
|
BuildRequires: glew-devel
|
||||||
# Map tables
|
BuildRequires: libX11-devel libXmu-devel libXi-devel
|
||||||
BuildRequires: texlive-cmap
|
BuildRequires: mesa-libGL-devel mesa-libGLU-devel
|
||||||
# Font maps
|
BuildRequires: minizip-ng-devel >= 3.0.6
|
||||||
BuildRequires: texlive-updmap-map
|
BuildRequires: opencv-devel
|
||||||
# Babel
|
BuildRequires: pybind11-devel
|
||||||
BuildRequires: texlive-babel-english
|
BuildRequires: python3-devel
|
||||||
# Styles
|
BuildRequires: python3-pip
|
||||||
BuildRequires: texlive-fancyhdr texlive-fancybox texlive-mdwtools
|
BuildRequires: pystring-devel
|
||||||
BuildRequires: texlive-parskip texlive-multirow texlive-titlesec
|
BuildRequires: zlib-devel
|
||||||
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: cmake(OpenImageIO)
|
||||||
BuildRequires: OpenEXR-devel
|
#BuildRequires: OpenImageIO-iv
|
||||||
|
#BuildRequires: OpenImageIO-utils
|
||||||
# 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
|
|
||||||
|
|
||||||
#######################
|
#######################
|
||||||
# Unbundled libraries #
|
# Unbundled libraries #
|
||||||
#######################
|
#######################
|
||||||
BuildRequires: tinyxml-devel
|
|
||||||
BuildRequires: lcms2-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.
|
%if 0%{?docs}
|
||||||
#BuildRequires: python-docutils
|
BuildRequires: doxygen
|
||||||
#BuildRequires: python-jinja2
|
BuildRequires: python3-breathe
|
||||||
#BuildRequires: python-pygments
|
BuildRequires: python3-recommonmark
|
||||||
#BuildRequires: python-setuptools
|
BuildRequires: python3-sphinx-press-theme
|
||||||
#BuildRequires: python-sphinx
|
BuildRequires: python3-sphinx-tabs
|
||||||
|
BuildRequires: python3-testresources
|
||||||
|
%endif
|
||||||
|
|
||||||
%if ! 0%{?docs}
|
%if ! 0%{?docs}
|
||||||
# upgrade path for when/if docs are not included
|
# upgrade path for when/if docs are not included
|
||||||
@ -106,7 +86,6 @@ Command line tools for %{name}.
|
|||||||
%package doc
|
%package doc
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
Summary: API Documentation for %{name}
|
Summary: API Documentation for %{name}
|
||||||
Group: Documentation
|
|
||||||
Requires: %{name} = %{version}-%{release}
|
Requires: %{name} = %{version}-%{release}
|
||||||
|
|
||||||
%description doc
|
%description doc
|
||||||
@ -115,7 +94,6 @@ API documentation for %{name}.
|
|||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
Summary: Development libraries and headers for %{name}
|
Summary: Development libraries and headers for %{name}
|
||||||
Group: Development/Libraries
|
|
||||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
@ -123,60 +101,49 @@ Development libraries and headers for %{name}.
|
|||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1
|
%autosetup -p1 -n %{name}-%{version}%{?relcan:-rc%{relcan}}
|
||||||
|
|
||||||
# Remove what bundled libraries
|
# Fedora maps minzip-ng back to minizip so work around it here:
|
||||||
rm -f ext/lcms*
|
sed -i "s/minizip-ng/minizip/g" src/OpenColorIO/OCIOZArchive.cpp src/apps/ocioarchive/main.cpp
|
||||||
rm -f ext/tinyxml*
|
|
||||||
rm -f ext/yaml*
|
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
rm -rf build && mkdir build && pushd build
|
%cmake -DCMAKE_CXX_STANDARD=14 \
|
||||||
%cmake -DOCIO_BUILD_STATIC=OFF \
|
|
||||||
-DOCIO_BUILD_DOCS=%{?docs:ON}%{?!docs:OFF} \
|
-DOCIO_BUILD_DOCS=%{?docs:ON}%{?!docs:OFF} \
|
||||||
-DOCIO_BUILD_TESTS=%{?tests:ON}%{?!tests:OFF} \
|
-DOCIO_BUILD_TESTS=%{?tests:ON}%{?!tests:OFF} \
|
||||||
-DOCIO_PYGLUE_SONAME=OFF \
|
-DOCIO_USE_HEADLESS=ON \
|
||||||
-DUSE_EXTERNAL_YAML=TRUE \
|
-DOCIO_INSTALL_EXT_PACKAGES=NONE \
|
||||||
-DUSE_EXTERNAL_TINYXML=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
|
||||||
../
|
-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
|
%install
|
||||||
pushd build
|
%cmake_install
|
||||||
%make_install
|
|
||||||
|
# Remove static libs
|
||||||
|
find %{buildroot} -type f -name "*.a" -exec rm -f {} \;
|
||||||
|
|
||||||
# Generate man pages
|
# Generate man pages
|
||||||
mkdir -p %{buildroot}%{_mandir}/man1
|
#pushd %{__cmake_builddir}/src/apps
|
||||||
help2man -N -s 1 %{?fedora:--version-string=%{version}} \
|
#mkdir -p %{buildroot}%{_mandir}/man1
|
||||||
-o %{buildroot}%{_mandir}/man1/ociocheck.1 \
|
#for app in ociobakelut ociocheck ociochecklut ocioconvert ociolutimage ociomakeclf ocioperf ociowrite; do \
|
||||||
src/apps/ociocheck/ociocheck
|
#help2man -N -s 1 %{?fedora:--version-string=%{version}} \
|
||||||
help2man -N -s 1 %{?fedora:--version-string=%{version}} \
|
# -o %{buildroot}%{_mandir}/man1/$app.1 \
|
||||||
-o %{buildroot}%{_mandir}/man1/ociobakelut.1 \
|
# $app/$app
|
||||||
src/apps/ociobakelut/ociobakelut
|
#done
|
||||||
popd
|
#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
|
%check
|
||||||
# Testing passes locally in mock but fails on the fedora build servers.
|
# Testing gpu fails due to lack of diaplay. Can it be faked?
|
||||||
#pushd build && make test
|
#ctest
|
||||||
|
|
||||||
|
|
||||||
%ldconfig_scriptlets
|
%ldconfig_scriptlets
|
||||||
@ -184,30 +151,137 @@ find %{buildroot} -name "*.cmake" -exec mv {} %{buildroot}%{_datadir}/cmake/Modu
|
|||||||
|
|
||||||
%files
|
%files
|
||||||
%license LICENSE
|
%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.*
|
%{_libdir}/*.so.*
|
||||||
%dir %{_datadir}/ocio
|
%{python3_sitearch}/*.so
|
||||||
%{_datadir}/ocio/setup_ocio.sh
|
|
||||||
%{python2_sitearch}/*.so
|
|
||||||
|
|
||||||
%files tools
|
%files tools
|
||||||
%{_bindir}/*
|
%{_bindir}/*
|
||||||
%{_mandir}/man1/*
|
%{_datadir}/ocio/
|
||||||
|
#{_mandir}/man1/*
|
||||||
|
|
||||||
%if 0%{?docs}
|
%if 0%{?docs}
|
||||||
%files doc
|
%files doc
|
||||||
%doc _tmpdoc/*
|
%{_datadir}/doc/%{name}/html/
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%{_datadir}/cmake/Modules/*
|
|
||||||
%{_includedir}/OpenColorIO/
|
%{_includedir}/OpenColorIO/
|
||||||
%{_includedir}/PyOpenColorIO/
|
%{_libdir}/cmake/%{name}/
|
||||||
%{_libdir}/*.so
|
%{_libdir}/*.so
|
||||||
%{_libdir}/pkgconfig/%{name}.pc
|
%{_libdir}/pkgconfig/%{name}.pc
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed May 30 2023 David Abdurachmanov <davidlt@rivosinc.com> - 2.2.1-2.0.riscv64
|
||||||
|
- Disable BR for OIIO for boostrap (riscv64)
|
||||||
|
|
||||||
|
* 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
|
* Thu Feb 22 2018 Adam Williamson <awilliam@redhat.com> - 1.1.0-6
|
||||||
- Rebuild with bootstrap disabled, so we get docs again
|
- Rebuild with bootstrap disabled, so we get docs again
|
||||||
|
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -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 )
|
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (OpenColorIO-1.1.0.tar.gz) = 909874a9f91a8d229622810fc70233680c6e75203bd8555179322de2873da00bf302432e19f189b787ffcda3157ddec1e4601c97f75a36e16f644fe7d42f6998
|
SHA512 (OpenColorIO-2.2.1.tar.gz) = d5f3a4b5bd661af7336c015d07e0feccb286464a08239a3c259a97217001161e7571f5137475fc2f4d1b9af6381bbfa03c0b60f41de282f114307961b8d84fc9
|
||||||
|
Loading…
Reference in New Issue
Block a user