Update to latest upstream release.
This commit is contained in:
parent
03f12708cc
commit
33da6d42b2
1
.gitignore
vendored
1
.gitignore
vendored
@ -37,3 +37,4 @@ clog
|
||||
/OpenImageIO-1.5.22.tar.gz
|
||||
/OpenImageIO-1.6.8.tar.gz
|
||||
/OpenImageIO-1.6.9.tar.gz
|
||||
/OpenImageIO-1.6.10.tar.gz
|
||||
|
24
OpenImageIO-gcc6_placement-new.patch
Normal file
24
OpenImageIO-gcc6_placement-new.patch
Normal file
@ -0,0 +1,24 @@
|
||||
From f0220c1134a7f565cfd9e2a763d4e723adc0b211 Mon Sep 17 00:00:00 2001
|
||||
From: Larry Gritz <lg@larrygritz.com>
|
||||
Date: Wed, 3 Feb 2016 11:45:59 -0800
|
||||
Subject: [PATCH] Suppress warning/error in pugi for gcc6
|
||||
|
||||
---
|
||||
src/libOpenImageIO/CMakeLists.txt | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/src/libOpenImageIO/CMakeLists.txt b/src/libOpenImageIO/CMakeLists.txt
|
||||
index 6994dfd..fd6e4d1 100644
|
||||
--- a/src/libOpenImageIO/CMakeLists.txt
|
||||
+++ b/src/libOpenImageIO/CMakeLists.txt
|
||||
@@ -13,6 +13,10 @@ if (NOT USE_EXTERNAL_PUGIXML)
|
||||
../include/OpenImageIO/pugixml.hpp
|
||||
../include/OpenImageIO/pugixml.cpp
|
||||
)
|
||||
+ if (CMAKE_COMPILER_IS_GNUCC AND NOT ${GCC_VERSION} VERSION_LESS 6.0)
|
||||
+ set_source_files_properties (formatspec.cpp xmp.cpp
|
||||
+ PROPERTIES COMPILE_FLAGS -Wno-error=placement-new)
|
||||
+ endif ()
|
||||
endif()
|
||||
|
||||
set (libOpenImageIO_srcs deepdata.cpp exif.cpp formatspec.cpp imagebuf.cpp
|
@ -2,8 +2,8 @@
|
||||
#global beta beta1
|
||||
|
||||
Name: OpenImageIO
|
||||
Version: 1.6.9
|
||||
Release: 4%{?dist}
|
||||
Version: 1.6.10
|
||||
Release: 1%{?dist}
|
||||
Summary: Library for reading and writing images
|
||||
|
||||
Group: Development/Libraries
|
||||
@ -14,6 +14,8 @@ Source0: https://github.com/%{name}/%{subname}/archive/Release-%{version}
|
||||
# Images for test suite
|
||||
#Source1: oiio-images.tar.gz
|
||||
|
||||
Patch0: OpenImageIO-gcc6_placement-new.patch
|
||||
|
||||
BuildRequires: cmake
|
||||
BuildRequires: txt2man
|
||||
BuildRequires: qt4-devel
|
||||
@ -95,6 +97,7 @@ Development files for package %{name}
|
||||
|
||||
%prep
|
||||
%setup -q -n oiio-Release-%{version}
|
||||
%patch0 -p1
|
||||
|
||||
# Remove bundled pugixml
|
||||
rm -f src/include/pugixml.hpp \
|
||||
@ -176,6 +179,9 @@ cp -a src/doc/*.1 %{buildroot}%{_mandir}/man1
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon 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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user