[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48647] trunk/lib/mingw64/openimageio: update OIIO to revision 9c8963e3fe35f76c945ce9e5fb505610e99b4ab9 for MinGW64
Antony Riakiotakis
kalast at gmail.com
Thu Jul 5 15:27:13 CEST 2012
Revision: 48647
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48647
Author: psy-fi
Date: 2012-07-05 13:27:13 +0000 (Thu, 05 Jul 2012)
Log Message:
-----------
update OIIO to revision 9c8963e3fe35f76c945ce9e5fb505610e99b4ab9 for MinGW64
Modified Paths:
--------------
trunk/lib/mingw64/openimageio/include/OpenImageIO/argparse.h
trunk/lib/mingw64/openimageio/include/OpenImageIO/errorhandler.h
trunk/lib/mingw64/openimageio/include/OpenImageIO/filesystem.h
trunk/lib/mingw64/openimageio/include/OpenImageIO/imagebuf.h
trunk/lib/mingw64/openimageio/include/OpenImageIO/imagebufalgo.h
trunk/lib/mingw64/openimageio/include/OpenImageIO/imagecache.h
trunk/lib/mingw64/openimageio/include/OpenImageIO/imageio.h
trunk/lib/mingw64/openimageio/include/OpenImageIO/strutil.h
trunk/lib/mingw64/openimageio/include/OpenImageIO/texture.h
trunk/lib/mingw64/openimageio/include/OpenImageIO/ustring.h
trunk/lib/mingw64/openimageio/include/OpenImageIO/version.h
trunk/lib/mingw64/openimageio/lib/libOpenImageIO.a
Added Paths:
-----------
trunk/lib/mingw64/openimageio/0001-changes-for-mingw64.patch
trunk/lib/mingw64/openimageio/include/OpenImageIO/tinyformat.h
Removed Paths:
-------------
trunk/lib/mingw64/openimageio/0001-Changes-to-make-the-library-compile-against-MinGW-w6.patch
Deleted: trunk/lib/mingw64/openimageio/0001-Changes-to-make-the-library-compile-against-MinGW-w6.patch
===================================================================
--- trunk/lib/mingw64/openimageio/0001-Changes-to-make-the-library-compile-against-MinGW-w6.patch 2012-07-05 13:25:47 UTC (rev 48646)
+++ trunk/lib/mingw64/openimageio/0001-Changes-to-make-the-library-compile-against-MinGW-w6.patch 2012-07-05 13:27:13 UTC (rev 48647)
@@ -1,421 +0,0 @@
-From e4f41228f83537797c9f6fed72e1ed063734316a Mon Sep 17 00:00:00 2001
-From: Antony Riakiotakis <kalast at gmail.com>
-Date: Thu, 5 Jul 2012 13:38:47 +0300
-Subject: [PATCH] Changes to make the library compile against MinGW-w64
-
----
- src/CMakeLists.txt | 82 +++++++++++++++++-----------------
- src/cmake/externalpackages.cmake | 2 +
- src/include/fmath.h | 5 +-
- src/libOpenImageIO/CMakeLists.txt | 58 ++++++++++++------------
- src/libOpenImageIO/exif.cpp | 1 +
- src/libOpenImageIO/imagebufalgo.cpp | 1 +
- src/libOpenImageIO/imageinput.cpp | 1 +
- src/libtexture/imagecache.cpp | 1 +
- src/libtexture/texoptions.cpp | 1 +
- src/libutil/plugin.cpp | 3 +-
- src/libutil/sysutil.cpp | 2 +-
- src/ptex.imageio/ptex/PtexCache.cpp | 21 ++++++---
- src/ptex.imageio/ptex/PtexPlatform.h | 5 ++
- src/rla.imageio/rlainput.cpp | 1 +
- 14 files changed, 105 insertions(+), 79 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index f7e7430..f3ffa69 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -181,15 +181,15 @@ endif (MSVC)
- # Tell CMake to process the sub-directories
- add_subdirectory (libOpenImageIO)
-
--add_subdirectory (iconvert)
--add_subdirectory (idiff)
--add_subdirectory (igrep)
--add_subdirectory (iinfo)
--add_subdirectory (iprocess)
--add_subdirectory (maketx)
--add_subdirectory (oiiotool)
--add_subdirectory (testtex)
--add_subdirectory (iv)
-+#add_subdirectory (iconvert)
-+#add_subdirectory (idiff)
-+#add_subdirectory (igrep)
-+#add_subdirectory (iinfo)
-+#add_subdirectory (iprocess)
-+#add_subdirectory (maketx)
-+#add_subdirectory (oiiotool)
-+#add_subdirectory (testtex)
-+#add_subdirectory (iv)
- # Add IO plugin directories
- if (NOT EMBEDPLUGINS)
- add_subdirectory (bmp.imageio)
-@@ -252,47 +252,47 @@ if (DEFINED CMAKE_VERSION AND NOT CMAKE_VERSION VERSION_LESS 2.8)
- endif()
-
- # List all the individual testsuite tests here:
--oiio_add_tests (ico gpsread oiiotool oiiotool-fixnan
-- sgi rla psd dpx
-- texture-fill texture-gray texture-grid
-- texture-missing texture-overscan
-- texture-pointsample texture-res
-- texture-skinny texture-fat
-- texture-field3d
-- )
-+#oiio_add_tests (ico gpsread oiiotool oiiotool-fixnan
-+# sgi rla psd dpx
-+# texture-fill texture-gray texture-grid
-+# texture-missing texture-overscan
-+# texture-pointsample texture-res
-+# texture-skinny texture-fat
-+# texture-field3d
-+# )
-
-
- # List testsuites which need special external reference images from the web
- # here:
--oiio_add_tests (bmp
-- IMAGEDIR bmpsuite
-- URL http://entropymine.com/jason/bmpsuite/bmpsuite.zip)
-+#oiio_add_tests (bmp
-+# IMAGEDIR bmpsuite
-+# URL http://entropymine.com/jason/bmpsuite/bmpsuite.zip)
-
--oiio_add_tests (tiff-suite tiff-depths
-- IMAGEDIR libtiffpic
-- URL http://www.remotesensing.org/libtiff/images.html)
-+#oiio_add_tests (tiff-suite tiff-depths
-+# IMAGEDIR libtiffpic
-+# URL http://www.remotesensing.org/libtiff/images.html)
-
--oiio_add_tests (openexr-suite openexr-multires openexr-chroma
-- IMAGEDIR openexr-images-1.5.0
-- URL http://www.openexr.com/downloads.html)
-+#oiio_add_tests (openexr-suite openexr-multires openexr-chroma
-+# IMAGEDIR openexr-images-1.5.0
-+# URL http://www.openexr.com/downloads.html)
-
--oiio_add_tests (jpeg2000
-- FOUNDVAR OPENJPEG_FOUND
-- IMAGEDIR j2kp4files_v1_5
-- URL http://www.itu.int/net/ITU-T/sigdb/speimage/ImageForm-s.aspx?val=10100803)
-+#oiio_add_tests (jpeg2000
-+# FOUNDVAR OPENJPEG_FOUND
-+# IMAGEDIR j2kp4files_v1_5
-+# URL http://www.itu.int/net/ITU-T/sigdb/speimage/ImageForm-s.aspx?val=10100803)
-
--oiio_add_tests (targa-tgautils
-- IMAGEDIR TGAUTILS
-- URL http://tgautils.inequation.org/)
-+#oiio_add_tests (targa-tgautils
-+# IMAGEDIR TGAUTILS
-+# URL http://tgautils.inequation.org/)
-
--oiio_add_tests (fits
-- IMAGEDIR fits-images
-- URL http://www.cv.nrao.edu/fits/data/tests/)
-+#oiio_add_tests (fits
-+# IMAGEDIR fits-images
-+# URL http://www.cv.nrao.edu/fits/data/tests/)
-
--oiio_add_tests (webp
-- FOUNDVAR WEBP_FOUND
-- IMAGEDIR webp-images
-- URL http://code.google.com/speed/webp/gallery.html)
-+#oiio_add_tests (webp
-+# FOUNDVAR WEBP_FOUND
-+# IMAGEDIR webp-images
-+# URL http://code.google.com/speed/webp/gallery.html)
-
-
- #########################################################################
-@@ -326,7 +326,7 @@ if (WIN32)
- set(CPACK_PACKAGE_EXECUTABLES "iv" "iv - Image Viewer")
- # set(CPACK_CREATE_DESCTOP_LINKS "iv" "iv - Image Viewer")
- set(CPACK_NSIS_MODIFY_PATH ON)
-- add_dll_files ()
-+# add_dll_files ()
- include (InstallRequiredSystemLibraries)
- endif ()
- set (CPACK_SOURCE_PACKAGE_FILE_NAME OpenImageIO-${OIIO_VERSION_MAJOR}.${OIIO_VERSION_MINOR}.${OIIO_VERSION_PATCH}-source)
-diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake
-index ad538b4..2ef1824 100644
---- a/src/cmake/externalpackages.cmake
-+++ b/src/cmake/externalpackages.cmake
-@@ -140,6 +140,8 @@ else ()
- endif ()
- endif ()
-
-+add_definitions("-DBOOST_ALL_NO_LIB -DBOOST_THREAD_USE_LIB")
-+
- message (STATUS "Boost found ${Boost_FOUND} ")
- message (STATUS "Boost version ${Boost_VERSION}")
- message (STATUS "Boost include dirs ${Boost_INCLUDE_DIRS}")
-diff --git a/src/include/fmath.h b/src/include/fmath.h
-index 46c7035..c20d985 100644
---- a/src/include/fmath.h
-+++ b/src/include/fmath.h
-@@ -46,6 +46,7 @@
- #include <limits>
- #include <typeinfo>
- #include <algorithm>
-+#include <float.h>
-
- #if defined(_MSC_VER) && _MSC_VER < 1600
- typedef __int8 int8_t;
-@@ -838,7 +839,7 @@ inline float degrees (float rad) { return rad * (float)(180.0 / M_PI); }
-
-
-
--#ifdef _WIN32
-+#if defined(_WIN32) && !defined(__GNUC__)
- // Windows doesn't define these functions from math.h
- #define hypotf _hypotf
- #define copysign(x,y) _copysign(x,y)
-@@ -963,7 +964,7 @@ truncf(float val)
-
-
- // Some systems have isnan, isinf and isfinite in the std namespace.
--#ifndef WIN32
-+#if defined(_WIN32)
- using std::isnan;
- using std::isinf;
- using std::isfinite;
-diff --git a/src/libOpenImageIO/CMakeLists.txt b/src/libOpenImageIO/CMakeLists.txt
-index ad3dfed..b94de21 100644
---- a/src/libOpenImageIO/CMakeLists.txt
-+++ b/src/libOpenImageIO/CMakeLists.txt
-@@ -248,42 +248,44 @@ oiio_install_targets (OpenImageIO)
- if (NOT LINKSTATIC)
- add_definitions (-DBOOST_TEST_DYN_LINK)
- add_definitions (-DPTEX_EXPORTS)
-+else ()
-+ add_definitions (-DPTEX_STATIC)
- endif ()
-
--add_executable (imagebufalgo_test imagebufalgo_test.cpp)
--link_ilmbase (imagebufalgo_test)
--target_link_libraries (imagebufalgo_test OpenImageIO ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})
--add_test (imagebufalgo ${CMAKE_BINARY_DIR}/libOpenImageIO/imagebufalgo_test)
-+#add_executable (imagebufalgo_test imagebufalgo_test.cpp)
-+#link_ilmbase (imagebufalgo_test)
-+#target_link_libraries (imagebufalgo_test OpenImageIO ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})
-+#add_test (imagebufalgo ${CMAKE_BINARY_DIR}/libOpenImageIO/imagebufalgo_test)
-
-
--add_executable (atomic_test atomic_test.cpp)
--target_link_libraries (atomic_test OpenImageIO ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})
--add_test (unit_atomic ${CMAKE_BINARY_DIR}/libOpenImageIO/atomic_test)
-+#add_executable (atomic_test atomic_test.cpp)
-+#target_link_libraries (atomic_test OpenImageIO ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})
-+#add_test (unit_atomic ${CMAKE_BINARY_DIR}/libOpenImageIO/atomic_test)
-
--add_executable (spinlock_test spinlock_test.cpp)
--target_link_libraries (spinlock_test OpenImageIO ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})
--add_test (unit_spinlock ${CMAKE_BINARY_DIR}/libOpenImageIO/spinlock_test)
-+#add_executable (spinlock_test spinlock_test.cpp)
-+#target_link_libraries (spinlock_test OpenImageIO ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})
-+#add_test (unit_spinlock ${CMAKE_BINARY_DIR}/libOpenImageIO/spinlock_test)
-
--add_executable (ustring_test ustring_test.cpp)
--target_link_libraries (ustring_test OpenImageIO ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})
--add_test (unit_ustring ${CMAKE_BINARY_DIR}/libOpenImageIO/ustring_test)
-+#add_executable (ustring_test ustring_test.cpp)
-+#target_link_libraries (ustring_test OpenImageIO ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})
-+#add_test (unit_ustring ${CMAKE_BINARY_DIR}/libOpenImageIO/ustring_test)
-
--add_executable (imagespec_test imagespec_test.cpp)
--target_link_libraries (imagespec_test OpenImageIO ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})
--add_test (unit_imagespec ${CMAKE_BINARY_DIR}/libOpenImageIO/imagespec_test)
-+#add_executable (imagespec_test imagespec_test.cpp)
-+#target_link_libraries (imagespec_test OpenImageIO ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})
-+#add_test (unit_imagespec ${CMAKE_BINARY_DIR}/libOpenImageIO/imagespec_test)
-
--add_executable (strutil_test strutil_test.cpp)
--target_link_libraries (strutil_test OpenImageIO ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})
--add_test (unit_strutil ${CMAKE_BINARY_DIR}/libOpenImageIO/strutil_test)
-+#add_executable (strutil_test strutil_test.cpp)
-+#target_link_libraries (strutil_test OpenImageIO ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})
-+#add_test (unit_strutil ${CMAKE_BINARY_DIR}/libOpenImageIO/strutil_test)
-
--add_executable (fmath_test fmath_test.cpp)
--target_link_libraries (fmath_test OpenImageIO ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})
--add_test (unit_fmath ${CMAKE_BINARY_DIR}/libOpenImageIO/fmath_test)
-+#add_executable (fmath_test fmath_test.cpp)
-+#target_link_libraries (fmath_test OpenImageIO ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})
-+#add_test (unit_fmath ${CMAKE_BINARY_DIR}/libOpenImageIO/fmath_test)
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list