Update to 2.0.1.

This commit is contained in:
Richard Shaw 2021-08-23 07:45:29 -05:00
parent 5761f660a9
commit 5f39649d11
3 changed files with 52 additions and 85 deletions

1
.gitignore vendored
View File

@ -3,3 +3,4 @@
/OpenColorIO-1.0.9.tar.gz
/OpenColorIO-1.1.0.tar.gz
/OpenColorIO-1.1.1.tar.gz
/OpenColorIO-2.0.1.tar.gz

View File

@ -1,27 +1,28 @@
%if ! 0%{?bootstrap}
%if ! 0%{?bootstrap} || ! 0%{?rhel}
%global docs 1
%global tests 1
%endif
Name: OpenColorIO
Version: 1.1.1
Release: 14%{?dist}
Version: 2.0.1
Release: 1%{?dist}
Summary: Enables color transforms and image display across graphics apps
License: BSD
URL: http://opencolorio.org/
Source0: https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/v%{version}/%{name}-%{version}.tar.gz
# Work with system libraries instead of bundled.
Patch0: OpenColorIO-setuptools.patch
# Fix build against yaml-cpp 0.6.0+
# This patch is fine for our case (building against system yaml-cpp)
# but probably a bit too simple-minded to upstream as-is. See
# https://github.com/imageworks/OpenColorIO/issues/517
Patch1: ocio-1.1.0-yamlcpp060.patch
Patch2: ocio-glext_h.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1923344
Patch3: ocio-null_pointer.patch
# https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1296
Patch0: ocio-install.patch
# For OpenEXR/Imath 3
# https://github.com/AcademySoftwareFoundation/OpenColorIO/pull/1432
Patch1: 1432.patch
# OIIO is only built for these arches due to Libraw
%if 0%{?rhel} >= 8
ExclusiveArch: x86_64 ppc64le
%endif
# Utilities
BuildRequires: cmake gcc-c++
@ -31,58 +32,40 @@ BuildRequires: python3-markupsafe
BuildRequires: python3-setuptools
# Libraries
BuildRequires: OpenEXR-devel
BuildRequires: boost-devel
BuildRequires: mesa-libGL-devel mesa-libGLU-devel
BuildRequires: libX11-devel libXmu-devel libXi-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: 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
BuildRequires: OpenImageIO-iv
BuildRequires: OpenImageIO-utils
#######################
# Unbundled libraries #
#######################
BuildRequires: tinyxml-devel
BuildRequires: lcms2-devel
BuildRequires: yaml-cpp-devel >= 0.5.0
%if 0%{?docs}
BuildRequires: python3-sphinx-latex
# Needed for pdf documentation generation
BuildRequires: texlive-latex-bin-bin texlive-gsftopk-bin texlive-dvips
# Explicit "\usepackage" dependencies from OpenColorIO.tex
# Note that sphinx.sty is bundled in OpenColorIO.
BuildRequires: tex(inputenc.sty)
# Map tables
BuildRequires: tex(cmap.sty)
BuildRequires: tex(fontenc.sty)
BuildRequires: tex(babel.sty)
BuildRequires: tex(times.sty)
BuildRequires: tex(fncychap.sty)
BuildRequires: tex(longtable.sty)
BuildRequires: tex(multirow.sty)
BuildRequires: tex(tabulary.sty)
BuildRequires: tex(upquote.sty)
BuildRequires: tex(capt-of.sty)
BuildRequires: tex(needspace.sty)
BuildRequires: tex(cm-super-ts1.enc)
# Fonts
BuildRequires: texlive-cm texlive-ec texlive-times texlive-helvetic
BuildRequires: texlive-courier
# Babel
BuildRequires: texlive-babel-english
# Styles
BuildRequires: texlive-fancyhdr texlive-fancybox texlive-mdwtools
BuildRequires: texlive-parskip texlive-titlesec
BuildRequires: texlive-framed texlive-threeparttable texlive-wrapfig
# Other
BuildRequires: texlive-hyphen-base
BuildRequires: doxygen
BuildRequires: python3-breathe
BuildRequires: python3-recommonmark
BuildRequires: python3-sphinx-press-theme
BuildRequires: python3-sphinx-tabs
BuildRequires: python3-testresources
%endif
%if ! 0%{?docs}
@ -124,24 +107,14 @@ Development libraries and headers for %{name}.
%prep
%autosetup -p1
# Remove what bundled libraries
rm -f ext/lcms*
rm -f ext/tinyxml*
rm -f ext/yaml*
%autosetup -p1 -n %{name}-%{version}%{?relcan:-rc%{relcan}}
%build
%cmake -DOCIO_BUILD_STATIC=OFF \
-DOCIO_BUILD_DOCS=%{?docs:ON}%{?!docs:OFF} \
-DOCIO_BUILD_PYGLUE=OFF \
%cmake -DOCIO_BUILD_DOCS=%{?docs:ON}%{?!docs:OFF} \
-DOCIO_BUILD_TESTS=%{?tests:ON}%{?!tests:OFF} \
-DPYTHON=%{__python3} \
-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
@ -153,27 +126,19 @@ rm -f ext/yaml*
%install
%cmake_install
# Remove static libs
find %{buildroot} -type f -name "*.a" -exec rm -f {} \;
# Generate man pages
pushd %{_vpath_builddir}
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/ociocheck.1 \
src/apps/ociocheck/ociocheck
help2man -N -s 1 %{?fedora:--version-string=%{version}} \
-o %{buildroot}%{_mandir}/man1/ociobakelut.1 \
src/apps/ociobakelut/ociobakelut
-o %{buildroot}%{_mandir}/man1/$app.1 \
$app/$app
done
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
# Testing passes locally in mock but fails on the fedora build servers.
@ -185,30 +150,31 @@ 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
#{python3_sitearch}/*.so
%{python3_sitearch}/*.so
%files tools
%{_bindir}/*
%{_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}/*.so
%{_libdir}/pkgconfig/%{name}.pc
%changelog
* 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

View File

@ -1 +1 @@
SHA512 (OpenColorIO-1.1.1.tar.gz) = bed722f9ddce1887d28aacef2882debccd7c3f3c0c708d2723fea58a097de9f02721af9e85453e089ffda5406aef593ab6536c6886307823c132aa787e492e33
SHA512 (OpenColorIO-2.0.1.tar.gz) = 5787cc4cadb0a1832c925712ca0dfef6e843082b9461460e1798326c6fceaa97bee78e5298651e6a8a3662b348eab5ab9791e94c3efcac337da07229fb559338