Update to latest upstream release.

This commit is contained in:
Richard M. Shaw 2012-04-19 13:54:11 -05:00
parent 1adb0b9650
commit 7d30ff8a52
4 changed files with 12 additions and 20 deletions

1
.gitignore vendored
View File

@ -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

View File

@ -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"

View File

@ -1,9 +1,9 @@
%global githash1 gad1950d
%global githash2 7b7590f
%global githash1 g1e37127
%global githash2 1fa4a20
Name: OpenImageIO
Version: 0.10.4
Release: 6%{?dist}
Version: 0.10.8
Release: 1%{?dist}
Summary: Library for reading and writing images
Group: Development/Libraries
@ -17,8 +17,7 @@ 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
Patch5: OpenImageIO-0.10.4-no_tbb.patch
Patch4: OpenImageIO-0.10.4-no_tbb.patch
BuildRequires: boost-devel glew-devel qt-devel OpenEXR-devel ilmbase-devel
BuildRequires: python2-devel txt2man
@ -66,8 +65,7 @@ Development files for package %{name}
%patch1 -p1 -b .atomic
%patch2 -p1 -b .tbb
%patch3 -p1 -b .zlib
%patch4 -p1 -b .gcc47
%patch5 -p1 -b .no-tbb
%patch4 -p1 -b .no-tbb
# Remove bundled pugixml
rm -f src/include/pugixml.hpp \
@ -114,6 +112,7 @@ cp -a doc/*.1 %{buildroot}%{_mandir}/man1
%check
# Not all unit tests expected to pass.
#pushd build && make test
@ -131,6 +130,9 @@ 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

View File

@ -1 +1 @@
08a1bc2b82862ad5547bba569f4f633f OpenImageIO-oiio-Release-0.10.4-0-gad1950d.tar.gz
0c52da04fad3333f22433bd5d52cd134 OpenImageIO-oiio-Release-0.10.8-0-g1e37127.tar.gz