Compare commits
24 Commits
| Author | SHA1 | Date |
|---|---|---|
Rex Dieter
|
3448657d9f | |
|
Rex Dieter
|
9a30ce92df | |
Richard M. Shaw
|
7c5424fff6 | |
|
Richard M. Shaw
|
de85de63d0 | |
|
Richard M. Shaw
|
e6ffb53bd3 | |
|
Richard M. Shaw
|
1afca057bb | |
|
Richard M. Shaw
|
3b1d494009 | |
|
Richard M. Shaw
|
577ce889d5 | |
|
Richard M. Shaw
|
d728195f5a | |
|
Richard M. Shaw
|
3de092e48b | |
|
Richard M. Shaw
|
e985bed975 | |
|
Richard M. Shaw
|
1e124eaaa2 | |
|
Richard M. Shaw
|
036016e8b1 | |
|
Richard M. Shaw
|
6c3a8c236c | |
|
Richard M. Shaw
|
7d30ff8a52 | |
Dan Horák
|
fb5ac2fe1f | |
|
Dan Horák
|
1adb0b9650 | |
|
Richard M. Shaw
|
895b650565 | |
|
Richard M. Shaw
|
0a89d6f3fa | |
|
Richard M. Shaw
|
f09b0b1ca8 | |
|
Richard M. Shaw
|
0a31123e6b | |
|
Richard M. Shaw
|
c9a0b1cb4d | |
|
Richard M. Shaw
|
d928445b81 | |
|
Richard M. Shaw
|
8cc501f56d |
|
|
@ -12,51 +12,4 @@ clog
|
|||
/OpenImageIO-oiio-Release-1.0.7-0-g0cae52b.tar.gz
|
||||
/OpenImageIO-oiio-Release-1.0.8-0-g187bb9b.tar.gz
|
||||
/OpenImageIO-oiio-Release-1.0.9-0-g0b78dec.tar.gz
|
||||
/oiio-Release-1.1.3.tar.gz
|
||||
/oiio-Release-1.1.10.tar.gz
|
||||
/oiio-Release-1.1.11.tar.gz
|
||||
/oiio-Release-1.1.13.tar.gz
|
||||
/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.0.11.tar.gz
|
||||
|
|
|
|||
|
|
@ -0,0 +1,283 @@
|
|||
# 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)
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
diff -Naur OpenImageIO-oiio-5b37f1c.orig/src/libutil/tbb_misc.cpp OpenImageIO-oiio-5b37f1c/src/libutil/tbb_misc.cpp
|
||||
--- OpenImageIO-oiio-5b37f1c.orig/src/libutil/tbb_misc.cpp 2012-02-25 17:17:12.000000000 -0600
|
||||
+++ OpenImageIO-oiio-5b37f1c/src/libutil/tbb_misc.cpp 2012-03-04 17:00:29.519842011 -0600
|
||||
@@ -30,8 +30,7 @@
|
||||
// an executing program.
|
||||
|
||||
#include "tbb/tbb_stddef.h"
|
||||
-// Out-of-line TBB assertion handling routines are instantiated here.
|
||||
-#include "tbb/tbb_assert_impl.h"
|
||||
+#include "tbb/tbb_machine.h"
|
||||
|
||||
#include "tbb/tbb_misc.h"
|
||||
#include <cstdio>
|
||||
|
|
@ -0,0 +1,67 @@
|
|||
diff -Naur OpenImageIO-oiio-5b37f1c.orig/src/libOpenImageIO/CMakeLists.txt OpenImageIO-oiio-5b37f1c/src/libOpenImageIO/CMakeLists.txt
|
||||
--- OpenImageIO-oiio-5b37f1c.orig/src/libOpenImageIO/CMakeLists.txt 2012-02-28 12:58:45.306847484 -0600
|
||||
+++ OpenImageIO-oiio-5b37f1c/src/libOpenImageIO/CMakeLists.txt 2012-02-28 13:02:27.438365805 -0600
|
||||
@@ -61,7 +61,11 @@
|
||||
endif ()
|
||||
|
||||
# Include our own TBB if using it
|
||||
-if (USE_TBB)
|
||||
+if (USE_TBB AND USE_EXTERNAL_TBB)
|
||||
+ message (STATUS "System TBB library will be used.")
|
||||
+ set (libOpenImageIO_srcs ${libOpenImageIO_srcs})
|
||||
+elseif (USE_TBB AND NOT USE_EXTERNAL_TBB)
|
||||
+ message (STATUS "Built-in TBB library will be used.")
|
||||
set (libOpenImageIO_srcs ${libOpenImageIO_srcs} ../libutil/tbb_misc.cpp)
|
||||
endif ()
|
||||
|
||||
diff -Naur OpenImageIO-oiio-5b37f1c.orig/src/include/CMakeLists.txt OpenImageIO-oiio-5b37f1c/src/include/CMakeLists.txt
|
||||
--- OpenImageIO-oiio-5b37f1c.orig/src/include/CMakeLists.txt 2012-02-25 17:17:12.000000000 -0600
|
||||
+++ OpenImageIO-oiio-5b37f1c/src/include/CMakeLists.txt 2012-02-28 13:32:00.961799696 -0600
|
||||
@@ -22,7 +22,7 @@
|
||||
install (FILES ${public_headers} DESTINATION ${INCLUDE_INSTALL_DIR}
|
||||
COMPONENT developer)
|
||||
|
||||
-if (USE_TBB)
|
||||
+if (USE_TBB AND NOT USE_EXTERNAL_TBB)
|
||||
install (DIRECTORY tbb DESTINATION ${INCLUDE_INSTALL_DIR}
|
||||
COMPONENT developer)
|
||||
endif ()
|
||||
diff -Naur OpenImageIO-oiio-f0a566a.orig/src/CMakeLists.txt OpenImageIO-oiio-f0a566a/src/CMakeLists.txt
|
||||
--- OpenImageIO-oiio-f0a566a.orig/src/CMakeLists.txt 2012-06-12 13:03:37.000000000 -0500
|
||||
+++ OpenImageIO-oiio-f0a566a/src/CMakeLists.txt 2012-06-28 15:12:45.831826494 -0500
|
||||
@@ -34,6 +34,8 @@
|
||||
set (PYTHON_VERSION 2.6)
|
||||
set (USE_EXTERNAL_PUGIXML OFF CACHE BOOL
|
||||
"Use an externally built shared library version of the pugixml library")
|
||||
+set (USE_EXTERNAL_TBB OFF CACHE BOOL
|
||||
+ "Use system TBB library instead of bundled.")
|
||||
|
||||
set (SOVERSION ${OIIO_VERSION_MAJOR}.${OIIO_VERSION_MINOR}
|
||||
CACHE STRING "Set the SO version in the SO name of the output library")
|
||||
diff -Naur OpenImageIO-oiio-f0a566a.orig/src/libOpenImageIO/CMakeLists.txt OpenImageIO-oiio-f0a566a/src/libOpenImageIO/CMakeLists.txt
|
||||
--- OpenImageIO-oiio-f0a566a.orig/src/libOpenImageIO/CMakeLists.txt 2012-06-28 15:08:38.114834341 -0500
|
||||
+++ OpenImageIO-oiio-f0a566a/src/libOpenImageIO/CMakeLists.txt 2012-06-28 15:19:34.819584416 -0500
|
||||
@@ -63,7 +63,9 @@
|
||||
# Include our own TBB if using it
|
||||
if (USE_TBB AND USE_EXTERNAL_TBB)
|
||||
message (STATUS "System TBB library will be used.")
|
||||
- set (libOpenImageIO_srcs ${libOpenImageIO_srcs})
|
||||
+ find_package (TBB REQUIRED)
|
||||
+ include_directories (${TBB_INCLUDE_DIRS})
|
||||
+ set (libOpenImageIO_srcs ${libOpenImageIO_srcs})
|
||||
elseif (USE_TBB AND NOT USE_EXTERNAL_TBB)
|
||||
message (STATUS "Built-in TBB library will be used.")
|
||||
set (libOpenImageIO_srcs ${libOpenImageIO_srcs} ../libutil/tbb_misc.cpp)
|
||||
@@ -211,7 +213,11 @@
|
||||
target_link_libraries (OpenImageIO ${OCIO_LIBRARIES})
|
||||
endif ()
|
||||
|
||||
-
|
||||
+# Link against system TBB library if specified
|
||||
+if (USE_TBB AND USE_EXTERNAL_TBB)
|
||||
+ message (STATUS "Linking TBB: ${TBB_LIBRARIES}")
|
||||
+ target_link_libraries (OpenImageIO ${TBB_LIBRARIES})
|
||||
+endif ()
|
||||
|
||||
|
||||
if (WIN32)
|
||||
|
|
@ -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)
|
||||
|
|
@ -0,0 +1,54 @@
|
|||
diff -Naur OpenImageIO-oiio-2939154.orig/src/include/thread.h OpenImageIO-oiio-2939154/src/include/thread.h
|
||||
--- OpenImageIO-oiio-2939154.orig/src/include/thread.h 2012-06-04 12:30:16.000000000 -0500
|
||||
+++ OpenImageIO-oiio-2939154/src/include/thread.h 2012-06-13 15:14:36.648990016 -0500
|
||||
@@ -103,7 +103,7 @@
|
||||
#endif
|
||||
|
||||
#if defined(__GNUC__) && (defined(_GLIBCXX_ATOMIC_BUILTINS) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 401))
|
||||
-#if !defined(__FreeBSD__) || defined(__x86_64__)
|
||||
+#if !defined(__FreeBSD__) && !defined(__PPC__) || defined(__x86_64__)
|
||||
#define USE_GCC_ATOMICS
|
||||
#endif
|
||||
#endif
|
||||
@@ -272,6 +272,11 @@
|
||||
#elif defined(_WIN32)
|
||||
// Windows
|
||||
return _InterlockedExchangeAdd ((volatile LONG *)at, x);
|
||||
+#elif defined (__PPC__)
|
||||
+ long long r;
|
||||
+ r = *at;
|
||||
+ *at += x;
|
||||
+ return r;
|
||||
#else
|
||||
# error No atomics on this platform.
|
||||
#endif
|
||||
@@ -297,6 +302,11 @@
|
||||
# else
|
||||
return InterlockedExchangeAdd64 ((volatile LONGLONG *)at, x);
|
||||
# endif
|
||||
+#elif defined (__PPC__)
|
||||
+ long long r;
|
||||
+ r = *at;
|
||||
+ *at += x;
|
||||
+ return r;
|
||||
#else
|
||||
# error No atomics on this platform.
|
||||
#endif
|
||||
@@ -322,6 +332,8 @@
|
||||
return OSAtomicCompareAndSwap32Barrier (compareval, newval, at);
|
||||
#elif defined(_WIN32)
|
||||
return (_InterlockedCompareExchange ((volatile LONG *)at, newval, compareval) == compareval);
|
||||
+#elif defined(__PPC__)
|
||||
+ return ((*at == compareval) ? (*at = newval), 1 : 0);
|
||||
#else
|
||||
# error No atomics on this platform.
|
||||
#endif
|
||||
@@ -341,6 +353,8 @@
|
||||
return OSAtomicCompareAndSwap64Barrier (compareval, newval, at);
|
||||
#elif defined(_WIN32)
|
||||
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
|
||||
228
OpenImageIO.spec
228
OpenImageIO.spec
|
|
@ -1,48 +1,39 @@
|
|||
%global sover 1.8
|
||||
|
||||
Name: OpenImageIO
|
||||
Version: 1.8.12
|
||||
Release: 1%{?dist}
|
||||
Version: 1.0.11
|
||||
Release: 2%{?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}/oiio/archive/oiio-Release-%{version}.tar.gz
|
||||
# Images for test suite
|
||||
#Source1: oiio-images.tar.gz
|
||||
#Source1: %{name}-oiio-images-%{githash3}.tar.gz
|
||||
Source101: FindTBB.cmake
|
||||
|
||||
Patch0: OpenImageIO-man.patch
|
||||
Patch0: OpenImageIO-1.0.0-use_external_tbb.patch
|
||||
Patch1: OpenImageIO-1.0.0-tbb_include.patch
|
||||
Patch2: OpenImageIO-ppc.patch
|
||||
|
||||
BuildRequires: cmake gcc-c++
|
||||
BuildRequires: txt2man
|
||||
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 libjpeg-turbo-devel openjpeg2-devel
|
||||
BuildRequires: giflib-devel
|
||||
BuildRequires: libwebp-devel
|
||||
BuildRequires: Field3D-devel
|
||||
BuildRequires: hdf5-devel
|
||||
BuildRequires: dcmtk-devel
|
||||
BuildRequires: zlib-devel
|
||||
BuildRequires: jasper-devel
|
||||
BuildRequires: cmake
|
||||
BuildRequires: qt4-devel
|
||||
BuildRequires: boost-devel glew-devel OpenEXR-devel ilmbase-devel
|
||||
BuildRequires: python2-devel txt2man
|
||||
BuildRequires: libpng-devel libtiff-devel openjpeg-devel libwebp-devel
|
||||
BuildRequires: zlib-devel 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.
|
||||
%ifarch x86_64
|
||||
BuildRequires: tbb-devel
|
||||
%endif
|
||||
BuildRequires: hdf5-devel Field3D-devel
|
||||
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,21 +47,12 @@ 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}
|
||||
Summary: Command line utilies for %{name}
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description utils
|
||||
Command-line tools to manipulate and get information on images using the
|
||||
Command-line tools to minipulate and get information on images using the
|
||||
%{name} library.
|
||||
|
||||
|
||||
|
|
@ -79,12 +61,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 +75,18 @@ Development files for package %{name}
|
|||
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n oiio-Release-%{version}
|
||||
%setup -q -n oiio-Release-%{version}
|
||||
%patch0 -p1 -b .exttbb
|
||||
%patch1 -p1 -b .tbbinc
|
||||
%patch2 -p1 -b .ppc
|
||||
|
||||
# Install FindTBB.cmake
|
||||
install %{SOURCE101} src/cmake/modules/
|
||||
|
||||
# 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 +104,43 @@ 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 \
|
||||
%ifarch ppc ppc64
|
||||
-DNOTHREADS:BOOL=FALSE \
|
||||
%ifarch x86_64
|
||||
-DUSE_TBB:BOOL=TRUE \
|
||||
-DUSE_EXTERNAL_TBB=TRUE \
|
||||
%else
|
||||
-DUSE_TBB:BOOL=FALSE \
|
||||
%endif
|
||||
-DJPEG_INCLUDE_DIR=%{_includedir} \
|
||||
-DOPENJPEG_INCLUDE_DIR=$(pkgconf --variable=includedir libopenjp2) \
|
||||
-DVERBOSE=TRUE \
|
||||
../../
|
||||
%ifarch ppc ppc64
|
||||
-DNOTHREADS:BOOL=TRUE \
|
||||
%endif
|
||||
../../src
|
||||
|
||||
%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
|
||||
cp -a 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 +155,76 @@ 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.
|
||||
* Wed Jan 23 2013 Rex Dieter <rdieter@fedoraproject.org> 1.0.11-2
|
||||
- rebuild (libwebp)
|
||||
|
||||
* Mon Apr 02 2018 Richard Shaw <hobbes1069@gmail.com> - 1.8.10-1
|
||||
- Update to 1.8.10.
|
||||
* Thu Jan 17 2013 Richard Shaw <hobbes1069@gmail.com> - 1.0.11-1
|
||||
- Update to latest upstream patch release.
|
||||
|
||||
* 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
|
||||
* Sat Sep 22 2012 Richard Shaw <hobbes1069@gmail.com> - 1.0.9-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
|
||||
* 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.
|
||||
- Add dcmtk to build to enable DICOM plugin.
|
||||
|
||||
* 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.
|
||||
|
|
|
|||
Loading…
Reference in New Issue