From b0efb546488d8c605b0f2133bedc1d69143e02a2 Mon Sep 17 00:00:00 2001 From: "Richard M. Shaw" Date: Mon, 19 May 2014 21:37:20 -0500 Subject: [PATCH] Update to latest upstream release. --- .gitignore | 1 + FindTBB.cmake | 283 ------------------------------------------ OpenImageIO.spec | 39 +++--- oiio-spin_mutex.patch | 81 ------------ sources | 2 +- 5 files changed, 25 insertions(+), 381 deletions(-) delete mode 100644 FindTBB.cmake delete mode 100644 oiio-spin_mutex.patch diff --git a/.gitignore b/.gitignore index 5be3a4d..2b05461 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ 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.14.tar.gz diff --git a/FindTBB.cmake b/FindTBB.cmake deleted file mode 100644 index f9e3e0f..0000000 --- a/FindTBB.cmake +++ /dev/null @@ -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 -# Improvements by Gino van den Bergen , -# Florian Uhlig , -# Jiri Marsik - -# 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) diff --git a/OpenImageIO.spec b/OpenImageIO.spec index 14f8649..198a116 100644 --- a/OpenImageIO.spec +++ b/OpenImageIO.spec @@ -1,26 +1,26 @@ +%global subname oiio + %if 0%{?rhel} %global cmake %cmake28 %endif Name: OpenImageIO -Version: 1.2.3 -Release: 3%{?dist} +Version: 1.3.14 +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}/%{subname}/archive/Release-%{version}/%{subname}-Release-%{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 %if 0%{?rhel} BuildRequires: cmake28 @@ -33,7 +33,7 @@ BuildRequires: boost-devel BuildRequires: glew-devel BuildRequires: OpenEXR-devel ilmbase-devel BuildRequires: python2-devel -BuildRequires: libpng-devel libtiff-devel openjpeg-devel +BuildRequires: libpng-devel libtiff-devel openjpeg-devel giflib-devel %if 0%{?!rhel} BuildRequires: libwebp-devel BuildRequires: Field3D-devel @@ -42,6 +42,10 @@ BuildRequires: hdf5-devel BuildRequires: zlib-devel BuildRequires: jasper-devel BuildRequires: pugixml-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 @@ -64,16 +68,16 @@ classes, utilities, and applications. Main features include: %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 @@ -95,11 +99,7 @@ Development files for package %{name} %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/ +#patch3 -p1 -b .cmake # Remove bundled pugixml rm -f src/include/pugixml.hpp \ @@ -129,7 +129,7 @@ rm -rf build/linux && mkdir -p build/linux && pushd build/linux -DNOTHREADS:BOOL=TRUE \ %endif -DVERBOSE=TRUE \ - ../../src + ../../ make %{?_smp_mflags} @@ -140,7 +140,7 @@ make DESTDIR=%{buildroot} install # Move man pages to the right directory mkdir -p %{buildroot}%{_mandir}/man1 -cp -a doc/*.1 %{buildroot}%{_mandir}/man1 +cp -a src/doc/*.1 %{buildroot}%{_mandir}/man1 %post -p /sbin/ldconfig @@ -174,6 +174,13 @@ cp -a doc/*.1 %{buildroot}%{_mandir}/man1 %changelog +* Mon May 19 2014 Richard Shaw - 1.3.14-1 +- Update to latest upstream release. + +* Tue Jan 7 2014 Richard Shaw - 1.3.10-1 +- Update to latest upstream release. +- Add libgif as build requirement. + * Wed Nov 27 2013 Rex Dieter - 1.2.3-3 - rebuild (openexr) diff --git a/oiio-spin_mutex.patch b/oiio-spin_mutex.patch deleted file mode 100644 index d1c5ac9..0000000 --- a/oiio-spin_mutex.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 77fd2276e12791dc17cb20526cd371d66140e416 Mon Sep 17 00:00:00 2001 -From: Larry Gritz -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 *a = (atomic *)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 *a = (atomic *)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 *a = (atomic *)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 *a = (atomic *)at; --- -1.8.4 - diff --git a/sources b/sources index 402602a..f742fb3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -abb6534f9b9b5540c0113e8cde95e427 oiio-Release-1.2.3.tar.gz +8ac7e534a48bb5387f603e079e4079be oiio-Release-1.3.14.tar.gz