Compare commits
14 Commits
| Author | SHA1 | Date |
|---|---|---|
Richard M. Shaw
|
f3ad525a84 | |
|
Richard M. Shaw
|
a8b400e557 | |
|
Richard M. Shaw
|
ace164b823 | |
|
Richard M. Shaw
|
7625d70cd1 | |
|
Richard M. Shaw
|
7d30ff8a52 | |
Dan Horák
|
99bc46da02 | |
|
Dan Horák
|
1adb0b9650 | |
|
Richard M. Shaw
|
70dc38e479 | |
|
Richard M. Shaw
|
0a89d6f3fa | |
|
Richard M. Shaw
|
253dc1531d | |
|
Richard M. Shaw
|
b492f88948 | |
|
Richard M. Shaw
|
c9a0b1cb4d | |
|
Richard M. Shaw
|
d928445b81 | |
|
Richard M. Shaw
|
b27abd9077 |
|
|
@ -3,3 +3,4 @@
|
|||
/OpenImageIO-oiio-Release-0.10.2-0-g7a6cba8.tar.gz
|
||||
/OpenImageIO-oiio-Release-0.10.3-0-ge93cd33.tar.gz
|
||||
/OpenImageIO-oiio-Release-0.10.4-0-gad1950d.tar.gz
|
||||
/OpenImageIO-oiio-Release-0.10.8-0-g1e37127.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,11 +0,0 @@
|
|||
diff -Naur OpenImageIO-oiio-7b7590f.orig/src/include/strutil.h OpenImageIO-oiio-7b7590f/src/include/strutil.h
|
||||
--- OpenImageIO-oiio-7b7590f.orig/src/include/strutil.h 2011-11-20 09:23:48.000000000 -0600
|
||||
+++ OpenImageIO-oiio-7b7590f/src/include/strutil.h 2012-01-05 14:30:34.015046609 -0600
|
||||
@@ -44,6 +44,7 @@
|
||||
#include <string>
|
||||
#include <cstring>
|
||||
#include <map>
|
||||
+#include <unistd.h>
|
||||
|
||||
#include "export.h"
|
||||
#include "version.h"
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
diff -up OpenImageIO-oiio-7b7590f/src/cmake/externalpackages.cmake.tbb-1 OpenImageIO-oiio-7b7590f/src/cmake/externalpackages.cmake
|
||||
--- OpenImageIO-oiio-7b7590f/src/cmake/externalpackages.cmake.tbb-1 2012-04-09 11:19:51.000000000 +0200
|
||||
+++ OpenImageIO-oiio-7b7590f/src/cmake/externalpackages.cmake 2012-04-09 11:20:06.000000000 +0200
|
||||
@@ -256,6 +256,7 @@ endif()
|
||||
# allow this to be overridden to use the distro-provided package if desired.
|
||||
#
|
||||
# Try to find it first and fall back to built-in if not available.
|
||||
+if (USE_TBB)
|
||||
find_package (TBB REQUIRED)
|
||||
if (TBB_FOUND)
|
||||
set (USE_EXTERNAL_TBB TRUE CACHE BOOL
|
||||
@@ -266,5 +267,6 @@ if (TBB_FOUND)
|
||||
# TBB is found, and not the one in OIIO's include directory.
|
||||
include_directories (BEFORE ${TBB_INCLUDE_DIR})
|
||||
endif()
|
||||
+endif()
|
||||
|
||||
###########################################################################
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
%global githash1 gad1950d
|
||||
%global githash2 7b7590f
|
||||
%global githash1 g1e37127
|
||||
%global githash2 1fa4a20
|
||||
|
||||
Name: OpenImageIO
|
||||
Version: 0.10.4
|
||||
Release: 3%{?dist}
|
||||
Version: 0.10.8
|
||||
Release: 1%{?dist}
|
||||
Summary: Library for reading and writing images
|
||||
|
||||
Group: Development/Libraries
|
||||
|
|
@ -17,17 +17,18 @@ Patch0: OpenImageIO-0.10.2-git_backports.patch
|
|||
Patch1: OpenImageIO-0.10.0-atomic_test_fix.patch
|
||||
Patch2: OpenImageIO-0.10.3-use_external_tbb.patch
|
||||
Patch3: OpenImageIO-0.10.2-Z_BEST_COMPRESSION.patch
|
||||
Patch4: OpenImageIO-0.10.4-gcc47_unistd_h.fix
|
||||
Patch4: OpenImageIO-0.10.4-no_tbb.patch
|
||||
|
||||
BuildRequires: boost-devel glew-devel qt-devel OpenEXR-devel ilmbase-devel
|
||||
BuildRequires: cmake
|
||||
BuildRequires: boost-devel glew-devel OpenEXR-devel ilmbase-devel
|
||||
BuildRequires: qt4-devel
|
||||
BuildRequires: python2-devel txt2man
|
||||
BuildRequires: libpng-devel libtiff-devel
|
||||
BuildRequires: zlib-devel jasper-devel
|
||||
BuildRequires: pugixml-devel
|
||||
%ifarch %{ix86} x86_64 ia64
|
||||
BuildRequires: tbb-devel
|
||||
# Field3D support is not considered stable at this time and no package
|
||||
# currently exists for Fedora. Re-enable when fixed.
|
||||
# Field3D Review Request: https://bugzilla.redhat.com/show_bug.cgi?id=753453
|
||||
%endif
|
||||
BuildRequires: hdf5-devel Field3D-devel
|
||||
|
||||
# We don't want to provide private python extension libs
|
||||
|
|
@ -66,7 +67,7 @@ Development files for package %{name}
|
|||
%patch1 -p1 -b .atomic
|
||||
%patch2 -p1 -b .tbb
|
||||
%patch3 -p1 -b .zlib
|
||||
%patch4 -p1 -b .gcc47
|
||||
%patch4 -p1 -b .no-tbb
|
||||
|
||||
# Remove bundled pugixml
|
||||
rm -f src/include/pugixml.hpp \
|
||||
|
|
@ -89,7 +90,11 @@ pushd build
|
|||
-DPYLIB_INSTALL_DIR:PATH=%{python_sitearch} \
|
||||
-DINSTALL_DOCS:BOOL=FALSE \
|
||||
-DUSE_EXTERNAL_PUGIXML:BOOL=TRUE \
|
||||
%ifarch %{ix86} x86_64 ia64
|
||||
-DUSE_TBB:BOOL=TRUE \
|
||||
%else
|
||||
-DUSE_TBB:BOOL=FALSE \
|
||||
%endif
|
||||
../src
|
||||
|
||||
make %{?_smp_mflags}
|
||||
|
|
@ -109,6 +114,7 @@ cp -a doc/*.1 %{buildroot}%{_mandir}/man1
|
|||
|
||||
|
||||
%check
|
||||
# Not all unit tests expected to pass.
|
||||
#pushd build && make test
|
||||
|
||||
|
||||
|
|
@ -126,6 +132,15 @@ cp -a doc/*.1 %{buildroot}%{_mandir}/man1
|
|||
|
||||
|
||||
%changelog
|
||||
* Thu Apr 19 2012 Richard Shaw <hobbes1069@gmail.com> - 0.10.8-1
|
||||
- Update to latest upstream release.
|
||||
|
||||
* Mon Apr 09 2012 Dan Horák <dan[at]danny.cz> - 0.10.4-6
|
||||
- fix build without TBB
|
||||
|
||||
* Mon Mar 12 2012 Richard Shaw <hobbes1069@gmail.com> - 0.10.4-5
|
||||
- Rebuild for updated Field3D.
|
||||
|
||||
* Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10.4-3
|
||||
- Rebuilt for c++ ABI breakage
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue