Compare commits

...

120 Commits
f20 ... master

Author SHA1 Message Date
Richard Shaw 47f6927865 Fix conditional to > rather than >=. 2018-06-02 07:23:56 -05:00
Richard Shaw 9a215610da Add conditional for BR: python or python2 based on Fedora release. 2018-06-02 07:14:46 -05:00
Richard Shaw 0c89449a0e Add boost-python2-devel and build dependency. 2018-06-01 07:48:06 -05:00
Richard Shaw 53c00d21bf Update to 1.8.12. 2018-06-01 07:33:11 -05:00
Richard Shaw eedcd8de57 Update to 1.8.10. 2018-04-01 20:03:41 -05:00
Adam Williamson dd39d24f59 Rebuild for opencv 3.4.1 2018-03-02 10:29:49 -08:00
Richard Shaw d7bdc6ede3 Update to 1.8.9 2018-03-01 14:30:19 -06:00
Richard Shaw 90e880c8a4 Add variable for soversion to prevent accidental soname updates. 2018-02-27 09:01:05 -06:00
Peter Robinson 8122e401de rebuild 2018-02-23 11:00:05 +00:00
Sandro Mani 91369ed97b Rebuild (giflib) 2018-02-13 12:45:11 +01:00
Richard Shaw 93d5aa4d3a Fix release. 2018-02-11 07:34:37 -06:00
Richard Shaw dd2097c451 Remove unneeded patches. 2018-02-11 07:32:57 -06:00
Richard Shaw df93839ee8 Merge branch 'master' of ssh://pkgs.fedoraproject.org/rpms/OpenImageIO 2018-02-11 07:31:49 -06:00
Richard Shaw 22a6838b79 Update to 1.8.8. 2018-02-11 07:31:35 -06:00
Fedora Release Engineering c9fda34d14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-07 00:53:04 +00:00
Richard Shaw b73085a7de Update to 1.8.8. 2018-02-01 20:44:29 -06:00
Richard Shaw b74dc29235 Add openjpeg2 to build dependencies.
Re-enable dcmtk for 32bit arches.
2018-01-18 12:39:55 -06:00
Richard Shaw fec3e2023e Rebuild for OpenColorIO 1.1.0. 2018-01-13 08:14:12 -06:00
Richard Shaw a6324edf57 Update to latest upstream release.
Disable building with dcmtk until fixed, see:
  https://github.com/OpenImageIO/oiio/issues/1841
2018-01-07 08:11:17 -06:00
Richard Shaw 8133348e0b Add patch for arm to use GLES. 2017-12-19 08:02:20 -06:00
Richard Shaw 85af7b25c3 Update patches to build man pages. 2017-11-03 10:30:08 -05:00
Richard Shaw 4b19846297 Enable build docs cmake option for man page. 2017-11-02 12:21:08 -05:00
Richard Shaw 1eed71fda6 Qt5 is now required. 2017-11-02 11:09:26 -05:00
Richard Shaw c4daba7506 Comment out uninit patch. 2017-11-02 10:06:04 -05:00
Richard Shaw cb417efd83 Upload new sources. 2017-11-02 09:26:06 -05:00
Richard Shaw d964540e5b Update to latest upstream release. 2017-11-02 09:00:53 -05:00
Richard Shaw 909e940a7a Add patch to remove opencv qt5 dependency. 2017-09-04 09:51:41 -05:00
Richard Shaw d69a60c059 Update to latest upstream release. 2017-09-02 10:52:20 -05:00
Zbigniew Jędrzejewski-Szmek e603759505 Python 2 binary package renamed to python2-openimageio 2017-08-19 09:39:03 -04:00
Fedora Release Engineering 83a39861c7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild 2017-08-02 17:04:08 +00:00
Fedora Release Engineering 650ad63c72 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-26 01:59:09 +00:00
Kalev Lember 6be3e74d06 Rebuilt for Boost 1.64 2017-07-21 15:41:00 +02:00
Igor Gnatenko 6d0b591c7f Rebuild due to bug in RPM (RHBZ #1468476)
Signed-off-by: Igor Gnatenko <ignatenko@redhat.com>
2017-07-07 12:25:08 +02:00
Richard Shaw 879e4ef9b9 Update to latest upstream relesae. 2017-06-02 09:33:44 -05:00
Richard Shaw 889b15c2cb Update to latest upstream release. 2017-05-02 08:16:21 -05:00
Richard Shaw 6811d4e225 Update to latest upstream release. 2017-04-03 06:01:21 -05:00
Richard Shaw e4567a729b Update to latest upstream release. 2017-03-04 09:00:41 -06:00
Richard Shaw 79e7f981ce Switch to autosetup. 2017-02-19 09:52:00 -06:00
Richard Shaw 1d9506e37a Update to latest upstream release.
Add patch per RHBZ#1412089 to prevent pulling in Qt5.
2017-02-19 09:37:46 -06:00
Richard Shaw e1ef02bbf4 Disable -Werror (Fix F26FTBFS, RHBZ#1424580).
Force USE_CPP14 on fedora >=26.
Prevent CMakeList.txt from overiding -std=...
2017-02-19 07:41:03 -06:00
Richard Shaw c20da682a5 Don't make warning errors for now, see RHBZ#1424580. 2017-02-19 07:27:25 -06:00
Richard Shaw 0e9c2ece7f Rebuild for boost 1.63 2017-02-16 21:14:56 -06:00
Fedora Release Engineering e3753e28d8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild 2017-02-10 05:16:38 +00:00
Sandro Mani 82fb5de71b Rebuild (libwebp) 2017-02-01 19:27:12 +01:00
Richard Shaw dca044c1d8 Fix patch. 2017-01-04 13:30:10 -06:00
Richard Shaw 2bf5380797 Fix arch/optimizer specific problem with uninitialized variables. 2017-01-04 13:16:28 -06:00
Richard Shaw 667a749e2f New patch for man page generation. 2017-01-04 10:20:30 -06:00
Richard Shaw cabde45fd9 Update to latest upstream release.
Fixes FTBFS on aarch64 (BZ#1408883).
2017-01-04 10:20:09 -06:00
Jon Ciesla 9295e10bb8 Rebuild for new LibRaw. 2016-12-27 17:14:58 -06:00
Richard Shaw 30404afa86 Update to latest upstream release. 2016-12-02 07:47:36 -06:00
Richard M. Shaw 22a6e6ac9e Add patch for failing i686 build. 2016-10-03 10:52:10 -05:00
Richard M. Shaw 45c2a19184 Update to latest upstream release. 2016-10-02 16:14:55 -05:00
Richard M. Shaw efd57a3d89 Update to latest upstream release. 2016-08-03 10:14:24 -05:00
Fedora Release Engineering fd656a333d - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages 2016-07-19 06:24:20 +00:00
Richard M. Shaw 45f76548cf Update to latest upstream release. 2016-07-01 14:22:56 -05:00
Richard M. Shaw 889415c17d Update to latest upstream release. 2016-06-01 21:44:49 -05:00
Richard M. Shaw cdc5b48a9b Update to latest upstream release.
- Change from openjpeg to libjpeg-turbo.
2016-05-02 09:18:49 -05:00
Richard M. Shaw 7f89810f2d Work around build failure due to OpenCV 3.1. 2016-04-27 10:44:35 -05:00
Orion Poplawski bce3e0a85f Rebuild for OpenCV 3.1 2016-04-26 15:13:32 -06:00
Richard M. Shaw b7c6788718 Rebuild for updated Field3D. 2016-04-11 13:41:58 -05:00
Richard M. Shaw a03ab4cd61 Update to latest upstream release. 2016-04-01 10:08:51 -05:00
Richard M. Shaw 727ab2e1cc Update to latest upstream release. 2016-03-01 22:01:49 -06:00
Richard M. Shaw 9404230670 Additional patch for gcc warning. 2016-02-04 13:08:59 -06:00
Richard M. Shaw e5a7404938 Updated patch from upstream for gcc 6 and proper removal of bundled pugixml (location moved). 2016-02-03 16:27:04 -06:00
Richard M. Shaw 84222710b9 Fix changelog date. 2016-02-03 14:36:48 -06:00
Richard M. Shaw 33da6d42b2 Update to latest upstream release. 2016-02-03 14:35:31 -06:00
Dennis Gilmore 03f12708cc - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild 2016-02-03 15:33:56 +00:00
Orion Poplawski 83f960ef94 Rebuild for hdf5 1.8.16 2016-01-21 12:02:08 -07:00
Adam Jackson 9e863a356a Rebuild for glew 1.13 2016-01-14 13:09:57 -05:00
Richard M. Shaw 1471e40664 Update to latest upstream release. 2016-01-14 10:50:05 -06:00
Richard M. Shaw ba2d3e7a4b Rebuilt for libwebp soname bump
- Use openssl, fixes BZ#1294602.
2016-01-04 12:53:40 -06:00
Richard M. Shaw 2282056cf1 Merge branch 'master' of ssh://pkgs.fedoraproject.org/OpenImageIO 2016-01-04 12:52:30 -06:00
Richard M. Shaw f1580b7c7b Update to latest upstream release.
- Use openssl, fixes BZ#1294602.
2016-01-04 12:51:19 -06:00
Igor Gnatenko f825291fcb Rebuilt for libwebp soname bump
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
2015-12-28 15:24:06 +01:00
Richard M. Shaw 631720a34f Update to latest upstream release. 2015-12-25 09:38:21 -06:00
Richard M. Shaw 3392bf15b8 Update to latest upstream release.
- Add LibRaw to build requirements.
2015-12-17 08:07:55 -06:00
Richard M. Shaw 38a533e6c3 Minor bump to build python binding subpackage. 2015-12-02 12:52:54 -06:00
Richard M. Shaw b9ab72ae78 Update to latest upstream release.
- Move python bindings to their own subpackage.
2015-12-02 12:47:03 -06:00
Richard M. Shaw b9f52c958c Update to latest upstream release. 2015-12-02 09:29:04 -06:00
Richard M. Shaw 9ec49ce506 Rebuild for updated pugixml. 2015-10-22 11:01:53 -05:00
Richard M. Shaw fb70ce3e45 Update to latest upstream release. 2015-09-28 21:44:40 -05:00
Jonathan Wakely 3b4218272c Rebuilt for Boost 1.59 2015-08-27 21:16:30 +01:00
Jonathan Wakely 2ece3f9d4e Rebuilt for Boost 1.58 2015-08-05 19:18:32 +01:00
Richard M. Shaw da73048fe1 Update to latest upstream release. 2015-08-04 21:36:22 -05:00
Dennis Gilmore 08e8021036 - Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 2015-07-29 11:53:58 -05:00
David Tardon 78e6414b55 rebuild for Boost 1.58 2015-07-22 17:59:09 +02:00
Richard M. Shaw 7099dddcdf Update to latest upstream release. 2015-07-16 13:54:59 -05:00
Dennis Gilmore 87413e5f1e - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild 2015-06-16 23:01:46 +00:00
Orion Poplawski 6197590ed1 Rebuild for hdf5 1.8.15 2015-05-17 15:04:10 -06:00
Kalev Lember c73bc32aa8 Rebuilt for GCC 5 C++11 ABI change 2015-05-02 16:28:10 +02:00
Richard M. Shaw 9af8883a18 Update to latest upstream release. 2015-04-15 11:16:33 -05:00
Richard M. Shaw 8bb2b043d3 Fix source archive. 2015-03-12 08:49:17 -05:00
Richard M. Shaw a37eb4a371 Update to latest upstream release. 2015-03-11 21:10:49 -05:00
Orion Poplawski fde9b06bbc Rebuild for undefined symbols 2015-02-21 15:48:27 -07:00
Richard M. Shaw 49aa456302 Update to latest upstream release.
- Add opencv optional dependency.
- Use new license rpmbuild macro.
- Fix broken conditional which prevented Field3D from being required.
2015-02-12 14:28:57 -06:00
Richard M. Shaw fd7f923d09 Update to latest upstream release.
- Add opencv optional dependency.
- Use new license rpmbuild macro.
2015-02-12 09:20:48 -06:00
Richard M. Shaw ae9c86a2ed Add missing patch. 2015-02-12 07:13:45 -06:00
Richard M. Shaw 2c535ff852 Rebuild for Field3D. 2015-02-11 22:25:23 -06:00
Petr Machata 4646c873a9 Bump for rebuild. 2015-02-04 14:08:04 +01:00
Richard M. Shaw fa5af9455d Release 1.5.11 (January 28, 2015) -- compared to 1.5.10)
----------------------------------------------
* Fix build breaks for very old versions of Ilmbase (1.6 and earlier)
  that lack a definition of V4f used by our simd.h. #1048
* Fix signed/unsigned warning on 32 bit platforms in jpeginput.cpp. #1049
2015-01-28 12:34:28 -06:00
Richard M. Shaw 9ea7411614 Add patch for jpegouput.cpp error on i686. 2015-01-27 14:18:19 -06:00
Richard M. Shaw 1013dfc10c Update to latest upstream release. 2015-01-27 11:33:20 -06:00
Petr Machata 51a57dcebb Rebuild for boost 1.57.0 2015-01-27 18:00:54 +01:00
Richard M. Shaw 9e58345a6a Update to latest upstream release. 2015-01-22 08:22:05 -06:00
Rex Dieter 2d1578a1a0 rebuild (openexr) 2014-11-26 08:57:20 -06:00
Richard M. Shaw a476e32171 Update to latest upstream release. 2014-11-25 07:55:32 -06:00
Richard M. Shaw c37941e1b9 Update to latest upstream release. 2014-11-14 08:42:44 -06:00
Richard M. Shaw dd68cd19a8 Rebuild for Field3D 1.4.3. 2014-09-05 09:48:03 -05:00
Orion Poplawski 338ba88410 Rebuild for pugixml 1.4 2014-09-04 09:46:34 -06:00
Peter Robinson dc67a32f96 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild 2014-08-15 18:57:58 +00:00
Richard M. Shaw 8dcfcd472d Update to latest upstream release. 2014-08-01 08:44:48 -05:00
Dennis Gilmore c0f199bf19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild 2014-06-06 17:58:45 -05:00
Petr Machata ce55f908d3 Rebuild for boost 1.55.0 2014-05-23 12:29:53 +02:00
David Tardon ff65debcf5 rebuild for boost 1.55.0 2014-05-23 11:41:12 +02:00
Richard M. Shaw 3e5a623021 Try patch for compile warnings. 2014-05-20 17:36:17 -05:00
Richard M. Shaw 054dab7866 Update to latest upstream release. 2014-05-20 15:28:54 -05:00
Richard M. Shaw fee5a3bd2e Update cmake conditionals for epel7. 2014-05-20 13:42:30 -05:00
Richard M. Shaw 15295a76d9 Add new patch. 2014-01-13 08:54:58 -06:00
Richard M. Shaw 30232adcf9 Spec cleanup. 2014-01-13 08:35:31 -06:00
Richard M. Shaw 92eeec47a4 Update to latest upstream release.
- Add libgif as build requirement.
2014-01-09 10:25:29 -06:00
10 changed files with 192 additions and 660 deletions

41
.gitignore vendored
View File

@ -19,3 +19,44 @@ 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

View File

@ -1,283 +0,0 @@
# Locate Intel Threading Building Blocks include paths and libraries
# FindTBB.cmake can be found at https://code.google.com/p/findtbb/
# Written by Hannes Hofmann <hannes.hofmann _at_ informatik.uni-erlangen.de>
# Improvements by Gino van den Bergen <gino _at_ dtecta.com>,
# Florian Uhlig <F.Uhlig _at_ gsi.de>,
# Jiri Marsik <jiri.marsik89 _at_ gmail.com>
# The MIT License
#
# Copyright (c) 2011 Hannes Hofmann
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
# GvdB: This module uses the environment variable TBB_ARCH_PLATFORM which defines architecture and compiler.
# e.g. "ia32/vc8" or "em64t/cc4.1.0_libc2.4_kernel2.6.16.21"
# TBB_ARCH_PLATFORM is set by the build script tbbvars[.bat|.sh|.csh], which can be found
# in the TBB installation directory (TBB_INSTALL_DIR).
#
# GvdB: Mac OS X distribution places libraries directly in lib directory.
#
# For backwards compatibility, you may explicitely set the CMake variables TBB_ARCHITECTURE and TBB_COMPILER.
# TBB_ARCHITECTURE [ ia32 | em64t | itanium ]
# which architecture to use
# TBB_COMPILER e.g. vc9 or cc3.2.3_libc2.3.2_kernel2.4.21 or cc4.0.1_os10.4.9
# which compiler to use (detected automatically on Windows)
# This module respects
# TBB_INSTALL_DIR or $ENV{TBB21_INSTALL_DIR} or $ENV{TBB_INSTALL_DIR}
# This module defines
# TBB_INCLUDE_DIRS, where to find task_scheduler_init.h, etc.
# TBB_LIBRARY_DIRS, where to find libtbb, libtbbmalloc
# TBB_DEBUG_LIBRARY_DIRS, where to find libtbb_debug, libtbbmalloc_debug
# TBB_INSTALL_DIR, the base TBB install directory
# TBB_LIBRARIES, the libraries to link against to use TBB.
# TBB_DEBUG_LIBRARIES, the libraries to link against to use TBB with debug symbols.
# TBB_FOUND, If false, don't try to use TBB.
# TBB_INTERFACE_VERSION, as defined in tbb/tbb_stddef.h
if (WIN32)
# has em64t/vc8 em64t/vc9
# has ia32/vc7.1 ia32/vc8 ia32/vc9
set(_TBB_DEFAULT_INSTALL_DIR "C:/Program Files/Intel/TBB" "C:/Program Files (x86)/Intel/TBB")
set(_TBB_LIB_NAME "tbb")
set(_TBB_LIB_MALLOC_NAME "${_TBB_LIB_NAME}malloc")
set(_TBB_LIB_DEBUG_NAME "${_TBB_LIB_NAME}_debug")
set(_TBB_LIB_MALLOC_DEBUG_NAME "${_TBB_LIB_MALLOC_NAME}_debug")
if (MSVC71)
set (_TBB_COMPILER "vc7.1")
endif(MSVC71)
if (MSVC80)
set(_TBB_COMPILER "vc8")
endif(MSVC80)
if (MSVC90)
set(_TBB_COMPILER "vc9")
endif(MSVC90)
if(MSVC10)
set(_TBB_COMPILER "vc10")
endif(MSVC10)
# Todo: add other Windows compilers such as ICL.
set(_TBB_ARCHITECTURE ${TBB_ARCHITECTURE})
endif (WIN32)
if (UNIX)
if (APPLE)
# MAC
set(_TBB_DEFAULT_INSTALL_DIR "/Library/Frameworks/Intel_TBB.framework/Versions")
# libs: libtbb.dylib, libtbbmalloc.dylib, *_debug
set(_TBB_LIB_NAME "tbb")
set(_TBB_LIB_MALLOC_NAME "${_TBB_LIB_NAME}malloc")
set(_TBB_LIB_DEBUG_NAME "${_TBB_LIB_NAME}_debug")
set(_TBB_LIB_MALLOC_DEBUG_NAME "${_TBB_LIB_MALLOC_NAME}_debug")
# default flavor on apple: ia32/cc4.0.1_os10.4.9
# Jiri: There is no reason to presume there is only one flavor and
# that user's setting of variables should be ignored.
if(NOT TBB_COMPILER)
set(_TBB_COMPILER "cc4.0.1_os10.4.9")
elseif (NOT TBB_COMPILER)
set(_TBB_COMPILER ${TBB_COMPILER})
endif(NOT TBB_COMPILER)
if(NOT TBB_ARCHITECTURE)
set(_TBB_ARCHITECTURE "ia32")
elseif(NOT TBB_ARCHITECTURE)
set(_TBB_ARCHITECTURE ${TBB_ARCHITECTURE})
endif(NOT TBB_ARCHITECTURE)
else (APPLE)
# LINUX
set(_TBB_DEFAULT_INSTALL_DIR "/opt/intel/tbb" "/usr/local/include" "/usr/include")
set(_TBB_LIB_NAME "tbb")
set(_TBB_LIB_MALLOC_NAME "${_TBB_LIB_NAME}malloc")
set(_TBB_LIB_DEBUG_NAME "${_TBB_LIB_NAME}_debug")
set(_TBB_LIB_MALLOC_DEBUG_NAME "${_TBB_LIB_MALLOC_NAME}_debug")
# has em64t/cc3.2.3_libc2.3.2_kernel2.4.21 em64t/cc3.3.3_libc2.3.3_kernel2.6.5 em64t/cc3.4.3_libc2.3.4_kernel2.6.9 em64t/cc4.1.0_libc2.4_kernel2.6.16.21
# has ia32/*
# has itanium/*
set(_TBB_COMPILER ${TBB_COMPILER})
set(_TBB_ARCHITECTURE ${TBB_ARCHITECTURE})
endif (APPLE)
endif (UNIX)
if (CMAKE_SYSTEM MATCHES "SunOS.*")
# SUN
# not yet supported
# has em64t/cc3.4.3_kernel5.10
# has ia32/*
endif (CMAKE_SYSTEM MATCHES "SunOS.*")
#-- Clear the public variables
set (TBB_FOUND "NO")
#-- Find TBB install dir and set ${_TBB_INSTALL_DIR} and cached ${TBB_INSTALL_DIR}
# first: use CMake variable TBB_INSTALL_DIR
if (TBB_INSTALL_DIR)
set (_TBB_INSTALL_DIR ${TBB_INSTALL_DIR})
endif (TBB_INSTALL_DIR)
# second: use environment variable
if (NOT _TBB_INSTALL_DIR)
if (NOT "$ENV{TBB_INSTALL_DIR}" STREQUAL "")
set (_TBB_INSTALL_DIR $ENV{TBB_INSTALL_DIR})
endif (NOT "$ENV{TBB_INSTALL_DIR}" STREQUAL "")
# Intel recommends setting TBB21_INSTALL_DIR
if (NOT "$ENV{TBB21_INSTALL_DIR}" STREQUAL "")
set (_TBB_INSTALL_DIR $ENV{TBB21_INSTALL_DIR})
endif (NOT "$ENV{TBB21_INSTALL_DIR}" STREQUAL "")
if (NOT "$ENV{TBB22_INSTALL_DIR}" STREQUAL "")
set (_TBB_INSTALL_DIR $ENV{TBB22_INSTALL_DIR})
endif (NOT "$ENV{TBB22_INSTALL_DIR}" STREQUAL "")
if (NOT "$ENV{TBB30_INSTALL_DIR}" STREQUAL "")
set (_TBB_INSTALL_DIR $ENV{TBB30_INSTALL_DIR})
endif (NOT "$ENV{TBB30_INSTALL_DIR}" STREQUAL "")
endif (NOT _TBB_INSTALL_DIR)
# third: try to find path automatically
if (NOT _TBB_INSTALL_DIR)
if (_TBB_DEFAULT_INSTALL_DIR)
set (_TBB_INSTALL_DIR ${_TBB_DEFAULT_INSTALL_DIR})
endif (_TBB_DEFAULT_INSTALL_DIR)
endif (NOT _TBB_INSTALL_DIR)
# sanity check
if (NOT _TBB_INSTALL_DIR)
message ("ERROR: Unable to find Intel TBB install directory. ${_TBB_INSTALL_DIR}")
else (NOT _TBB_INSTALL_DIR)
# finally: set the cached CMake variable TBB_INSTALL_DIR
if (NOT TBB_INSTALL_DIR)
set (TBB_INSTALL_DIR ${_TBB_INSTALL_DIR} CACHE PATH "Intel TBB install directory")
mark_as_advanced(TBB_INSTALL_DIR)
endif (NOT TBB_INSTALL_DIR)
#-- A macro to rewrite the paths of the library. This is necessary, because
# find_library() always found the em64t/vc9 version of the TBB libs
macro(TBB_CORRECT_LIB_DIR var_name)
# if (NOT "${_TBB_ARCHITECTURE}" STREQUAL "em64t")
string(REPLACE em64t "${_TBB_ARCHITECTURE}" ${var_name} ${${var_name}})
# endif (NOT "${_TBB_ARCHITECTURE}" STREQUAL "em64t")
string(REPLACE ia32 "${_TBB_ARCHITECTURE}" ${var_name} ${${var_name}})
string(REPLACE vc7.1 "${_TBB_COMPILER}" ${var_name} ${${var_name}})
string(REPLACE vc8 "${_TBB_COMPILER}" ${var_name} ${${var_name}})
string(REPLACE vc9 "${_TBB_COMPILER}" ${var_name} ${${var_name}})
string(REPLACE vc10 "${_TBB_COMPILER}" ${var_name} ${${var_name}})
endmacro(TBB_CORRECT_LIB_DIR var_content)
#-- Look for include directory and set ${TBB_INCLUDE_DIR}
set (TBB_INC_SEARCH_DIR ${_TBB_INSTALL_DIR}/include)
# Jiri: tbbvars now sets the CPATH environment variable to the directory
# containing the headers.
find_path(TBB_INCLUDE_DIR
tbb/task_scheduler_init.h
PATHS ${TBB_INC_SEARCH_DIR} ENV CPATH
)
mark_as_advanced(TBB_INCLUDE_DIR)
#-- Look for libraries
# GvdB: $ENV{TBB_ARCH_PLATFORM} is set by the build script tbbvars[.bat|.sh|.csh]
if (NOT $ENV{TBB_ARCH_PLATFORM} STREQUAL "")
set (_TBB_LIBRARY_DIR
${_TBB_INSTALL_DIR}/lib/$ENV{TBB_ARCH_PLATFORM}
${_TBB_INSTALL_DIR}/$ENV{TBB_ARCH_PLATFORM}/lib
)
endif (NOT $ENV{TBB_ARCH_PLATFORM} STREQUAL "")
# Jiri: This block isn't mutually exclusive with the previous one
# (hence no else), instead I test if the user really specified
# the variables in question.
if ((NOT ${TBB_ARCHITECTURE} STREQUAL "") AND (NOT ${TBB_COMPILER} STREQUAL ""))
# HH: deprecated
message(STATUS "[Warning] FindTBB.cmake: The use of TBB_ARCHITECTURE and TBB_COMPILER is deprecated and may not be supported in future versions. Please set \$ENV{TBB_ARCH_PLATFORM} (using tbbvars.[bat|csh|sh]).")
# Jiri: It doesn't hurt to look in more places, so I store the hints from
# ENV{TBB_ARCH_PLATFORM} and the TBB_ARCHITECTURE and TBB_COMPILER
# variables and search them both.
set (_TBB_LIBRARY_DIR "${_TBB_INSTALL_DIR}/${_TBB_ARCHITECTURE}/${_TBB_COMPILER}/lib" ${_TBB_LIBRARY_DIR})
endif ((NOT ${TBB_ARCHITECTURE} STREQUAL "") AND (NOT ${TBB_COMPILER} STREQUAL ""))
# GvdB: Mac OS X distribution places libraries directly in lib directory.
list(APPEND _TBB_LIBRARY_DIR ${_TBB_INSTALL_DIR}/lib)
# Jiri: No reason not to check the default paths. From recent versions,
# tbbvars has started exporting the LIBRARY_PATH and LD_LIBRARY_PATH
# variables, which now point to the directories of the lib files.
# It all makes more sense to use the ${_TBB_LIBRARY_DIR} as a HINTS
# argument instead of the implicit PATHS as it isn't hard-coded
# but computed by system introspection. Searching the LIBRARY_PATH
# and LD_LIBRARY_PATH environment variables is now even more important
# that tbbvars doesn't export TBB_ARCH_PLATFORM and it facilitates
# the use of TBB built from sources.
find_library(TBB_LIBRARY ${_TBB_LIB_NAME} HINTS ${_TBB_LIBRARY_DIR}
PATHS ENV LIBRARY_PATH ENV LD_LIBRARY_PATH)
find_library(TBB_MALLOC_LIBRARY ${_TBB_LIB_MALLOC_NAME} HINTS ${_TBB_LIBRARY_DIR}
PATHS ENV LIBRARY_PATH ENV LD_LIBRARY_PATH)
#Extract path from TBB_LIBRARY name
get_filename_component(TBB_LIBRARY_DIR ${TBB_LIBRARY} PATH)
#TBB_CORRECT_LIB_DIR(TBB_LIBRARY)
#TBB_CORRECT_LIB_DIR(TBB_MALLOC_LIBRARY)
mark_as_advanced(TBB_LIBRARY TBB_MALLOC_LIBRARY)
#-- Look for debug libraries
# Jiri: Changed the same way as for the release libraries.
find_library(TBB_LIBRARY_DEBUG ${_TBB_LIB_DEBUG_NAME} HINTS ${_TBB_LIBRARY_DIR}
PATHS ENV LIBRARY_PATH ENV LD_LIBRARY_PATH)
find_library(TBB_MALLOC_LIBRARY_DEBUG ${_TBB_LIB_MALLOC_DEBUG_NAME} HINTS ${_TBB_LIBRARY_DIR}
PATHS ENV LIBRARY_PATH ENV LD_LIBRARY_PATH)
# Jiri: Self-built TBB stores the debug libraries in a separate directory.
# Extract path from TBB_LIBRARY_DEBUG name
get_filename_component(TBB_LIBRARY_DEBUG_DIR ${TBB_LIBRARY_DEBUG} PATH)
#TBB_CORRECT_LIB_DIR(TBB_LIBRARY_DEBUG)
#TBB_CORRECT_LIB_DIR(TBB_MALLOC_LIBRARY_DEBUG)
mark_as_advanced(TBB_LIBRARY_DEBUG TBB_MALLOC_LIBRARY_DEBUG)
if (TBB_INCLUDE_DIR)
if (TBB_LIBRARY)
set (TBB_FOUND "YES")
set (TBB_LIBRARIES ${TBB_LIBRARY} ${TBB_MALLOC_LIBRARY} ${TBB_LIBRARIES})
set (TBB_DEBUG_LIBRARIES ${TBB_LIBRARY_DEBUG} ${TBB_MALLOC_LIBRARY_DEBUG} ${TBB_DEBUG_LIBRARIES})
set (TBB_INCLUDE_DIRS ${TBB_INCLUDE_DIR} CACHE PATH "TBB include directory" FORCE)
set (TBB_LIBRARY_DIRS ${TBB_LIBRARY_DIR} CACHE PATH "TBB library directory" FORCE)
# Jiri: Self-built TBB stores the debug libraries in a separate directory.
set (TBB_DEBUG_LIBRARY_DIRS ${TBB_LIBRARY_DEBUG_DIR} CACHE PATH "TBB debug library directory" FORCE)
mark_as_advanced(TBB_INCLUDE_DIRS TBB_LIBRARY_DIRS TBB_DEBUG_LIBRARY_DIRS TBB_LIBRARIES TBB_DEBUG_LIBRARIES)
message(STATUS "Found Intel TBB")
endif (TBB_LIBRARY)
endif (TBB_INCLUDE_DIR)
if (NOT TBB_FOUND)
message("ERROR: Intel TBB NOT found!")
message(STATUS "Looked for Threading Building Blocks in ${_TBB_INSTALL_DIR}")
# do only throw fatal, if this pkg is REQUIRED
if (TBB_FIND_REQUIRED)
message(FATAL_ERROR "Could NOT find TBB library.")
endif (TBB_FIND_REQUIRED)
endif (NOT TBB_FOUND)
endif (NOT _TBB_INSTALL_DIR)
if (TBB_FOUND)
set(TBB_INTERFACE_VERSION 0)
FILE(READ "${TBB_INCLUDE_DIRS}/tbb/tbb_stddef.h" _TBB_VERSION_CONTENTS)
STRING(REGEX REPLACE ".*#define TBB_INTERFACE_VERSION ([0-9]+).*" "\\1" TBB_INTERFACE_VERSION "${_TBB_VERSION_CONTENTS}")
set(TBB_INTERFACE_VERSION "${TBB_INTERFACE_VERSION}")
endif (TBB_FOUND)

59
OpenImageIO-man.patch Normal file
View File

@ -0,0 +1,59 @@
--- 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,54 +1,47 @@
%if 0%{?rhel}
%global cmake %cmake28
%endif
%global sover 1.8
Name: OpenImageIO
Version: 1.2.3
Release: 3%{?dist}
Version: 1.8.12
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://download.github.com/oiio-Release-%{version}.tar.gz
Source0: https://github.com/%{name}/oiio/archive/Release-%{version}/%{name}-%{version}.tar.gz
# Images for test suite
#Source1: oiio-images.tar.gz
Source101: FindTBB.cmake
Patch0: oiio-arm.patch
Patch1: oiio-ppc.patch
Patch2: oiio-s390.patch
Patch3: oiio-cmake.patch
Patch4: oiio-spin_mutex.patch
Patch0: OpenImageIO-man.patch
%if 0%{?rhel}
BuildRequires: cmake28
%else
BuildRequires: cmake
%endif
BuildRequires: cmake gcc-c++
BuildRequires: txt2man
BuildRequires: qt4-devel
BuildRequires: qt5-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 openjpeg-devel
%if 0%{?!rhel}
BuildRequires: libpng-devel libtiff-devel libjpeg-turbo-devel openjpeg2-devel
BuildRequires: giflib-devel
BuildRequires: libwebp-devel
BuildRequires: Field3D-devel
%endif
BuildRequires: hdf5-devel
BuildRequires: dcmtk-devel
BuildRequires: zlib-devel
BuildRequires: jasper-devel
BuildRequires: pugixml-devel
BuildRequires: OpenColorIO-devel
BuildRequires: opencv-devel
BuildRequires: LibRaw-devel
BuildRequires: openssl-devel
# We don't want to provide private python extension libs
%{?filter_setup:
%filter_provides_in %{python_sitearch}/.*\.so$
%filter_setup
}
# 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
%description
@ -63,27 +56,35 @@ 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 utilies for %{name}
Summary: Command line utilities for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
%description utils
Command-line tools to minipulate and get information on images using the
Command-line tools to manipulate and get information on images using the
%{name} library.
%package iv
Summary: %{name} based image viewer.
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
@ -91,20 +92,12 @@ Development files for package %{name}
%prep
%setup -q -n oiio-Release-%{version}
%patch0 -p1 -b .arm
%patch1 -p1 -b .ppc
#patch2 -p1 -b .s390
%patch3 -p1 -b .cmake
%patch4 -p1 -b .spin_mutex
# Install FindTBB.cmake
install %{SOURCE101} src/cmake/modules/
%autosetup -p1 -n oiio-Release-%{version}
# Remove bundled pugixml
rm -f src/include/pugixml.hpp \
src/include/pugiconfig.hpp \
src/libutil/pugixml.cpp
rm -f src/include/OpenImageIO/pugixml.hpp \
src/include/OpenImageIO/pugiconfig.hpp \
src/libutil/OpenImageIO/pugixml.cpp
# Remove bundled tbb
rm -rf src/include/tbb
@ -122,29 +115,31 @@ 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_TBB:BOOL=FALSE \
-DUSE_OPENSSL:BOOL=TRUE \
-DSTOP_ON_WARNING:BOOL=FALSE \
-DUSE_CPP:STRING=14 \
%ifarch ppc ppc64
-DNOTHREADS:BOOL=TRUE \
-DNOTHREADS:BOOL=FALSE \
%endif
-DJPEG_INCLUDE_DIR=%{_includedir} \
-DOPENJPEG_INCLUDE_DIR=$(pkgconf --variable=includedir libopenjp2) \
-DVERBOSE=TRUE \
../../src
../../
make %{?_smp_mflags}
%make_build
%install
pushd build/linux
make DESTDIR=%{buildroot} install
%make_install
# Move man pages to the right directory
mkdir -p %{buildroot}%{_mandir}/man1
cp -a doc/*.1 %{buildroot}%{_mandir}/man1
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
cp -a src/doc/*.1 %{buildroot}%{_mandir}/man1
%check
@ -153,9 +148,13 @@ cp -a doc/*.1 %{buildroot}%{_mandir}/man1
%files
%doc CHANGES LICENSE
%{_libdir}/libOpenImageIO.so.*
%{python_sitearch}/OpenImageIO.so
%doc CHANGES.md README.md
%license LICENSE
%{_libdir}/libOpenImageIO.so.%{sover}*
%{_libdir}/libOpenImageIO_Util.so.%{sover}*
%files -n python2-openimageio
%{python2_sitearch}/OpenImageIO.so
%files utils
%exclude %{_bindir}/iv
@ -170,148 +169,44 @@ cp -a doc/*.1 %{buildroot}%{_mandir}/man1
%files devel
%doc src/doc/*.pdf
%{_libdir}/libOpenImageIO.so
%{_libdir}/libOpenImageIO_Util.so
%{_includedir}/*
%changelog
* Wed Nov 27 2013 Rex Dieter <rdieter@fedoraproject.org> - 1.2.3-3
- rebuild (openexr)
* Fri Jun 01 2018 Richard Shaw <hobbes1069@gmail.com> - 1.8.12-1
- Update to 1.8.12.
* Mon Nov 18 2013 Dave Airlie <airlied@redhat.com> - 1.2.3-2
- rebuilt for GLEW 1.10
* Mon Apr 02 2018 Richard Shaw <hobbes1069@gmail.com> - 1.8.10-1
- Update to 1.8.10.
* Wed Nov 6 2013 Richard Shaw <hobbes1069@gmail.com> - 1.2.3-1
* 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
- Update to latest upstream release.
- Fix ppc builds (BZ#1021977).
- Add conditionals to build requirements for EPEL 6.
- Disable building with dcmtk until fixed, see:
https://github.com/OpenImageIO/oiio/issues/1841
* Wed Oct 2 2013 Richard Shaw <hobbes1069@gmail.com> - 1.2.2-1
* Thu Nov 02 2017 Richard Shaw <hobbes1069@gmail.com> - 1.8.6-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.
- Add dcmtk to build to enable DICOM plugin.

View File

@ -1,16 +0,0 @@
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 */

View File

@ -1,15 +0,0 @@
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?)

View File

@ -1,56 +0,0 @@
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

View File

@ -1,12 +0,0 @@
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;");

View File

@ -1,81 +0,0 @@
From 77fd2276e12791dc17cb20526cd371d66140e416 Mon Sep 17 00:00:00 2001
From: Larry Gritz <lg@larrygritz.com>
Date: Tue, 5 Nov 2013 16:05:43 -0800
Subject: [PATCH] Make cleaner threads.h compile for the NOTHREADS case
---
src/include/thread.h | 27 ++++++++++++++++++++++-----
1 file changed, 22 insertions(+), 5 deletions(-)
diff --git a/src/include/thread.h b/src/include/thread.h
index e389ebb..ecf3e66 100644
--- a/src/include/thread.h
+++ b/src/include/thread.h
@@ -128,6 +128,7 @@ class null_mutex {
void unlock () { }
void lock_shared () { }
void unlock_shared () { }
+ bool try_lock () { return true; }
};
/// Null lock that can be substituted for a real one to test how much
@@ -219,7 +220,9 @@ class thread_specific_ptr {
inline int
atomic_exchange_and_add (volatile int *at, int x)
{
-#ifdef USE_GCC_ATOMICS
+#ifdef NOTHREADS
+ int r = *at; *at += x; return r;
+#elif defined(USE_GCC_ATOMICS)
return __sync_fetch_and_add ((int *)at, x);
#elif USE_TBB
atomic<int> *a = (atomic<int> *)at;
@@ -237,7 +240,9 @@ class thread_specific_ptr {
inline long long
atomic_exchange_and_add (volatile long long *at, long long x)
{
-#ifdef USE_GCC_ATOMICS
+#ifdef NOTHREADS
+ long long r = *at; *at += x; return r;
+#elif defined(USE_GCC_ATOMICS)
return __sync_fetch_and_add (at, x);
#elif USE_TBB
atomic<long long> *a = (atomic<long long> *)at;
@@ -261,11 +266,17 @@ class thread_specific_ptr {
/// *at = newval; return true;
/// } else {
/// return false;
-///
+/// }
inline bool
atomic_compare_and_exchange (volatile int *at, int compareval, int newval)
{
-#ifdef USE_GCC_ATOMICS
+#ifdef NOTHREADS
+ if (*at == compareval) {
+ *at = newval; return true;
+ } else {
+ return false;
+ }
+#elif defined(USE_GCC_ATOMICS)
return __sync_bool_compare_and_swap (at, compareval, newval);
#elif USE_TBB
atomic<int> *a = (atomic<int> *)at;
@@ -282,7 +293,13 @@ class thread_specific_ptr {
inline bool
atomic_compare_and_exchange (volatile long long *at, long long compareval, long long newval)
{
-#ifdef USE_GCC_ATOMICS
+#ifdef NOTHREADS
+ if (*at == compareval) {
+ *at = newval; return true;
+ } else {
+ return false;
+ }
+#elif defined(USE_GCC_ATOMICS)
return __sync_bool_compare_and_swap (at, compareval, newval);
#elif USE_TBB
atomic<long long> *a = (atomic<long long> *)at;
--
1.8.4

View File

@ -1 +1 @@
abb6534f9b9b5540c0113e8cde95e427 oiio-Release-1.2.3.tar.gz
SHA512 (OpenImageIO-1.8.12.tar.gz) = 2475792ff475d34b47b6af5ca71c6cf6d9d8c60452a506b1bf740b9dbb20ea72109117dc9a531b8302095de99f6280172723f26e23dc6e038256cbb43b697145