Compare commits

..

5 Commits
master ... f24

Author SHA1 Message Date
Richard M. Shaw 08f611b448 Merge branch 'master' into f24 2016-08-03 10:55:04 -05:00
Richard M. Shaw 3e45bc65f6 Merge branch 'master' into f24 2016-07-02 15:22:06 -05:00
Richard M. Shaw 841811ea19 Resync with master 2016-06-02 07:47:27 -05:00
Richard M. Shaw f867d001a2 Resync with master. 2016-06-02 07:45:45 -05:00
Jonathan Wakely a33521c110 Rebuilt for linker errors in boost (#1331983) 2016-05-20 11:45:42 +01:00
4 changed files with 217 additions and 138 deletions

16
.gitignore vendored
View File

@ -44,19 +44,3 @@ clog
/OpenImageIO-1.6.14.tar.gz
/OpenImageIO-1.6.15.tar.gz
/OpenImageIO-1.6.16.tar.gz
/OpenImageIO-1.7.7.tar.gz
/OpenImageIO-1.7.9.tar.gz
/OpenImageIO-1.7.10.tar.gz
/OpenImageIO-1.7.11.tar.gz
/OpenImageIO-1.7.12.tar.gz
/OpenImageIO-1.7.13.tar.gz
/OpenImageIO-1.7.14.tar.gz
/OpenImageIO-1.7.15.tar.gz
/OpenImageIO-1.7.17.tar.gz
/OpenImageIO-1.8.5.tar.gz
/OpenImageIO-1.8.6.tar.gz
/OpenImageIO-1.8.7.tar.gz
/OpenImageIO-1.8.8.tar.gz
/OpenImageIO-1.8.9.tar.gz
/OpenImageIO-1.8.10.tar.gz
/OpenImageIO-1.8.12.tar.gz

View File

@ -1,59 +0,0 @@
--- a/src/doc/CMakeLists.txt
+++ b/src/doc/CMakeLists.txt
@@ -6,10 +6,11 @@ set (public_docs
"${OpenImageIO_SOURCE_DIR}/CHANGES.md"
)
-install (FILES ${public_docs}
- DESTINATION ${CMAKE_INSTALL_DOCDIR}
- COMPONENT documentation)
-
+if (INSTALL_DOCS)
+ install (FILES ${public_docs}
+ DESTINATION ${CMAKE_INSTALL_DOCDIR}
+ COMPONENT documentation)
+endif()
# generate man pages using txt2man and a tiny python script to munge the
# result of "$tool --help"
@@ -19,8 +20,7 @@ if (UNIX AND TXT2MAN AND PYTHONINTERP_FO
message (STATUS "Unix man page documentation will be generated")
set (cli_tools oiiotool iinfo maketx idiff igrep iconvert)
- find_program (IV_FOUND iv)
- if (IV_FOUND)
+ if (TARGET iv)
list (APPEND cli_tools iv)
endif()
@@ -37,7 +37,9 @@ if (UNIX AND TXT2MAN AND PYTHONINTERP_FO
# force man page build before install
add_custom_target (man_pages ALL DEPENDS ${manpage_files})
+if (INSTALL_DOCS)
install (FILES ${manpage_files}
DESTINATION ${CMAKE_INSTALL_MANDIR}
COMPONENT documentation)
endif()
+endif()
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -101,6 +101,9 @@ set (TEX_BATCH_SIZE "" CACHE STRING "For
set (SOVERSION ${OIIO_VERSION_MAJOR}.${OIIO_VERSION_MINOR}
CACHE STRING "Set the SO version in the SO name of the output library")
option (BUILD_OIIOUTIL_ONLY "If ON, will build *only* libOpenImageIO_Util")
+option (BUILD_DOCS "If ON, build documentation and man pages.")
+option (INSTALL_DOCS "If ON, install documentation and man pages.")
+
if (NOT OIIO_THREAD_ALLOW_DCLP)
add_definitions ("-DOIIO_THREAD_ALLOW_DCLP=0")
@@ -188,7 +191,7 @@ if (USE_PYTHON AND NOT BUILD_OIIOUTIL_ON
endif ()
add_subdirectory (src/include)
-if (INSTALL_DOCS)
+if (BUILD_DOCS)
add_subdirectory (src/doc)
endif ()
add_subdirectory (src/fonts)

View File

@ -1,36 +1,33 @@
%global sover 1.8
%global subname oiio
#global beta beta1
Name: OpenImageIO
Version: 1.8.12
Version: 1.6.16
Release: 1%{?dist}
Summary: Library for reading and writing images
Group: Development/Libraries
License: BSD
URL: https://sites.google.com/site/openimageio/home
Source0: https://github.com/%{name}/oiio/archive/Release-%{version}/%{name}-%{version}.tar.gz
Source0: https://github.com/%{name}/%{subname}/archive/Release-%{version}.tar.gz#/%{name}-%{version}.tar.gz
# Images for test suite
#Source1: oiio-images.tar.gz
Patch0: OpenImageIO-man.patch
BuildRequires: cmake gcc-c++
BuildRequires: txt2man
BuildRequires: qt5-devel
BuildRequires: qt4-devel
BuildRequires: boost-devel
%if 0%{?fedora} > 28
BuildRequires: boost-python2-devel
%else
BuildRequires: boost-python-devel
%endif
BuildRequires: glew-devel
BuildRequires: OpenEXR-devel ilmbase-devel
BuildRequires: python2-devel
BuildRequires: libpng-devel libtiff-devel libjpeg-turbo-devel openjpeg2-devel
BuildRequires: giflib-devel
BuildRequires: libpng-devel libtiff-devel libjpeg-turbo-devel giflib-devel
%if ! 0%{?rhel}
BuildRequires: libwebp-devel
BuildRequires: Field3D-devel
%endif
BuildRequires: hdf5-devel
BuildRequires: dcmtk-devel
BuildRequires: zlib-devel
BuildRequires: jasper-devel
BuildRequires: pugixml-devel
@ -43,6 +40,12 @@ BuildRequires: openssl-devel
# rebuilt.
BuildRequires: OpenColorIO-devel
# We don't want to provide private python extension libs
%{?filter_setup:
%filter_provides_in %{python_sitearch}/.*\.so$
%filter_setup
}
%description
OpenImageIO is a library for reading and writing images, and a bunch of related
@ -56,12 +59,11 @@ classes, utilities, and applications. Main features include:
truly vast amounts of image data.
%package -n python2-openimageio
%package -n python-%{name}
Summary: Python 2 bindings for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
%{?python_provide:%python_provide python2-%{srcname}}
%description -n python2-openimageio
%description -n python-%{name}
Python bindings for %{name}.
@ -85,6 +87,7 @@ with any formats for which plugins are available).
%package devel
Summary: Documentation for %{name}
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
@ -92,7 +95,7 @@ Development files for package %{name}
%prep
%autosetup -p1 -n oiio-Release-%{version}
%setup -q -n oiio-Release-%{version}
# Remove bundled pugixml
rm -f src/include/OpenImageIO/pugixml.hpp \
@ -115,46 +118,46 @@ rm -rf build/linux && mkdir -p build/linux && pushd build/linux
-DCMAKE_SKIP_RPATH:BOOL=TRUE \
-DINCLUDE_INSTALL_DIR:PATH=/usr/include/%{name} \
-DPYLIB_INSTALL_DIR:PATH=%{python_sitearch} \
-DBUILD_DOCS:BOOL=TRUE \
-DINSTALL_DOCS:BOOL=FALSE \
-DINSTALL_FONTS:BOOL=FALSE \
-DUSE_EXTERNAL_PUGIXML:BOOL=TRUE \
-DUSE_OPENSSL:BOOL=TRUE \
-DSTOP_ON_WARNING:BOOL=FALSE \
-DUSE_CPP:STRING=14 \
%ifarch ppc ppc64
-DNOTHREADS:BOOL=FALSE \
%endif
-DJPEG_INCLUDE_DIR=%{_includedir} \
-DOPENJPEG_INCLUDE_DIR=$(pkgconf --variable=includedir libopenjp2) \
-DVERBOSE=TRUE \
../../
%make_build
make %{?_smp_mflags}
%install
pushd build/linux
%make_install
make DESTDIR=%{buildroot} install
# Move man pages to the right directory
mkdir -p %{buildroot}%{_mandir}/man1
cp -a src/doc/*.1 %{buildroot}%{_mandir}/man1
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%check
# Not all tests pass on linux
#pushd build/linux && make test
%files
%doc CHANGES.md README.md
%{!?_licensedir:%global license %doc}
%license LICENSE
%{_libdir}/libOpenImageIO.so.%{sover}*
%{_libdir}/libOpenImageIO_Util.so.%{sover}*
%doc CHANGES
%{_libdir}/libOpenImageIO.so.*
%{_libdir}/libOpenImageIO_Util.so.*
%files -n python2-openimageio
%{python2_sitearch}/OpenImageIO.so
%files -n python-%{name}
%{python_sitearch}/OpenImageIO.so
%files utils
%exclude %{_bindir}/iv
@ -174,39 +177,190 @@ cp -a src/doc/*.1 %{buildroot}%{_mandir}/man1
%changelog
* Fri Jun 01 2018 Richard Shaw <hobbes1069@gmail.com> - 1.8.12-1
- Update to 1.8.12.
* Mon Apr 02 2018 Richard Shaw <hobbes1069@gmail.com> - 1.8.10-1
- Update to 1.8.10.
* Fri Mar 02 2018 Adam Williamson <awilliam@redhat.com> - 1.8.9-2
- Rebuild for opencv 3.4.1
* Thu Mar 01 2018 Richard Shaw <hobbes1069@gmail.com> - 1.8.9-1
- Update to 1.8.9
* Fri Feb 23 2018 Peter Robinson <pbrobinson@fedoraproject.org> 1.8.8-3
- Rebuild
* Tue Feb 13 2018 Sandro Mani <manisandro@gmail.com> - 1.8.8-2
- Rebuild (giflib)
* Fri Feb 02 2018 Richard Shaw <hobbes1069@gmail.com> - 1.8.8-1
- Update to 1.8.8.
* Thu Jan 18 2018 Richard Shaw <hobbes1069@gmail.com> - 1.8.7-3
- Add openjpeg2 to build dependencies.
- Re-enable dcmtk for 32bit arches.
* Sat Jan 13 2018 Richard Shaw <hobbes1069@gmail.com> - 1.8.7-2
- Rebuild for OpenColorIO 1.1.0.
* Wed Jan 03 2018 Richard Shaw <hobbes1069@gmail.com> - 1.8.7-1
* Tue Aug 2 2016 Richard Shaw <hobbes1069@gmail.com> - 1.6.16-1
- Update to latest upstream release.
- Disable building with dcmtk until fixed, see:
https://github.com/OpenImageIO/oiio/issues/1841
* Thu Nov 02 2017 Richard Shaw <hobbes1069@gmail.com> - 1.8.6-1
* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.15-2
- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
* Fri Jul 1 2016 Richard Shaw <hobbes1069@gmail.com> - 1.6.15-1
- Update to latest upstream release.
- Add dcmtk to build to enable DICOM plugin.
* Wed Jun 1 2016 Richard Shaw <hobbes1069@gmail.com> - 1.6.14-1
- Update to latest upstream release.
* Sun May 1 2016 Richard Shaw <hobbes1069@gmail.com> - 1.6.13-1
- Update to latest upstream release.
- Change from openjpeg to libjpeg-turbo.
* Tue Apr 26 2016 Orion Poplawski <orion@cora.nwra.com> - 1.6.12-3
- Rebuild for OpenCV 3.1
* Mon Apr 11 2016 Richard Shaw <hobbes1069@gmail.com> - 1.6.12-2
- Rebuild for updated Field3D.
* Fri Apr 1 2016 Richard Shaw <hobbes1069@gmail.com> - 1.6.12-1
- Update to latest upstream release.
* Tue Mar 1 2016 Richard Shaw <hobbes1069@gmail.com> - 1.6.11-1
- Update to latest upstream release.
* Wed Feb 3 2016 Richard Shaw <hobbes1069@gmail.com> - 1.6.10-1
- Update to latest upstream release.
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.9-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Thu Jan 21 2016 Orion Poplawski <orion@cora.nwra.com> - 1.6.9-3
- Rebuild for hdf5 1.8.16
* Thu Jan 14 2016 Adam Jackson <ajax@redhat.com> - 1.6.9-2
- Rebuild for glew 1.13
* Wed Jan 6 2016 Richard Shaw <hobbes1069@gmail.com> - 1.6.9-1
- Update to latest upstream release.
* Mon Dec 28 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 1.6.8-2
- Rebuilt for libwebp soname bump
- Use openssl, fixes BZ#1294602.
* Wed Dec 23 2015 Richard Shaw <hobbes1069@gmail.com> - 1.6.8-1
- Update to latest upstream release.
- Use openssl, fixes BZ#1294602.
* Thu Dec 17 2015 Richard Shaw <hobbes1069@gmail.com> - 1.5.22-1
- Update to latest upstream release.
- Add LibRaw to build requirements.
* Wed Dec 2 2015 Richard Shaw <hobbes1069@gmail.com> - 1.5.21-1
- Update to latest upstream release.
- Move python bindings to their own subpackage.
* Thu Oct 22 2015 Richard Shaw <hobbes1069@gmail.com> - 1.5.20-2
- Rebuild for updated pugixml.
* Mon Sep 28 2015 Richard Shaw <hobbes1069@gmail.com> - 1.5.20-1
- Update to latest upstream release.
* Thu Aug 27 2015 Jonathan Wakely <jwakely@redhat.com> - 1.5.18-3
- Rebuilt for Boost 1.59
* Wed Aug 05 2015 Jonathan Wakely <jwakely@redhat.com> 1.5.18-2
- Rebuilt for Boost 1.58
* Tue Aug 4 2015 Richard Shaw <hobbes1069@gmail.com> - 1.5.18-1
- Update to latest upstream release.
* Wed Jul 29 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.17-3
- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159
* Wed Jul 22 2015 David Tardon <dtardon@redhat.com> - 1.5.17-2
- rebuild for Boost 1.58
* Thu Jul 16 2015 Richard Shaw <hobbes1069@gmail.com> - 1.5.17-1
- Update to latest upstream release.
* Tue Jun 16 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.14-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Sun May 17 2015 Orion Poplawski <orion@cora.nwra.com> - 1.5.14-3
- Rebuild for hdf5 1.8.15
* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 1.5.14-2
- Rebuilt for GCC 5 C++11 ABI change
* Wed Apr 15 2015 Richard Shaw <hobbes1069@gmail.com> - 1.5.14-1
- Update to latest upstream release.
* Wed Mar 11 2015 Richard Shaw <hobbes1069@gmail.com> - 1.5.13-1
- Update to latest upstream release.
* Sat Feb 21 2015 Orion Poplawski <orion@cora.nwra.com> - 1.5.12-3
- Rebuild for undefined symbols
* Thu Feb 12 2015 Richard Shaw <hobbes1069@gmail.com> - 1.5.12-2
- Update to latest upstream release.
- Add opencv optional dependency.
- Use new license rpmbuild macro.
- Fix broken conditional which prevented Field3D from being required.
* Wed Feb 11 2015 Richard Shaw <hobbes1069@gmail.com> - 1.5.11-3
- Rebuild for Field3D.
* Wed Feb 04 2015 Petr Machata <pmachata@redhat.com> - 1.5.11-2
- Bump for rebuild.
* Wed Jan 28 2015 Richard Shaw <hobbes1069@gmail.com> - 1.5.11-1
- Update to latest upstream release.
* Tue Jan 27 2015 Richard Shaw <hobbes1069@gmail.com> - 1.5.10-1
- Update to latest upstream release.
* Tue Jan 27 2015 Petr Machata <pmachata@redhat.com> - 1.4.16-2
- Rebuild for boost 1.57.0
* Thu Jan 22 2015 Richard Shaw <hobbes1069@gmail.com> - 1.4.16-1
- Update to latest upstream release.
* Wed Nov 26 2014 Rex Dieter <rdieter@fedoraproject.org> 1.4.15-2
- rebuild (openexr)
* Tue Nov 25 2014 Richard Shaw <hobbes1069@gmail.com> - 1.4.15-1
- Update to latest upstream release.
* Fri Nov 14 2014 Richard Shaw <hobbes1069@gmail.com> - 1.4.14-1
- Update to latest upstream release.
* Fri Sep 5 2014 Richard Shaw <hobbes1069@gmail.com> - 1.4.12-4
- Rebuild for Field3D 1.4.3.
* Thu Sep 04 2014 Orion Poplawski <orion@cora.nwra.com> - 1.4.12-3
- Rebuild for pugixml 1.4
* Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.12-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Fri Aug 1 2014 Richard Shaw <hobbes1069@gmail.com> - 1.4.12-1
- Update to latest upstream release.
* Fri Jun 06 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.7-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Fri May 23 2014 Petr Machata <pmachata@redhat.com> - 1.4.7-3
- Rebuild for boost 1.55.0
* Fri May 23 2014 David Tardon <dtardon@redhat.com> - 1.4.7-2
- rebuild for boost 1.55.0
* Mon May 19 2014 Richard Shaw <hobbes1069@gmail.com> - 1.4.7-1
- Update to latest upstream release.
* Tue Jan 7 2014 Richard Shaw <hobbes1069@gmail.com> - 1.3.10-1
- Update to latest upstream release.
- Add libgif as build requirement.
* Wed Nov 27 2013 Rex Dieter <rdieter@fedoraproject.org> - 1.2.3-3
- rebuild (openexr)
* Mon Nov 18 2013 Dave Airlie <airlied@redhat.com> - 1.2.3-2
- rebuilt for GLEW 1.10
* Wed Nov 6 2013 Richard Shaw <hobbes1069@gmail.com> - 1.2.3-1
- Update to latest upstream release.
- Fix ppc builds (BZ#1021977).
- Add conditionals to build requirements for EPEL 6.
* Wed Oct 2 2013 Richard Shaw <hobbes1069@gmail.com> - 1.2.2-1
- Update to latest upstream release.
* Sun Sep 08 2013 Rex Dieter <rdieter@fedoraproject.org> 1.2.1-2
- rebuild (ilmbase/openexr)
* Thu Aug 8 2013 Richard Shaw <hobbes1069@gmail.com> - 1.2.1-1
- Update to latest upstream release.
* Fri Aug 02 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Sun Jul 28 2013 Petr Machata <pmachata@redhat.com> - 1.2.0-2
- Rebuild for boost 1.54.0

View File

@ -1 +1 @@
SHA512 (OpenImageIO-1.8.12.tar.gz) = 2475792ff475d34b47b6af5ca71c6cf6d9d8c60452a506b1bf740b9dbb20ea72109117dc9a531b8302095de99f6280172723f26e23dc6e038256cbb43b697145
cc4420c594428ecdc080779c341e099a OpenImageIO-1.6.16.tar.gz