Use qt4-devel instead of qt-devel.

Add cmake to BR.
Update to latest upstream release.
2012-05-02 08:24:14 -05:00 · 2012-05-01 12:47:01 -05:00 · 2012-04-19 14:33:29 -05:00 · 2012-04-19 14:32:20 -05:00 · 2012-04-19 13:54:11 -05:00 · 2012-04-09 11:54:05 +02:00
10 changed files with 987 additions and 256 deletions
--- a/.gitignore
+++ b/.gitignore
@ -3,60 +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-1.0.0-0-g5b37f1c.tar.gz
-/OpenImageIO-oiio-Release-1.0.3-0-gdffc74e.tar.gz
-clog
-/OpenImageIO-oiio-Release-1.0.4-0-g513d0dd.tar.gz
-/OpenImageIO-oiio-Release-1.0.5-0-g28ba675.tar.gz
-/OpenImageIO-oiio-Release-1.0.6-0-g47d4346.tar.gz
-/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
+/OpenImageIO-oiio-Release-0.10.8-0-g1e37127.tar.gz
--- a/FindTBB.cmake
+++ b/FindTBB.cmake
@ -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)
--- a/OpenImageIO-0.10.0-atomic_test_fix.patch
+++ b/OpenImageIO-0.10.0-atomic_test_fix.patch
@ -0,0 +1,119 @@
+diff --git a/src/include/thread.h b/src/include/thread.h
+index 2303c3e..039a98d 100644
+--- a/src/include/thread.h
+++ b/src/include/thread.h
+@@ -87,9 +87,15 @@
+ #  include <tbb/spin_mutex.h>
+ #endif
+ 
+-#ifdef _WIN32
+#if defined(_WIN32) && !USE_TBB
+ #  include <windows.h>
+ #  include <winbase.h>
+#  pragma intrinsic (_InterlockedExchangeAdd)
+#  pragma intrinsic (_InterlockedCompareExchange)
+#  pragma intrinsic (_InterlockedCompareExchange64)
+#  if defined(_WIN64)
+#    pragma intrinsic(_InterlockedExchangeAdd64)
+#  endif
+ #endif
+ 
+ #ifdef __APPLE__
+@@ -250,7 +256,7 @@ private:
+ inline int
+ atomic_exchange_and_add (volatile int *at, int x)
+ {
+-#if defined(__GNUC__) && defined(_GLIBCXX_ATOMIC_BUILTINS)
+#if defined(__GNUC__) && (defined(_GLIBCXX_ATOMIC_BUILTINS) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 401))
+     return __sync_fetch_and_add ((int *)at, x);
+ #elif USE_TBB
+     atomic<int> *a = (atomic<int> *)at;
+@@ -260,9 +266,9 @@ atomic_exchange_and_add (volatile int *at, int x)
+     return OSAtomicAdd32Barrier (x, at) - x;
+ #elif defined(_WIN32)
+     // Windows
+-    return InterlockedExchangeAdd ((volatile LONG *)at, x);
+    return _InterlockedExchangeAdd ((volatile LONG *)at, x);
+ #else
+-    error ("No atomics on this platform.")
+#   error No atomics on this platform.
+ #endif
+ }
+ 
+@@ -271,7 +277,7 @@ atomic_exchange_and_add (volatile int *at, int x)
+ inline long long
+ atomic_exchange_and_add (volatile long long *at, long long x)
+ {
+-#if defined(__GNUC__) && defined(_GLIBCXX_ATOMIC_BUILTINS)
+#if defined(__GNUC__) && (defined(_GLIBCXX_ATOMIC_BUILTINS) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 401))
+     return __sync_fetch_and_add (at, x);
+ #elif USE_TBB
+     atomic<long long> *a = (atomic<long long> *)at;
+@@ -281,9 +287,13 @@ atomic_exchange_and_add (volatile long long *at, long long x)
+     return OSAtomicAdd64Barrier (x, at) - x;
+ #elif defined(_WIN32)
+     // Windows
+#  if defined(_WIN64)
+    return _InterlockedExchangeAdd64 ((volatile LONGLONG *)at, x);
+#  else
+     return InterlockedExchangeAdd64 ((volatile LONGLONG *)at, x);
+#  endif
+ #else
+-    error ("No atomics on this platform.")
+#   error No atomics on this platform.
+ #endif
+ }
+ 
+@@ -298,7 +308,7 @@ atomic_exchange_and_add (volatile long long *at, long long x)
+ inline bool
+ atomic_compare_and_exchange (volatile int *at, int compareval, int newval)
+ {
+-#if defined(__GNUC__) && defined(_GLIBCXX_ATOMIC_BUILTINS)
+#if defined(__GNUC__) && (defined(_GLIBCXX_ATOMIC_BUILTINS) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 401))
+     return __sync_bool_compare_and_swap (at, compareval, newval);
+ #elif USE_TBB
+     atomic<int> *a = (atomic<int> *)at;
+@@ -306,9 +316,9 @@ atomic_compare_and_exchange (volatile int *at, int compareval, int newval)
+ #elif defined(__APPLE__)
+     return OSAtomicCompareAndSwap32Barrier (compareval, newval, at);
+ #elif defined(_WIN32)
+-    return (InterlockedCompareExchange ((volatile LONG *)at, newval, compareval) == compareval);
+    return (_InterlockedCompareExchange ((volatile LONG *)at, newval, compareval) == compareval);
+ #else
+-    error ("No atomics on this platform.")
+#   error No atomics on this platform.
+ #endif
+ }
+ 
+@@ -317,7 +327,7 @@ atomic_compare_and_exchange (volatile int *at, int compareval, int newval)
+ inline bool
+ atomic_compare_and_exchange (volatile long long *at, long long compareval, long long newval)
+ {
+-#if defined(__GNUC__) && defined(_GLIBCXX_ATOMIC_BUILTINS)
+#if defined(__GNUC__) && (defined(_GLIBCXX_ATOMIC_BUILTINS) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 401))
+     return __sync_bool_compare_and_swap (at, compareval, newval);
+ #elif USE_TBB
+     atomic<long long> *a = (atomic<long long> *)at;
+@@ -325,9 +335,9 @@ atomic_compare_and_exchange (volatile long long *at, long long compareval, long
+ #elif defined(__APPLE__)
+     return OSAtomicCompareAndSwap64Barrier (compareval, newval, at);
+ #elif defined(_WIN32)
+-    return (InterlockedCompareExchange64 ((volatile LONGLONG *)at, newval, compareval) == compareval);
+    return (_InterlockedCompareExchange64 ((volatile LONGLONG *)at, newval, compareval) == compareval);
+ #else
+-    error ("No atomics on this platform.")
+#   error No atomics on this platform.
+ #endif
+ }
+ 
+diff --git a/src/maketx/CMakeLists.txt b/src/maketx/CMakeLists.txt
+index c465960..5c408d8 100644
+--- a/src/maketx/CMakeLists.txt
+++ b/src/maketx/CMakeLists.txt
+@@ -1,3 +1,6 @@
+if (NOT USE_TBB)
+    add_definitions ("-DUSE_TBB=0")
+endif ()
+ set (maketx_srcs maketx.cpp)
+ add_executable (maketx ${maketx_srcs})
+ link_ilmbase (maketx)
--- a/OpenImageIO-0.10.2-Z_BEST_COMPRESSION.patch
+++ b/OpenImageIO-0.10.2-Z_BEST_COMPRESSION.patch
@ -0,0 +1,11 @@
+diff -Naur OpenImageIO-oiio-1c4030e.orig/src/ico.imageio/icooutput.cpp OpenImageIO-oiio-1c4030e/src/ico.imageio/icooutput.cpp
+--- OpenImageIO-oiio-1c4030e.orig/src/ico.imageio/icooutput.cpp	2011-08-06 12:56:10.000000000 -0500
+++ OpenImageIO-oiio-1c4030e/src/ico.imageio/icooutput.cpp	2011-11-05 14:29:27.850429691 -0500
+@@ -31,6 +31,7 @@
+ #include <cstdio>
+ #include <cstdlib>
+ #include <cmath>
+#include <zlib.h>
+ 
+ #include "ico.h"
+ #include "../png.imageio/png_pvt.h"
--- a/OpenImageIO-0.10.2-git_backports.patch
+++ b/OpenImageIO-0.10.2-git_backports.patch
@ -0,0 +1,379 @@
+diff -up OpenImageIO-oiio-1c4030e/Makefile.backport OpenImageIO-oiio-1c4030e/Makefile
+--- OpenImageIO-oiio-1c4030e/Makefile.backport	2011-08-06 13:56:10.000000000 -0400
+++ OpenImageIO-oiio-1c4030e/Makefile	2011-08-27 09:26:48.255906794 -0400
+@@ -27,7 +27,7 @@ ifdef PROFILE
+ endif
+ 
+ MY_MAKE_FLAGS ?=
+-MY_CMAKE_FLAGS ?=
+MY_CMAKE_FLAGS ?= -DSELF_CONTAINED_INSTALL_TREE:BOOL=TRUE
+ 
+ # Site-specific build instructions
+ ifndef OPENIMAGEIO_SITE
+diff -up OpenImageIO-oiio-1c4030e/src/cmake/externalpackages.cmake.backport OpenImageIO-oiio-1c4030e/src/cmake/externalpackages.cmake
+--- OpenImageIO-oiio-1c4030e/src/cmake/externalpackages.cmake.backport	2011-08-06 13:56:10.000000000 -0400
+++ OpenImageIO-oiio-1c4030e/src/cmake/externalpackages.cmake	2011-08-27 09:26:48.255906794 -0400
+@@ -237,3 +237,15 @@ endif ()
+ # end Field3d setup
+ ###########################################################################
+ 
+###########################################################################
+# Pugixml setup.  Normally we just use the version bundled with oiio, but
+# some linux distros are quite particular about having separate packages so we
+# allow this to be overridden to use the distro-provided package if desired.
+if (USE_EXTERNAL_PUGIXML)
+    find_package (PugiXML REQUIRED)
+    # insert include path to pugixml first, to ensure that the external
+    # pugixml is found, and not the one in OIIO's include directory.
+    include_directories (BEFORE ${PUGIXML_INCLUDE_DIR})
+endif()
+
+###########################################################################
+diff -up OpenImageIO-oiio-1c4030e/src/CMakeLists.txt.backport OpenImageIO-oiio-1c4030e/src/CMakeLists.txt
+--- OpenImageIO-oiio-1c4030e/src/CMakeLists.txt.backport	2011-08-06 13:56:10.000000000 -0400
+++ OpenImageIO-oiio-1c4030e/src/CMakeLists.txt	2011-08-27 09:26:48.256906780 -0400
+@@ -29,13 +29,11 @@ set (USE_FIELD3D ON CACHE BOOL "Use Fiel
+ set (USE_JASPER ON CACHE BOOL "Use Jasper for JPEG-2000 if found")
+ set (NOTHREADS OFF CACHE BOOL "Compile with no threads or locking")
+ set (PYTHON_VERSION 2.6)
+set (USE_EXTERNAL_PUGIXML OFF CACHE BOOL
+     "Use an externally built shared library version of the pugixml library")
+ 
+-if (NOT SOVERSION)
+-    set (SOVERSION ${OIIO_VERSION_MAJOR} CACHE STRING "Set the SO version in the SO name of the output library")
+-endif ()
+-if (NOT ${SOVERSION} STREQUAL ${OIIO_VERSION_MAJOR})
+-    set (OIIO_VERSION_MAJOR ${SOVERSION})
+-endif ()
+set (SOVERSION ${OIIO_VERSION_MAJOR}.${OIIO_VERSION_MINOR}
+     CACHE STRING "Set the SO version in the SO name of the output library")
+ 
+ if (NOTHREADS)
+     message (STATUS "NO THREADS!")
+@@ -89,19 +87,61 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+     add_definitions ("-DDEBUG=1")
+ endif ()
+ 
+-# Exec Install Locations
+-set (BINDIR   "${CMAKE_INSTALL_PREFIX}/bin")
+-set (LIBDIR   "${CMAKE_INSTALL_PREFIX}/lib")
+-set (PYLIBDIR "${CMAKE_INSTALL_PREFIX}/python")
+-if (EXEC_INSTALL_PREFIX)
+-    set (BINDIR   "${EXEC_INSTALL_PREFIX}/bin")
+-    set (LIBDIR   "${EXEC_INSTALL_PREFIX}/lib")
+-    set (PYLIBDIR "${EXEC_INSTALL_PREFIX}/python")
+###########################################################################
+# Paths for install tree customization.  Note that relative paths are relative
+# to CMAKE_INSTALL_PREFIX.
+set (DEFAULT_BIN_INSTALL_DIR   "bin")
+set (DEFAULT_LIB_INSTALL_DIR   "lib")
+set (DEFAULT_INCLUDE_INSTALL_DIR "include/OpenImageIO")
+if (UNIX AND NOT SELF_CONTAINED_INSTALL_TREE)
+    # Try to be well-behaved and install into reasonable places according to
+    # the "standard" unix directory heirarchy
+    # TODO: Figure out how to get the correct python directory
+    set (DEFAULT_PYLIB_INSTALL_DIR "lib/python/site-packages")
+    set (DEFAULT_DOC_INSTALL_DIR "share/doc/openimageio")
+    set (DEFAULT_MAN_INSTALL_DIR "share/man/man1")
+else ()
+    # Here is the "self-contained install tree" case: the expectation here is
+    # that everything OIIO related will go into its own directory, not into
+    # some standard system heirarchy.
+    set (DEFAULT_PYLIB_INSTALL_DIR "python")
+    set (DEFAULT_DOC_INSTALL_DIR "doc")
+    set (DEFAULT_MAN_INSTALL_DIR "doc/man")
+ endif ()
+if (EXEC_INSTALL_PREFIX)
+    # Tack on an extra prefix to support multi-arch builds.
+    set (DEFAULT_BIN_INSTALL_DIR   "${EXEC_INSTALL_PREFIX}/${DEFAULT_BIN_INSTALL_DIR}")
+    set (DEFAULT_LIB_INSTALL_DIR   "${EXEC_INSTALL_PREFIX}/${DEFAULT_LIB_INSTALL_DIR}")
+    set (DEFAULT_PYLIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/${DEFAULT_PYLIB_INSTALL_DIR}")
+endif ()
+# Set up cmake cache variables corresponding to the defaults deduced above, so
+# that the user can override them as desired:
+set (BIN_INSTALL_DIR ${DEFAULT_BIN_INSTALL_DIR} CACHE STRING
+     "Install location for binaries (relative to CMAKE_INSTALL_PREFIX or absolute)")
+set (LIB_INSTALL_DIR ${DEFAULT_LIB_INSTALL_DIR} CACHE STRING
+     "Install location for libraries (relative to CMAKE_INSTALL_PREFIX or absolute)")
+set (PYLIB_INSTALL_DIR ${DEFAULT_PYLIB_INSTALL_DIR} CACHE STRING
+     "Install location for python libraries (relative to CMAKE_INSTALL_PREFIX or absolute)")
+set (INCLUDE_INSTALL_DIR ${DEFAULT_INCLUDE_INSTALL_DIR} CACHE STRING
+     "Install location of header files (relative to CMAKE_INSTALL_PREFIX or absolute)")
+set (DOC_INSTALL_DIR ${DEFAULT_DOC_INSTALL_DIR} CACHE STRING
+     "Install location for documentation (relative to CMAKE_INSTALL_PREFIX or absolute)")
+if (UNIX)
+    set (MAN_INSTALL_DIR ${DEFAULT_MAN_INSTALL_DIR} CACHE STRING
+         "Install location for manual pages (relative to CMAKE_INSTALL_PREFIX or absolute)")
+endif()
+
+set (INSTALL_DOCS ON CACHE BOOL "Install documentation")
+
+ 
+-set (CMAKE_INSTALL_RPATH "${LIBDIR}")
+#####
+set (CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
+if (NOT IS_ABSOLUTE ${CMAKE_INSTALL_RPATH})
+    set (CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}")
+endif ()
+ set (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+ 
+
+ ###########################################################################
+ if (MSVC)
+     add_definitions (-D_CRT_SECURE_NO_DEPRECATE)
+diff -up OpenImageIO-oiio-1c4030e/src/cmake/modules/FindPugiXML.cmake.backport OpenImageIO-oiio-1c4030e/src/cmake/modules/FindPugiXML.cmake
+--- OpenImageIO-oiio-1c4030e/src/cmake/modules/FindPugiXML.cmake.backport	2011-08-27 09:26:48.255906794 -0400
+++ OpenImageIO-oiio-1c4030e/src/cmake/modules/FindPugiXML.cmake	2011-08-27 09:26:48.255906794 -0400
+@@ -0,0 +1,21 @@
+# Find the pugixml XML parsing library.
+#
+# Sets the usual variables expected for find_package scripts:
+#
+# PUGIXML_INCLUDE_DIR - header location
+# PUGIXML_LIBRARIES - library to link against
+# PUGIXML_FOUND - true if pugixml was found.
+
+find_path (PUGIXML_INCLUDE_DIR pugixml.hpp)
+find_library (PUGIXML_LIBRARY NAMES pugixml)
+
+# Support the REQUIRED and QUIET arguments, and set PUGIXML_FOUND if found.
+include (FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS (PugiXML DEFAULT_MSG PUGIXML_LIBRARY
+                                   PUGIXML_INCLUDE_DIR)
+
+if (PUGIXML_FOUND)
+    set (PUGIXML_LIBRARIES ${PUGIXML_LIBRARY})
+endif()
+
+mark_as_advanced (PUGIXML_LIBRARY PUGIXML_INCLUDE_DIR)
+diff -up OpenImageIO-oiio-1c4030e/src/cmake/oiio_macros.cmake.backport OpenImageIO-oiio-1c4030e/src/cmake/oiio_macros.cmake
+--- OpenImageIO-oiio-1c4030e/src/cmake/oiio_macros.cmake.backport	2011-08-06 13:56:10.000000000 -0400
+++ OpenImageIO-oiio-1c4030e/src/cmake/oiio_macros.cmake	2011-08-27 09:26:48.256906780 -0400
+@@ -7,9 +7,9 @@
+ #
+ macro (oiio_install_targets)
+     install (TARGETS ${ARGN}
+-             RUNTIME DESTINATION "${BINDIR}" COMPONENT user
+-             LIBRARY DESTINATION "${LIBDIR}" COMPONENT user
+-             ARCHIVE DESTINATION "${LIBDIR}" COMPONENT developer)
+             RUNTIME DESTINATION "${BIN_INSTALL_DIR}" COMPONENT user
+             LIBRARY DESTINATION "${LIB_INSTALL_DIR}" COMPONENT user
+             ARCHIVE DESTINATION "${LIB_INSTALL_DIR}" COMPONENT developer)
+ endmacro ()
+ 
+ # Macro to add a build target for an IO plugin.
+diff -up OpenImageIO-oiio-1c4030e/src/doc/CMakeLists.txt.backport OpenImageIO-oiio-1c4030e/src/doc/CMakeLists.txt
+--- OpenImageIO-oiio-1c4030e/src/doc/CMakeLists.txt.backport	2011-08-06 13:56:10.000000000 -0400
+++ OpenImageIO-oiio-1c4030e/src/doc/CMakeLists.txt	2011-08-27 09:28:40.225349570 -0400
+@@ -1,11 +1,38 @@
+-set (public_docs openimageio.pdf CLA-INDIVIDUAL CLA-CORPORATE)
+project(documentation)
+ 
+-install (FILES ${public_docs} DESTINATION doc COMPONENT documentation)
+set (public_docs
+     openimageio.pdf
+     ${OpenImageIO_SOURCE_DIR}/../LICENSE
+     ${OpenImageIO_SOURCE_DIR}/../CHANGES
+)
+ 
+-install (FILES ${PROJECT_SOURCE_DIR}/../LICENSE
+-               ${PROJECT_SOURCE_DIR}/../INSTALL
+-               ${PROJECT_SOURCE_DIR}/../CHANGES
+-         DESTINATION .)
+if (INSTALL_DOCS)
+     install (FILES ${public_docs} DESTINATION doc COMPONENT documentation)
+endif ()
+ 
+-#install (DIRECTORY doxygen/html DESTINATION doc
+-#         PATTERN .svn EXCLUDE)
+# generate man pages using txt2man and a tiny python script to munge the
+# result of "$tool --help"
+find_program(TXT2MAN txt2man)
+find_package(PythonInterp)
+if (UNIX AND TXT2MAN AND PYTHONINTERP_FOUND)
+    message (STATUS "Unix man page documentation will be generated")
+    set (cli_tools iinfo maketx idiff iv igrep iprocess iconvert)
+
+    foreach (tool ${cli_tools})
+        set (outfile "${documentation_BINARY_DIR}/${tool}.1")
+        list (APPEND manpage_files ${outfile})
+        add_custom_command (OUTPUT ${outfile}
+            COMMAND ${tool} --help |
+            ${PYTHON_EXECUTABLE} ${documentation_SOURCE_DIR}/help2man_preformat.py |
+            ${TXT2MAN} -v OpenImageIO -s 1 -t ${tool} > ${outfile}
+            DEPENDS ${tool} help2man_preformat.py)
+    endforeach()
+
+    # force man page build before install
+    add_custom_target (man_pages ALL DEPENDS ${manpage_files})
+
+    if (INSTALL_DOCS)
+        install (FILES ${manpage_files}
+                 DESTINATION ${MAN_INSTALL_DIR} COMPONENT documentation)
+    endif ()
+endif()
+diff -up OpenImageIO-oiio-1c4030e/src/doc/help2man_preformat.py.backport OpenImageIO-oiio-1c4030e/src/doc/help2man_preformat.py
+--- OpenImageIO-oiio-1c4030e/src/doc/help2man_preformat.py.backport	2011-08-27 09:26:48.257906766 -0400
+++ OpenImageIO-oiio-1c4030e/src/doc/help2man_preformat.py	2011-08-27 09:26:48.257906766 -0400
+@@ -0,0 +1,35 @@
+#!/usr/bin/python
+
+from __future__ import print_function
+import sys
+
+lines = [l.rstrip().replace('\t', ' '*8) for l in sys.stdin.readlines()]
+
+print('TITLE')
+print(lines[0])
+print()
+
+print('SYNOPSIS')
+for i,line in enumerate(lines[2:]):
+    if line.lstrip().startswith('-'):
+        optStart = i+2
+        break
+    print(line)
+
+print('''DESCRIPTION
+This program is part of the OpenImageIO (http://www.openimageio.org) tool suite.
+Detailed documentation is avaliable in pdf format with the OpenImageIO
+distribution.
+''')
+
+print('OPTIONS')
+for line in lines[optStart:]:
+    if not line.startswith(' '):
+        print()
+        print(line)
+    elif not line.lstrip().startswith('-'):
+        print(line.lstrip())
+    else:
+        print(line)
+print()
+
+diff -up OpenImageIO-oiio-1c4030e/src/include/CMakeLists.txt.backport OpenImageIO-oiio-1c4030e/src/include/CMakeLists.txt
+--- OpenImageIO-oiio-1c4030e/src/include/CMakeLists.txt.backport	2011-08-06 13:56:10.000000000 -0400
+++ OpenImageIO-oiio-1c4030e/src/include/CMakeLists.txt	2011-08-27 09:26:48.257906766 -0400
+@@ -4,22 +4,26 @@ set (public_headers argparse.h dassert.h
+                     imagecache.h imageio.h osdep.h paramlist.h
+                     refcnt.h strutil.h sysutil.h texture.h thread.h timer.h
+                     typedesc.h ustring.h varyingref.h
+-                    colortransfer.h pugixml.hpp pugiconfig.hpp
+                    colortransfer.h
+     )
+ 
+if (NOT USE_EXTERNAL_PUGIXML)
+    list (APPEND public_headers pugixml.hpp pugiconfig.hpp)
+endif ()
+
+ message(STATUS "Create version.h from version.h.in")
+# Mangle the SOVERSION so that it's a valid C++ identifier for the versioning
+# namespace defined in version.h
+string (REGEX REPLACE "\\." "_" MANGLED_SOVERSION ${SOVERSION})
+set (OIIO_VERSION_NS "v${MANGLED_SOVERSION}")
+ configure_file(version.h.in ${CMAKE_BINARY_DIR}/include/version.h @ONLY)
+ list(APPEND public_headers ${CMAKE_BINARY_DIR}/include/version.h)
+ 
+-install (FILES ${public_headers} DESTINATION include/OpenImageIO
+install (FILES ${public_headers} DESTINATION ${INCLUDE_INSTALL_DIR}
+          COMPONENT developer)
+ 
+ if (USE_TBB)
+-    file (GLOB tbb_headers tbb/*.h)
+-    file (GLOB tbb_headers2 tbb/machine/*.h)
+-    install (FILES ${tbb_headers} DESTINATION include/OpenImageIO/tbb
+-             COMPONENT developer)
+-    install (FILES ${tbb_headers2} DESTINATION include/OpenImageIO/tbb/machine
+    install (DIRECTORY tbb DESTINATION ${INCLUDE_INSTALL_DIR}
+              COMPONENT developer)
+ endif ()
+ 
+diff -up OpenImageIO-oiio-1c4030e/src/include/version.h.in.backport OpenImageIO-oiio-1c4030e/src/include/version.h.in
+--- OpenImageIO-oiio-1c4030e/src/include/version.h.in.backport	2011-08-06 13:56:10.000000000 -0400
+++ OpenImageIO-oiio-1c4030e/src/include/version.h.in	2011-08-27 09:26:48.257906766 -0400
+@@ -39,7 +39,7 @@
+ #define OIIO_VERSION_MAJOR @OIIO_VERSION_MAJOR@
+ #define OIIO_VERSION_MINOR @OIIO_VERSION_MINOR@
+ #define OIIO_VERSION_PATCH @OIIO_VERSION_PATCH@
+-#define OIIO_VERSION_NS v@SOVERSION@
+#define OIIO_VERSION_NS @OIIO_VERSION_NS@
+ 
+ #define OIIO_VERSION (10000 * OIIO_VERSION_MAJOR + \
+                         100 * OIIO_VERSION_MINOR + \
+diff -up OpenImageIO-oiio-1c4030e/src/libOpenImageIO/CMakeLists.txt.backport OpenImageIO-oiio-1c4030e/src/libOpenImageIO/CMakeLists.txt
+--- OpenImageIO-oiio-1c4030e/src/libOpenImageIO/CMakeLists.txt.backport	2011-08-06 13:56:10.000000000 -0400
+++ OpenImageIO-oiio-1c4030e/src/libOpenImageIO/CMakeLists.txt	2011-08-27 09:26:48.257906766 -0400
+@@ -12,8 +12,6 @@ set (libOpenImageIO_hdrs ../include/argp
+                          ../include/osdep.h
+                          ../include/paramlist.h
+                          ../include/plugin.h
+-                         ../include/pugiconfig.hpp
+-                         ../include/pugixml.hpp
+                          ../include/SHA1.h
+                          ../include/strutil.h
+                          ../include/sysutil.h
+@@ -25,6 +23,13 @@ set (libOpenImageIO_hdrs ../include/argp
+                          ../include/varyingref.h    
+                          )
+ 
+if (NOT USE_EXTERNAL_PUGIXML)
+    list (APPEND libOpenImageIO_hdrs
+          ../include/pugiconfig.hpp
+          ../include/pugixml.hpp
+    )
+endif()
+
+ set (libOpenImageIO_srcs formatspec.cpp imagebuf.cpp
+                          imagebufalgo.cpp imagebufalgo_orient.cpp
+                           imageinput.cpp imageio.cpp imageioplugin.cpp
+@@ -37,7 +42,6 @@ set (libOpenImageIO_srcs formatspec.cpp 
+                           ../libutil/paramlist.cpp 
+                           ../libutil/plugin.cpp 
+                           ../libutil/pystring.cpp
+-                          ../libutil/pugixml.cpp
+                           ../libutil/SHA1.cpp 
+                           ../libutil/strutil.cpp 
+                           ../libutil/sysutil.cpp 
+@@ -51,6 +55,10 @@ set (libOpenImageIO_srcs formatspec.cpp 
+                           ${libOpenImageIO_hdrs}
+                          )
+ 
+if (NOT USE_EXTERNAL_PUGIXML)
+    list (APPEND libOpenImageIO_srcs ../libutil/pugixml.cpp)
+endif ()
+
+ # Include our own TBB if using it
+ if (USE_TBB)
+     add_definitions ("-DUSE_TBB=1")
+@@ -175,14 +183,16 @@ if (EMBEDPLUGINS)
+     link_openexr (OpenImageIO)
+ endif ()
+ 
+-if (SOVERSION)
+if (USE_EXTERNAL_PUGIXML)
+    target_link_libraries (OpenImageIO ${PUGIXML_LIBRARIES})
+endif ()
+
+ message(STATUS "Setting SOVERSION to: ${SOVERSION}")
+ set_target_properties(OpenImageIO
+                          PROPERTIES
+                          VERSION ${OIIO_VERSION_MAJOR}.${OIIO_VERSION_MINOR}.${OIIO_VERSION_PATCH}
+                          SOVERSION ${SOVERSION}
+                      )
+-endif ()
+ 
+ oiio_install_targets (OpenImageIO)
+ 
+diff -up OpenImageIO-oiio-1c4030e/src/python/CMakeLists.txt.backport OpenImageIO-oiio-1c4030e/src/python/CMakeLists.txt
+--- OpenImageIO-oiio-1c4030e/src/python/CMakeLists.txt.backport	2011-08-06 13:56:10.000000000 -0400
+++ OpenImageIO-oiio-1c4030e/src/python/CMakeLists.txt	2011-08-27 09:26:48.264906668 -0400
+@@ -42,7 +42,7 @@ if ( BOOST_CUSTOM OR Boost_FOUND AND PYT
+     endif()
+ 							 
+     install (TARGETS PyOpenImageIO
+-             RUNTIME DESTINATION ${PYLIBDIR} COMPONENT user
+-             LIBRARY DESTINATION ${PYLIBDIR} COMPONENT user)
+             RUNTIME DESTINATION ${PYLIB_INSTALL_DIR} COMPONENT user
+             LIBRARY DESTINATION ${PYLIB_INSTALL_DIR} COMPONENT user)
+ 
+ endif ()
--- a/OpenImageIO-0.10.3-use_external_tbb.patch
+++ b/OpenImageIO-0.10.3-use_external_tbb.patch
@ -0,0 +1,74 @@
+ src/cmake/externalpackages.cmake  |   19 +++++++++++++++++++
+ src/include/CMakeLists.txt        |    2 +-
+ src/libOpenImageIO/CMakeLists.txt |   11 ++++++++++-
+ 3 files changed, 30 insertions(+), 2 deletions(-)
+
+diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake
+index ddea7e0..aa25df6 100644
+--- a/src/cmake/externalpackages.cmake
+++ b/src/cmake/externalpackages.cmake
+@@ -272,3 +272,22 @@ if (USE_EXTERNAL_PUGIXML)
+ endif()
+ 
+ ###########################################################################
+
+###########################################################################
+# TBB setup.  Normally we just use the version bundled with oiio, but
+# some linux distros are quite particular about having separate packages so we
+# 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.
+find_package (TBB REQUIRED)
+if (TBB_FOUND)
+    set (USE_EXTERNAL_TBB TRUE CACHE BOOL
+        "Use system installed TBB library if avaialble."
+    )
+    mark_as_advanced (FORCE USE_EXTERNAL_TBB)
+    # insert include path to TBB first, to ensure that the external
+    # TBB is found, and not the one in OIIO's include directory.
+    include_directories (BEFORE ${TBB_INCLUDE_DIR})
+endif()
+
+###########################################################################
+diff --git a/src/include/CMakeLists.txt b/src/include/CMakeLists.txt
+index 385f98e..4a2da55 100644
+--- a/src/include/CMakeLists.txt
+++ b/src/include/CMakeLists.txt
+@@ -23,7 +23,7 @@ list(APPEND public_headers ${CMAKE_BINARY_DIR}/include/version.h)
+ 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 --git a/src/libOpenImageIO/CMakeLists.txt b/src/libOpenImageIO/CMakeLists.txt
+index f4425f6..62da8dd 100644
+--- a/src/libOpenImageIO/CMakeLists.txt
+++ b/src/libOpenImageIO/CMakeLists.txt
+@@ -61,7 +61,12 @@ if (NOT USE_EXTERNAL_PUGIXML)
+ 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.")
+    add_definitions ("-DUSE_TBB=1")
+    set (libOpenImageIO_srcs ${libOpenImageIO_srcs})
+elseif (USE_TBB AND NOT USE_EXTERNAL_TBB)
+    message (STATUS "Built-in TBB library will be used.")
+     add_definitions ("-DUSE_TBB=1")
+     set (libOpenImageIO_srcs ${libOpenImageIO_srcs} ../libutil/tbb_misc.cpp)
+ else ()
+@@ -221,6 +226,10 @@ if (USE_EXTERNAL_PUGIXML)
+     target_link_libraries (OpenImageIO ${PUGIXML_LIBRARIES})
+ endif ()
+ 
+if (USE_EXTERNAL_TBB)
+    target_link_libraries (OpenImageIO ${TBB_LIBRARIES})
+endif ()
+
+ message(STATUS "Setting SOVERSION to: ${SOVERSION}")
+ set_target_properties(OpenImageIO
+                          PROPERTIES
--- a/OpenImageIO-0.10.4-no_tbb.patch
+++ b/OpenImageIO-0.10.4-no_tbb.patch
@ -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()
+ 
+ ###########################################################################
--- a/OpenImageIO-man.patch
+++ b/OpenImageIO-man.patch
@ -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)
--- a/OpenImageIO.spec
+++ b/OpenImageIO.spec
@ -1,47 +1,41 @@
-%global sover 1.8
+%global githash1 g1e37127
+%global githash2 1fa4a20

 Name:           OpenImageIO
-Version:        1.8.12
+Version:        0.10.8
 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://github.com/%{name}/oiio/archive/Release-%{version}/%{name}-%{version}.tar.gz
-# Images for test suite
-#Source1:        oiio-images.tar.gz

-Patch0:         OpenImageIO-man.patch
+Source0:        https://download.github.com/%{name}-oiio-Release-%{version}-0-%{githash1}.tar.gz
+Source1:        FindTBB.cmake

-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
+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-no_tbb.patch
+
+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
-BuildRequires:  opencv-devel
-BuildRequires:  LibRaw-devel
-BuildRequires:  openssl-devel
+%ifarch %{ix86} x86_64 ia64
+BuildRequires:  tbb-devel
+%endif
+BuildRequires:  hdf5-devel Field3D-devel

-# 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
+# We don't want to provide private python extension libs
+%{?filter_setup:
+%filter_provides_in %{python_sitearch}/.*\.so$ 
+%filter_setup
+}


 %description
@ -54,37 +48,13 @@ classes, utilities, and applications. Main features include:
  PNM/PPM/PGM/PBM, Field3d.
 - An ImageCache class that transparently manages a cache so that it can access
  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}
-Requires:       %{name}%{?_isa} = %{version}-%{release}
-
-%description utils
-Command-line tools to manipulate and get information on images using the
-%{name} library.
-
-
-%package iv
-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, also based on OpenImageIO 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,121 +62,113 @@ Development files for package %{name}


 %prep
-%autosetup -p1 -n oiio-Release-%{version}
+%setup -q -n %{name}-oiio-%{githash2}
+%patch0 -p1 -b .backport
+%patch1 -p1 -b .atomic
+%patch2 -p1 -b .tbb
+%patch3 -p1 -b .zlib
+%patch4 -p1 -b .no-tbb

 # 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
-
-# Install test images
-#rm -rf ../oiio-images && mkdir ../oiio-images && pushd ../oiio-images
-#tar --strip-components=1 -xzf %{SOURCE1}
+# Install FindTBB.cmake
+install -pm 0644 %{SOURCE1} src/cmake/modules/


 %build
-rm -rf build/linux && mkdir -p build/linux && pushd build/linux
+mkdir -p build
+pushd build
 # CMAKE_SKIP_RPATH is OK here because it is set to FALSE internally and causes
 # CMAKE_INSTALL_RPATH to be cleared, which is the desiered result.
-%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-       -DCMAKE_SKIP_RPATH:BOOL=TRUE \
+%cmake -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 %{ix86} x86_64 ia64
+       -DUSE_TBB:BOOL=TRUE \
+%else
+       -DUSE_TBB:BOOL=FALSE \
 %endif
-       -DJPEG_INCLUDE_DIR=%{_includedir} \
-       -DOPENJPEG_INCLUDE_DIR=$(pkgconf --variable=includedir libopenjp2) \
-       -DVERBOSE=TRUE \
-       ../../
+       ../src

-%make_build
+make %{?_smp_mflags}


 %install
-pushd build/linux
-%make_install
+pushd build
+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
+# Not all unit tests expected to pass.
+#pushd build && 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
-
-%files utils
-%exclude %{_bindir}/iv
+%doc CHANGES LICENSE
 %{_bindir}/*
-%exclude %{_mandir}/man1/iv.1.gz
-%{_mandir}/man1/*.1.gz
-
-%files iv
-%{_bindir}/iv
-%{_mandir}/man1/iv.1.gz
+%{_libdir}/libOpenImageIO.so.*
+%{python_sitearch}/OpenImageIO.so
+%{_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.
-
-* Mon Apr 02 2018 Richard Shaw <hobbes1069@gmail.com> - 1.8.10-1
- Update to 1.8.10.
-
-* 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
+* Thu Apr 19 2012 Richard Shaw <hobbes1069@gmail.com> - 0.10.8-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
- Update to latest upstream release.
- Add dcmtk to build to enable DICOM plugin.
+* 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
+
+* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* 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.
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (OpenImageIO-1.8.12.tar.gz) = 2475792ff475d34b47b6af5ca71c6cf6d9d8c60452a506b1bf740b9dbb20ea72109117dc9a531b8302095de99f6280172723f26e23dc6e038256cbb43b697145
+0c52da04fad3333f22433bd5d52cd134  OpenImageIO-oiio-Release-0.10.8-0-g1e37127.tar.gz
Author	SHA1	Message	Date
Richard M. Shaw	f3ad525a84	Use qt4-devel instead of qt-devel.	2012-05-02 08:24:14 -05:00
Richard M. Shaw	a8b400e557	Add cmake to BR.	2012-05-01 12:47:01 -05:00
Richard M. Shaw	ace164b823	Update to latest upstream release.	2012-04-19 14:33:29 -05:00
Richard M. Shaw	7625d70cd1	Fix conflicts merging f17.	2012-04-19 14:32:20 -05:00
Richard M. Shaw	7d30ff8a52	Update to latest upstream release.	2012-04-19 13:54:11 -05:00
Dan Horák	99bc46da02	fix build without TBB	2012-04-09 11:54:05 +02:00
Dan Horák	1adb0b9650	fix build without TBB	2012-04-09 11:39:01 +02:00
Richard M. Shaw	70dc38e479	Rebuild for updated Field3D.	2012-03-18 09:22:31 -05:00
Richard M. Shaw	0a89d6f3fa	Rebuild for updated Field3D.	2012-03-18 06:55:55 -05:00
Richard M. Shaw	253dc1531d	Fix libpng-devel build requirement.	2012-03-13 14:27:22 -05:00
Richard M. Shaw	b492f88948	Rebuild for updated Field3D.	2012-03-12 19:03:58 -05:00
Richard M. Shaw	c9a0b1cb4d	Increment release.	2012-03-12 14:06:18 -05:00
Richard M. Shaw	d928445b81	Rebuild for updated Field3D.	2012-03-12 14:05:38 -05:00
Richard M. Shaw	b27abd9077	Update to 0.10.3 Rebuild for libpng 1.5. Fix typo in summary.	2011-11-10 14:49:25 -06:00