Revision: 61862
https://developer.blender.org/rBL61862
Author: jensverwiebe
Date: 2017-04-26 17:44:39 +0200 (Wed, 26 Apr 2017)
Log Message:
-----------
OSX: update osl to 1.7.5 and oiio to 1.7.13
Modified Paths:
--------------
trunk/lib/darwin-9.x.universal/openimageio/LICENSE
trunk/lib/darwin-9.x.universal/openimageio/build.sh
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/array_view.h
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/color.h
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/filesystem.h
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/fmath.h
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/hash.h
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/imagebuf.h
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/imagebufalgo.h
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/imagebufalgo_util.h
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/imagecache.h
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/imageio.h
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/missing_math.h
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/oiioversion.h
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/platform.h
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/refcnt.h
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/simd.h
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/strutil.h
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/sysutil.h
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/texture.h
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/thread.h
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/timer.h
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/typedesc.h
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/unordered_map_concurrent.h
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/ustring.h
trunk/lib/darwin-9.x.universal/openimageio/lib/libOpenImageIO.a
trunk/lib/darwin-9.x.universal/osl/CHANGES
trunk/lib/darwin-9.x.universal/osl/LICENSE
trunk/lib/darwin-9.x.universal/osl/README.md
trunk/lib/darwin-9.x.universal/osl/bin/oslc
trunk/lib/darwin-9.x.universal/osl/bin/oslinfo
trunk/lib/darwin-9.x.universal/osl/doc/osl-languagespec.pdf
trunk/lib/darwin-9.x.universal/osl/include/OSL/oslexec.h
trunk/lib/darwin-9.x.universal/osl/include/OSL/oslversion.h
trunk/lib/darwin-9.x.universal/osl/lib/liboslcomp.a
trunk/lib/darwin-9.x.universal/osl/lib/liboslexec.a
trunk/lib/darwin-9.x.universal/osl/lib/liboslquery.a
trunk/lib/darwin-9.x.universal/osl/shaders/emitter.oso
trunk/lib/darwin-9.x.universal/osl/shaders/glass.oso
trunk/lib/darwin-9.x.universal/osl/shaders/image.oso
trunk/lib/darwin-9.x.universal/osl/shaders/matte.oso
trunk/lib/darwin-9.x.universal/osl/shaders/metal.oso
trunk/lib/darwin-9.x.universal/osl/shaders/oslutil.h
trunk/lib/darwin-9.x.universal/osl/shaders/stdosl.h
trunk/lib/darwin-9.x.universal/osl/shaders/ubersurface.oso
Added Paths:
-----------
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/atomic.h
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/deepdata.h
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/fstream_mingw.h
Removed Paths:
-------------
trunk/lib/darwin-9.x.universal/osl/README
trunk/lib/darwin-9.x.universal/osl/osx_osl_compile.patch
trunk/lib/darwin-9.x.universal/osl/threaded_osl_osx_fix.patch
Modified: trunk/lib/darwin-9.x.universal/openimageio/LICENSE
===================================================================
--- trunk/lib/darwin-9.x.universal/openimageio/LICENSE 2017-04-25 16:03:49 UTC
(rev 61861)
+++ trunk/lib/darwin-9.x.universal/openimageio/LICENSE 2017-04-26 15:44:39 UTC
(rev 61862)
@@ -1,19 +1,20 @@
OpenImageIO and all code, documentation, and other materials contained
therein are:
-Copyright 2008-2014 Larry Gritz et al. All Rights Reserved.
+Copyright 2008-2016 Larry Gritz et al. All Rights Reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
-* Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-* Neither the name of the software's owners nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ * Neither the name of the software's owners nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
Modified: trunk/lib/darwin-9.x.universal/openimageio/build.sh
===================================================================
--- trunk/lib/darwin-9.x.universal/openimageio/build.sh 2017-04-25 16:03:49 UTC
(rev 61861)
+++ trunk/lib/darwin-9.x.universal/openimageio/build.sh 2017-04-26 15:44:39 UTC
(rev 61862)
@@ -2,42 +2,6 @@
LIBDIR=$PWD/../..
-mkdir -p build/macosx_i386
-cd build/macosx_i386
-
-cmake ../.. \
- -DCMAKE_C_COMPILER=clang \
- -DCMAKE_CXX_COMPILER=clang++ \
- -DCMAKE_OSX_ARCHITECTURES="i386" \
- -DCMAKE_INSTALL_PREFIX=$LIBDIR/openimageio/i386 \
- -DCMAKE_OSX_DEPLOYMENT_TARGET=10.6 \
- -DCMAKE_C_FLAGS="${CMAKE_C_FLAGS} -mmacosx-version-min=10.6" \
- -DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.6
-stdlib=libstdc++" \
-
-DCMAKE_OSX_SYSROOT="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform//Developer/SDKs/MacOSX10.9.sdk"
\
- -DILMBASE_HOME=$LIBDIR/openexr \
- -DOPENEXR_HOME=$LIBDIR/openexr \
- -DLINKSTATIC=ON \
- -DBUILDSTATIC=ON \
- -DBOOST_ROOT=$LIBDIR/boost \
- -DPNG_PNG_INCLUDE_DIR=$LIBDIR/png/include \
- -DPNG_LIBRARY=$LIBDIR/png/lib/libpng.a \
- -DJPEG_INCLUDE_DIR=$LIBDIR/jpeg/include \
- -DJPEG_LIBRARY=$LIBDIR/jpeg/lib/libjpeg.a \
- -DTIFF_INCLUDE_DIR=$LIBDIR/tiff/include \
- -DTIFF_LIBRARY=$LIBDIR/tiff/lib/libtiff.a \
- -DUSE_OPENGL=OFF \
- -DUSE_FIELD3D=OFF \
- -DUSE_QT=OFF \
- -DHIDE_SYMBOLS=OFF \
- -DUSE_PYTHON=OFF \
- -DUSE_SIMD=sse2 \
- -DCMAKE_BUILD_TYPE=Release \
- -DOIIO_BUILD_TESTS=OFF
-
-make -j4 install
-
-cd ../..
-
mkdir -p build/macosx_x86_64
cd build/macosx_x86_64
@@ -49,7 +13,7 @@
-DCMAKE_OSX_DEPLOYMENT_TARGET=10.6 \
-DCMAKE_C_FLAGS="${CMAKE_C_FLAGS} -mmacosx-version-min=10.6" \
-DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.6
-stdlib=libstdc++" \
-
-DCMAKE_OSX_SYSROOT="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk"
\
+
-DCMAKE_OSX_SYSROOT="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk"
\
-DILMBASE_HOME=$LIBDIR/openexr \
-DOPENEXR_HOME=$LIBDIR/openexr \
-DLINKSTATIC=ON \
@@ -64,12 +28,13 @@
-DUSE_OPENGL=OFF \
-DUSE_FIELD3D=OFF \
-DUSE_QT=OFF \
+ -DUSE_CPP11=OFF \
-DHIDE_SYMBOLS=OFF \
-DUSE_PYTHON=OFF \
-DCMAKE_BUILD_TYPE=Release \
-DOIIO_BUILD_TESTS=OFF
-make -j4 install
+make -j12 install
cd ../..
@@ -76,5 +41,5 @@
mkdir -p ../lib
-lipo -create ../i386/lib/libOpenImageIO.a ../x86_64/lib/libOpenImageIO.a
-output ../lib/libOpenImageIO.a
+cp ../x86_64/lib/libOpenImageIO.a ../lib/
cp -r ../x86_64/include ../
Modified:
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/array_view.h
===================================================================
--- trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/array_view.h
2017-04-25 16:03:49 UTC (rev 61861)
+++ trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/array_view.h
2017-04-26 15:44:39 UTC (rev 61862)
@@ -147,6 +147,13 @@
DASSERT (Rank == 1);
}
+#if OIIO_CPLUSPLUS_VERSION >= 11
+ /// Construct an array_view from an initializer_list.
+ constexpr array_view (std::initializer_list<T> il)
+ : array_view (il.begin(), il.size())
+ { }
+#endif
+
// assignments
array_view& operator= (const array_view ©) {
m_data = copy.data();
@@ -271,6 +278,13 @@
DASSERT (Rank == 1);
}
+#if OIIO_CPLUSPLUS_VERSION >= 11
+ /// Construct an array_view from an initializer_list.
+ constexpr array_view_strided (std::initializer_list<T> il)
+ : array_view_strided (il.begin(), il.size())
+ { }
+#endif
+
// assignments
array_view_strided& operator= (const array_view_strided ©) {
m_data = copy.data();
Added: trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/atomic.h
===================================================================
--- trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/atomic.h
(rev 0)
+++ trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/atomic.h
2017-04-26 15:44:39 UTC (rev 61862)
@@ -0,0 +1,570 @@
+/*
+ Copyright 2008 Larry Gritz and the other authors and contributors.
+ All Rights Reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ * Neither the name of the software's owners nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ (This is the Modified BSD License)
+*/
+
+
+/////////////////////////////////////////////////////////////////////////
+/// @file atomic.h
+///
+/// @brief Wrappers and utilities for atomics.
+/////////////////////////////////////////////////////////////////////////
+
+
+#ifndef OPENIMAGEIO_ATOMIC_H
+#define OPENIMAGEIO_ATOMIC_H
+
+#include "oiioversion.h"
+#include "platform.h"
+
+
+#if defined(_MSC_VER)
+ // N.B. including platform.h also included <windows.h>
+# pragma intrinsic (_InterlockedExchangeAdd)
+# pragma intrinsic (_InterlockedCompareExchange)
+# pragma intrinsic (_InterlockedCompareExchange64)
+# if defined(_WIN64)
+# pragma intrinsic(_InterlockedExchangeAdd64)
+# endif
+// InterlockedExchangeAdd64 & InterlockedExchange64 are not available for XP
+# if defined(_WIN32_WINNT) && _WIN32_WINNT <= 0x0501
+inline long long
+InterlockedExchangeAdd64 (volatile long long *Addend, long long Value)
+{
+ long long Old;
+ do {
+ Old = *Addend;
+ } while (_InterlockedCompareExchange64(Addend, Old + Value, Old) != Old);
+ return Old;
+}
+
+inline long long
+InterlockedExchange64 (volatile long long *Target, long long Value)
+{
+ long long Old;
+ do {
+ Old = *Target;
+ } while (_InterlockedCompareExchange64(Target, Value, Old) != Old);
+ return Old;
+}
+# endif
+#endif
+
+#if defined(__GNUC__) && (defined(_GLIBCXX_ATOMIC_BUILTINS) || (__GNUC__ * 100
+ __GNUC_MINOR__ >= 401))
+# define USE_GCC_ATOMICS
+# if !defined(__clang__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 408)
+# define OIIO_USE_GCC_NEW_ATOMICS
+# endif
+#endif
+
+
+OIIO_NAMESPACE_BEGIN
+
+#if OIIO_USE_STDATOMIC
+using std::memory_order;
+#else
+enum memory_order {
+#if defined(OIIO_USE_GCC_NEW_ATOMICS)
+ memory_order_relaxed = __ATOMIC_RELAXED,
+ memory_order_consume = __ATOMIC_CONSUME,
+ memory_order_acquire = __ATOMIC_ACQUIRE,
+ memory_order_release = __ATOMIC_RELEASE,
+ memory_order_acq_rel = __ATOMIC_ACQ_REL,
+ memory_order_seq_cst = __ATOMIC_SEQ_CST
+#else
+ memory_order_relaxed,
+ memory_order_consume,
+ memory_order_acquire,
+ memory_order_release,
+ memory_order_acq_rel,
+ memory_order_seq_cst
+#endif
+};
+#endif
+
+/// Atomic version of: r = *at, *at += x, return r
+/// For each of several architectures.
+inline int
+atomic_exchange_and_add (volatile int *at, int x,
+ memory_order order = memory_order_seq_cst)
+{
+#ifdef NOTHREADS
+ int r = *at; *at += x; return r;
+#elif defined(OIIO_USE_GCC_NEW_ATOMICS)
+ return __atomic_fetch_add (at, x, order);
+#elif defined(USE_GCC_ATOMICS)
+ return __sync_fetch_and_add ((int *)at, x);
+#elif defined(_MSC_VER)
+ // Windows
+ return _InterlockedExchangeAdd ((volatile LONG *)at, x);
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
