Compare commits
1 Commits
| Author | SHA1 | Date |
|---|---|---|
Richard M. Shaw
|
b0efb54648 |
|
|
@ -19,44 +19,4 @@ clog
|
|||
/oiio-Release-1.2.0.tar.gz
|
||||
/oiio-Release-1.2.1.tar.gz
|
||||
/oiio-Release-1.2.3.tar.gz
|
||||
/oiio-Release-1.3.11.tar.gz
|
||||
/oiio-Release-1.4.7.tar.gz
|
||||
/oiio-Release-1.4.12.tar.gz
|
||||
/oiio-Release-1.4.14.tar.gz
|
||||
/oiio-Release-1.4.15.tar.gz
|
||||
/oiio-Release-1.4.16.tar.gz
|
||||
/oiio-Release-1.5.10.tar.gz
|
||||
/oiio-Release-1.5.11.tar.gz
|
||||
/oiio-Release-1.5.12.tar.gz
|
||||
/oiio-Release-1.5.13.tar.gz
|
||||
/oiio-Release-1.5.14.tar.gz
|
||||
/oiio-Release-1.5.17.tar.gz
|
||||
/oiio-Release-1.5.18.tar.gz
|
||||
/oiio-Release-1.5.20.tar.gz
|
||||
/OpenImageIO-1.5.21.tar.gz
|
||||
/OpenImageIO-1.5.22.tar.gz
|
||||
/OpenImageIO-1.6.8.tar.gz
|
||||
/OpenImageIO-1.6.9.tar.gz
|
||||
/OpenImageIO-1.6.10.tar.gz
|
||||
/OpenImageIO-1.6.11.tar.gz
|
||||
/OpenImageIO-1.6.12.tar.gz
|
||||
/OpenImageIO-1.6.13.tar.gz
|
||||
/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
|
||||
/oiio-Release-1.3.14.tar.gz
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
278
OpenImageIO.spec
278
OpenImageIO.spec
|
|
@ -1,48 +1,59 @@
|
|||
%global sover 1.8
|
||||
%global subname oiio
|
||||
|
||||
%if 0%{?rhel}
|
||||
%global cmake %cmake28
|
||||
%endif
|
||||
|
||||
Name: OpenImageIO
|
||||
Version: 1.8.12
|
||||
Version: 1.3.14
|
||||
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}/%{subname}-Release-%{version}.tar.gz
|
||||
# Images for test suite
|
||||
#Source1: oiio-images.tar.gz
|
||||
|
||||
Patch0: OpenImageIO-man.patch
|
||||
Patch0: oiio-arm.patch
|
||||
Patch1: oiio-ppc.patch
|
||||
Patch2: oiio-s390.patch
|
||||
Patch3: oiio-cmake.patch
|
||||
|
||||
BuildRequires: cmake gcc-c++
|
||||
BuildRequires: txt2man
|
||||
BuildRequires: qt5-devel
|
||||
BuildRequires: boost-devel
|
||||
%if 0%{?fedora} > 28
|
||||
BuildRequires: boost-python2-devel
|
||||
%if 0%{?rhel}
|
||||
BuildRequires: cmake28
|
||||
%else
|
||||
BuildRequires: boost-python-devel
|
||||
BuildRequires: cmake
|
||||
%endif
|
||||
BuildRequires: txt2man
|
||||
BuildRequires: qt4-devel
|
||||
BuildRequires: boost-devel
|
||||
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 openjpeg-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
|
||||
BuildRequires: opencv-devel
|
||||
BuildRequires: LibRaw-devel
|
||||
BuildRequires: openssl-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: 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,15 +67,6 @@ classes, utilities, and applications. Main features include:
|
|||
truly vast amounts of image data.
|
||||
|
||||
|
||||
%package -n python2-openimageio
|
||||
Summary: Python 2 bindings for %{name}
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
%{?python_provide:%python_provide python2-%{srcname}}
|
||||
|
||||
%description -n python2-openimageio
|
||||
Python bindings for %{name}.
|
||||
|
||||
|
||||
%package utils
|
||||
Summary: Command line utilities for %{name}
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
|
@ -79,12 +81,13 @@ Summary: %{name} based image viewer
|
|||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description iv
|
||||
A really nice image viewer, iv, based on %{name} classes (and so will work
|
||||
with any formats for which plugins are available).
|
||||
A really nice image viewer, iv, based on %{name} classes (and so will work 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,12 +95,16 @@ Development files for package %{name}
|
|||
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n oiio-Release-%{version}
|
||||
%setup -q -n oiio-Release-%{version}
|
||||
%patch0 -p1 -b .arm
|
||||
%patch1 -p1 -b .ppc
|
||||
#patch2 -p1 -b .s390
|
||||
#patch3 -p1 -b .cmake
|
||||
|
||||
# Remove bundled pugixml
|
||||
rm -f src/include/OpenImageIO/pugixml.hpp \
|
||||
src/include/OpenImageIO/pugiconfig.hpp \
|
||||
src/libutil/OpenImageIO/pugixml.cpp
|
||||
rm -f src/include/pugixml.hpp \
|
||||
src/include/pugiconfig.hpp \
|
||||
src/libutil/pugixml.cpp
|
||||
|
||||
# Remove bundled tbb
|
||||
rm -rf src/include/tbb
|
||||
|
|
@ -115,46 +122,40 @@ 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 \
|
||||
-DUSE_TBB:BOOL=FALSE \
|
||||
%ifarch ppc ppc64
|
||||
-DNOTHREADS:BOOL=FALSE \
|
||||
-DNOTHREADS:BOOL=TRUE \
|
||||
%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
|
||||
%license LICENSE
|
||||
%{_libdir}/libOpenImageIO.so.%{sover}*
|
||||
%{_libdir}/libOpenImageIO_Util.so.%{sover}*
|
||||
|
||||
%files -n python2-openimageio
|
||||
%{python2_sitearch}/OpenImageIO.so
|
||||
%doc CHANGES LICENSE
|
||||
%{_libdir}/libOpenImageIO.so.*
|
||||
%{python_sitearch}/OpenImageIO.so
|
||||
|
||||
%files utils
|
||||
%exclude %{_bindir}/iv
|
||||
|
|
@ -169,44 +170,155 @@ cp -a src/doc/*.1 %{buildroot}%{_mandir}/man1
|
|||
%files devel
|
||||
%doc src/doc/*.pdf
|
||||
%{_libdir}/libOpenImageIO.so
|
||||
%{_libdir}/libOpenImageIO_Util.so
|
||||
%{_includedir}/*
|
||||
|
||||
|
||||
%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
|
||||
* Mon May 19 2014 Richard Shaw <hobbes1069@gmail.com> - 1.3.14-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 Jan 7 2014 Richard Shaw <hobbes1069@gmail.com> - 1.3.10-1
|
||||
- Update to latest upstream release.
|
||||
- Add dcmtk to build to enable DICOM plugin.
|
||||
- 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
|
||||
|
||||
* Fri Jul 15 2013 Richard Shaw <hobbes1069@gmail.com> - 1.2.0-1
|
||||
- Update to latest upstream release.
|
||||
- Add patch for more pedantic gcc 4.8.
|
||||
|
||||
* Wed Jul 3 2013 Richard Shaw <hobbes1069@gmail.com> - 1.1.13-1
|
||||
- Update to latest bugfix release.
|
||||
|
||||
* Mon Jul 1 2013 Richard Shaw <hobbes1069@gmail.com> - 1.1.11-1
|
||||
- Update to lastest bugfix release.
|
||||
- Upstream patch makes native spinlocks faster than TBB. TBB no longer needed.
|
||||
|
||||
* Mon May 27 2013 Karsten Hopp <karsten@redhat.com> 1.1.10-4
|
||||
- modify ppc patch for current release
|
||||
|
||||
* Fri May 24 2013 Petr Machata <pmachata@redhat.com> - 1.1.10-3
|
||||
- Rebuild for TBB memory barrier bug
|
||||
|
||||
* Mon May 20 2013 Dan Horák <dan[at]danny.cz> - 1.1.10-2
|
||||
- fix build on s390(x)
|
||||
|
||||
* Tue Apr 23 2013 Richard Shaw <hobbes1069@gmail.com> - 1.1.10-1
|
||||
- Update to latest upstream release.
|
||||
|
||||
* Sun Mar 31 2013 Peter Robinson <pbrobinson@fedoraproject.org> 1.1.3-7
|
||||
- Add upstream patch to fix FTBFS on ARM (RHBZ 924932)
|
||||
|
||||
* Sun Mar 10 2013 Rex Dieter <rdieter@fedoraproject.org> 1.1.3-6
|
||||
- rebuild (OpenEXR)
|
||||
|
||||
* Sun Feb 10 2013 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.1.3-5
|
||||
- Rebuild for Boost-1.53.0
|
||||
|
||||
* Sat Feb 09 2013 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.1.3-4
|
||||
- Rebuild for Boost-1.53.0
|
||||
|
||||
* Mon Jan 28 2013 Karsten Hopp <karsten@redhat.com> 1.1.3-3
|
||||
- update PPC patch, use power64 macro
|
||||
|
||||
* Fri Jan 18 2013 Adam Tkac <atkac redhat com> - 1.1.3-2
|
||||
- rebuild due to "jpeg8-ABI" feature drop
|
||||
|
||||
* Mon Jan 14 2013 Richard Shaw <hobbes1069@gmail.com> - 1.1.3-1
|
||||
- Update to latest upstream release.
|
||||
- Separate utilities and library packages.
|
||||
|
||||
* Fri Dec 28 2012 Richard W.M. Jones <rjones@redhat.com> - 1.0.9-3
|
||||
- Rebuild, see
|
||||
http://lists.fedoraproject.org/pipermail/devel/2012-December/175685.html
|
||||
|
||||
* Thu Dec 13 2012 Adam Jackson <ajax@redhat.com> - 1.0.9-2
|
||||
- Rebuild for glew 1.9.0
|
||||
|
||||
* Sat Sep 22 2012 Richard Shaw <hobbes1069@gmail.com> - 1.0.9-1
|
||||
- Update to latest upstream release.
|
||||
|
||||
* Wed Aug 8 2012 David Malcolm <dmalcolm@redhat.com> - 1.0.8-2
|
||||
- rebuild against boost-1.50
|
||||
|
||||
* Wed Aug 01 2012 Richard Shaw <hobbes1069@gmail.com> - 1.0.8-1
|
||||
- Update to latest upstream release.
|
||||
|
||||
* Mon Jul 30 2012 Richard Shaw <hobbes1069@gmail.com> - 1.0.7-3
|
||||
- Rebuild for updated libGLEW.
|
||||
|
||||
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.7-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Mon Jul 09 2012 Richard Shaw <hobbes1069@gmail.com> - 1.0.7-1
|
||||
- Update to latest upstream release.
|
||||
|
||||
* Thu Jun 28 2012 Richard Shaw <hobbes1069@gmail.com> - 1.0.6-1
|
||||
- Update to latest upstream release.
|
||||
- Fix linking against TBB which broke at some point.
|
||||
|
||||
* Tue Jun 12 2012 Richard Shaw <hobbes1069@gmail.com> - 1.0.5-1
|
||||
- Update to latest upstream release.
|
||||
|
||||
* Mon May 07 2012 Richard Shaw <hobbes1069@gmail.com> - 1.0.4-2
|
||||
- Rebuild for updated libtiff.
|
||||
- Add OpenColorIO to build requirements.
|
||||
|
||||
* Thu May 03 2012 Richard Shaw <hobbes1069@gmail.com> - 1.0.4-1
|
||||
- Update to latest upstream release.
|
||||
|
||||
* Tue Apr 24 2012 Richard Shaw <hobbes1069@gmail.com> - 1.0.3-1
|
||||
- Update to latest upstream release.
|
||||
|
||||
* Fri Mar 02 2012 Richard Shaw <hobbes1069@gmail.com> - 1.0.0-1
|
||||
- Update to latest upstream release.
|
||||
|
||||
* Thu Jan 05 2012 Richard Shaw <hobbes1069@gmail.com> - 0.10.4-1
|
||||
- Update to 0.10.4.
|
||||
- Rebuild for GCC 4.7.0.
|
||||
|
||||
* Fri Dec 02 2011 Richard Shaw <hobbes1069@gmail.com> - 0.10.3-1
|
||||
- Build against TBB library.
|
||||
|
||||
* Sat Nov 05 2011 Richard Shaw <hobbes1069@gmail.com> - 0.10.3-1
|
||||
- Update to 0.10.3
|
||||
- Rebuild for libpng 1.5.
|
||||
- Fixed bulding against tbb library.
|
||||
|
||||
* Thu Aug 27 2011 Tom Callaway <spot@fedoraproject.org> - 0.10.2-1
|
||||
- Update to 0.10.2
|
||||
|
||||
* Thu Aug 04 2011 Richard Shaw <hobbes1069@gmail.com> - 0.10.1-2
|
||||
- New upstream release.
|
||||
- Fix private shared object provides with python library.
|
||||
|
||||
* Mon Jul 18 2011 Richard Shaw <hobbes1069@gmail.com> - 0.10.0-2
|
||||
- Disabled use of the TBB library.
|
||||
- Moved headers to named directory.
|
||||
|
||||
* Tue Jul 05 2011 Richard Shaw <hobbes1069@gmail.com> - 0.10.0-1
|
||||
- Inital Release.
|
||||
|
|
|
|||
|
|
@ -0,0 +1,16 @@
|
|||
diff -Naur oiio-Release-1.2.1.orig/src/include/thread.h oiio-Release-1.2.1/src/include/thread.h
|
||||
--- oiio-Release-1.2.1.orig/src/include/thread.h 2013-08-06 00:10:31.000000000 -0500
|
||||
+++ oiio-Release-1.2.1/src/include/thread.h 2013-08-28 14:29:19.730464642 -0500
|
||||
@@ -447,7 +447,12 @@
|
||||
|
||||
// Disallow copy construction by making private and unimplemented.
|
||||
atomic (atomic const &);
|
||||
+#if defined __arm__
|
||||
+} __attribute__((aligned(8)));
|
||||
+#else
|
||||
};
|
||||
+#endif
|
||||
+
|
||||
|
||||
|
||||
#endif /* ! USE_TBB_ATOMIC */
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
diff -Naur oiio-Release-1.2.2.orig/src/CMakeLists.txt oiio-Release-1.2.2/src/CMakeLists.txt
|
||||
--- oiio-Release-1.2.2.orig/src/CMakeLists.txt 2013-09-30 12:25:21.000000000 -0500
|
||||
+++ oiio-Release-1.2.2/src/CMakeLists.txt 2013-10-02 08:04:11.217616340 -0500
|
||||
@@ -396,9 +396,9 @@
|
||||
set (CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/doc/Description.txt")
|
||||
set (CPACK_PACKAGE_FILE_NAME OpenImageIO-${OIIO_VERSION_MAJOR}.${OIIO_VERSION_MINOR}.${OIIO_VERSION_PATCH}-${platform})
|
||||
#SET (CPACK_PACKAGE_INSTALL_DIRECTORY ${PROJECT_SOURCE_DIR}/..)
|
||||
-exec_program ("cmake -E copy ${PROJECT_SOURCE_DIR}/../LICENSE ${CMAKE_BINARY_DIR}/License.txt")
|
||||
+exec_program ("${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/../LICENSE ${CMAKE_BINARY_DIR}/License.txt")
|
||||
set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_BINARY_DIR}/License.txt")
|
||||
-exec_program ("cmake -E copy ${PROJECT_SOURCE_DIR}/../README.rst ${CMAKE_BINARY_DIR}/Readme.rst")
|
||||
+exec_program ("${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/../README.rst ${CMAKE_BINARY_DIR}/Readme.rst")
|
||||
set (CPACK_RESOURCE_FILE_README "${CMAKE_BINARY_DIR}/Readme.rst")
|
||||
set (CPACK_RESOURCE_FILE_WELCOME "${PROJECT_SOURCE_DIR}/doc/Welcome.txt")
|
||||
#SET (CPACK_STRIP_FILES Do we need this?)
|
||||
|
|
@ -0,0 +1,56 @@
|
|||
diff -Naur oiio-Release-1.2.1.orig/src/include/thread.h oiio-Release-1.2.1/src/include/thread.h
|
||||
--- oiio-Release-1.2.1.orig/src/include/thread.h 2013-08-06 00:10:31.000000000 -0500
|
||||
+++ oiio-Release-1.2.1/src/include/thread.h 2013-08-28 14:35:21.873905568 -0500
|
||||
@@ -112,8 +112,10 @@
|
||||
#endif
|
||||
|
||||
#if defined(__GNUC__) && (defined(_GLIBCXX_ATOMIC_BUILTINS) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 401))
|
||||
+#if !defined(__FreeBSD__) && !defined(__powerpc__) || defined(__x86_64__)
|
||||
#define USE_GCC_ATOMICS
|
||||
#endif
|
||||
+#endif
|
||||
|
||||
OIIO_NAMESPACE_ENTER
|
||||
{
|
||||
@@ -227,6 +229,11 @@
|
||||
#elif defined(_MSC_VER)
|
||||
// Windows
|
||||
return _InterlockedExchangeAdd ((volatile LONG *)at, x);
|
||||
+#elif defined (__powerpc__)
|
||||
+ long long r;
|
||||
+ r = *at;
|
||||
+ *at += x;
|
||||
+ return r;
|
||||
#else
|
||||
# error No atomics on this platform.
|
||||
#endif
|
||||
@@ -249,6 +256,11 @@
|
||||
# else
|
||||
return InterlockedExchangeAdd64 ((volatile LONGLONG *)at, x);
|
||||
# endif
|
||||
+#elif defined (__powerpc__)
|
||||
+ long long r;
|
||||
+ r = *at;
|
||||
+ *at += x;
|
||||
+ return r;
|
||||
#else
|
||||
# error No atomics on this platform.
|
||||
#endif
|
||||
@@ -272,6 +284,8 @@
|
||||
return a->compare_and_swap (newval, compareval) == newval;
|
||||
#elif defined(_MSC_VER)
|
||||
return (_InterlockedCompareExchange ((volatile LONG *)at, newval, compareval) == compareval);
|
||||
+#elif defined(__powerpc__)
|
||||
+ return ((*at == compareval) ? (*at = newval), 1 : 0);
|
||||
#else
|
||||
# error No atomics on this platform.
|
||||
#endif
|
||||
@@ -289,6 +303,8 @@
|
||||
return a->compare_and_swap (newval, compareval) == newval;
|
||||
#elif defined(_MSC_VER)
|
||||
return (_InterlockedCompareExchange64 ((volatile LONGLONG *)at, newval, compareval) == compareval);
|
||||
+#elif defined(__PPC__)
|
||||
+ return ((*at == compareval) ? (*at = newval), 1 : 0);
|
||||
#else
|
||||
# error No atomics on this platform.
|
||||
#endif
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
diff -up oiio-Release-1.1.10/src/include/thread.h.s390 oiio-Release-1.1.10/src/include/thread.h
|
||||
--- oiio-Release-1.1.10/src/include/thread.h.s390 2013-05-20 11:23:40.000000000 +0200
|
||||
+++ oiio-Release-1.1.10/src/include/thread.h 2013-05-20 11:24:06.000000000 +0200
|
||||
@@ -326,7 +326,7 @@ pause (int delay)
|
||||
{
|
||||
#if defined(__GNUC__)
|
||||
for (int i = 0; i < delay; ++i) {
|
||||
-#if defined __arm__
|
||||
+#if defined __arm__ || defined __s390__
|
||||
__asm__ __volatile__("NOP;");
|
||||
#else
|
||||
__asm__ __volatile__("pause;");
|
||||
Loading…
Reference in New Issue