[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53766] trunk/lib/mingw64/openimageio: OpenImageIO 1.1 for MinGW64

Antony Riakiotakis kalast at gmail.com
Sun Jan 13 14:03:22 CET 2013


Revision: 53766
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53766
Author:   psy-fi
Date:     2013-01-13 13:03:17 +0000 (Sun, 13 Jan 2013)
Log Message:
-----------
OpenImageIO 1.1 for MinGW64

Modified Paths:
--------------
    trunk/lib/mingw64/openimageio/include/OpenImageIO/argparse.h
    trunk/lib/mingw64/openimageio/include/OpenImageIO/color.h
    trunk/lib/mingw64/openimageio/include/OpenImageIO/errorhandler.h
    trunk/lib/mingw64/openimageio/include/OpenImageIO/export.h
    trunk/lib/mingw64/openimageio/include/OpenImageIO/filesystem.h
    trunk/lib/mingw64/openimageio/include/OpenImageIO/filter.h
    trunk/lib/mingw64/openimageio/include/OpenImageIO/fmath.h
    trunk/lib/mingw64/openimageio/include/OpenImageIO/hash.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/osdep.h
    trunk/lib/mingw64/openimageio/include/OpenImageIO/paramlist.h
    trunk/lib/mingw64/openimageio/include/OpenImageIO/plugin.h
    trunk/lib/mingw64/openimageio/include/OpenImageIO/pugiconfig.hpp
    trunk/lib/mingw64/openimageio/include/OpenImageIO/strutil.h
    trunk/lib/mingw64/openimageio/include/OpenImageIO/sysutil.h
    trunk/lib/mingw64/openimageio/include/OpenImageIO/texture.h
    trunk/lib/mingw64/openimageio/include/OpenImageIO/thread.h
    trunk/lib/mingw64/openimageio/include/OpenImageIO/timer.h
    trunk/lib/mingw64/openimageio/include/OpenImageIO/typedesc.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-MinGW32-compilation.patch
    trunk/lib/mingw64/openimageio/0001-More-MinGW-fixes-redefinition-fix-needed-for-strict-.patch

Removed Paths:
-------------
    trunk/lib/mingw64/openimageio/0001-changes-for-mingw64.patch

Added: trunk/lib/mingw64/openimageio/0001-Changes-for-MinGW32-compilation.patch
===================================================================
--- trunk/lib/mingw64/openimageio/0001-Changes-for-MinGW32-compilation.patch	                        (rev 0)
+++ trunk/lib/mingw64/openimageio/0001-Changes-for-MinGW32-compilation.patch	2013-01-13 13:03:17 UTC (rev 53766)
@@ -0,0 +1,540 @@
+From 6096f420306e15f7be60ba512464811139f863e4 Mon Sep 17 00:00:00 2001
+From: Antony Riakiotakis <kalast at gmail.com>
+Date: Mon, 3 Dec 2012 03:00:38 +0200
+Subject: [PATCH] Changes for MinGW32 compilation
+
+---
+ src/CMakeLists.txt                   | 88 ++++++++++++++++++------------------
+ src/cmake/externalpackages.cmake     |  4 +-
+ src/include/fmath.h                  |  5 +-
+ src/include/thread.h                 |  1 +
+ src/libOpenImageIO/CMakeLists.txt    | 82 +++++++++++++++++----------------
+ 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/libtexture/texturesys.cpp        |  1 +
+ src/libutil/argparse.cpp             |  1 +
+ src/libutil/filesystem.cpp           |  8 ++--
+ src/libutil/plugin.cpp               |  2 +-
+ src/libutil/sysutil.cpp              |  2 +-
+ src/ptex.imageio/ptex/PtexCache.cpp  | 21 ++++++---
+ src/ptex.imageio/ptex/PtexPlatform.h |  7 +++
+ src/rla.imageio/rlaoutput.cpp        |  1 +
+ 18 files changed, 129 insertions(+), 99 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 86c0b76..20fbb61 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -241,14 +241,14 @@ include (CTest)
+ # Tell CMake to process the sub-directories
+ add_subdirectory (libOpenImageIO)
+ 
+-add_subdirectory (iconvert)
+-add_subdirectory (idiff)
+-add_subdirectory (igrep)
+-add_subdirectory (iinfo)
+-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 (maketx)
++#add_subdirectory (oiiotool)
++#add_subdirectory (testtex)
++#add_subdirectory (iv)
+ # Add IO plugin directories
+ if (NOT EMBEDPLUGINS)
+     add_subdirectory (bmp.imageio)
+@@ -311,52 +311,52 @@ 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 misnamed-file nonwhole-tiles
+-                oiiotool oiiotool-composite oiiotool-fixnan 
+-                perchannel
+-                sgi rla psd dpx png
+-                texture-blurtube texture-fill texture-filtersize
+-                texture-gray texture-grid
+-                texture-missing texture-overscan
+-                texture-pointsample texture-width0blur texture-res
+-                texture-skinny texture-fat
+-               )
++#oiio_add_tests (ico gpsread misnamed-file nonwhole-tiles
++#                oiiotool oiiotool-composite oiiotool-fixnan 
++#                perchannel
++#                sgi rla psd dpx png
++#                texture-blurtube texture-fill texture-filtersize
++#                texture-gray texture-grid
++#                texture-missing texture-overscan
++#                texture-pointsample texture-width0blur texture-res
++#                texture-skinny texture-fat
++#               )
+ 
+ 
+ # 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 openexr-v2
+-    IMAGEDIR openexr-images
+-    URL http://www.openexr.com/downloads.html)
++#oiio_add_tests (openexr-suite openexr-multires openexr-chroma openexr-v2
++#    IMAGEDIR openexr-images
++#    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)
+ 
+-oiio_add_tests (texture-field3d
+-    FOUNDVAR FIELD3D_FOUND)
++#oiio_add_tests (texture-field3d
++#    FOUNDVAR FIELD3D_FOUND)
+ 
+ 
+ #########################################################################
+@@ -390,7 +390,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 1a08381..02bfb83 100644
+--- a/src/cmake/externalpackages.cmake
++++ b/src/cmake/externalpackages.cmake
+@@ -91,7 +91,7 @@ endmacro ()
+ 
+ message (STATUS "BOOST_ROOT ${BOOST_ROOT}")
+ 
+-set (Boost_ADDITIONAL_VERSIONS "1.49" "1.48" "1.47" "1.46" "1.45" "1.44" 
++set (Boost_ADDITIONAL_VERSIONS "1.51" "1.50" "1.49" "1.48" "1.47" "1.46" "1.45" "1.44" 
+                                "1.43" "1.43.0" "1.42" "1.42.0" 
+                                "1.41" "1.41.0" "1.40" "1.40.0")
+ if (LINKSTATIC)
+@@ -149,6 +149,8 @@ else ()
+     endif ()
+ endif ()
+ 
++add_definitions("-DBOOST_ALL_NO_LIB -DBOOST_THREAD_USE_LIB")
++
+ if (VERBOSE)
+     message (STATUS "Boost found ${Boost_FOUND} ")
+     message (STATUS "Boost version      ${Boost_VERSION}")
+diff --git a/src/include/fmath.h b/src/include/fmath.h
+index 45067f9..ad00bb1 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
++#ifdef __GNUC__
+  using std::isnan;
+  using std::isinf;
+  using std::isfinite;
+diff --git a/src/include/thread.h b/src/include/thread.h
+index 5682f9b..a956816 100644
+--- a/src/include/thread.h
++++ b/src/include/thread.h
+@@ -98,6 +98,7 @@
+ #endif
+ 
+ #if defined(__GNUC__) && (defined(_GLIBCXX_ATOMIC_BUILTINS) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 401))
++#include <sched.h>
+ #if !defined(__FreeBSD__) || defined(__x86_64__)
+ #define USE_GCC_ATOMICS
+ #endif
+diff --git a/src/libOpenImageIO/CMakeLists.txt b/src/libOpenImageIO/CMakeLists.txt
+index bd5dbe3..9c4c297 100644
+--- a/src/libOpenImageIO/CMakeLists.txt
++++ b/src/libOpenImageIO/CMakeLists.txt
+@@ -264,59 +264,61 @@ 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 (imagebuf_test imagebuf_test.cpp)
+-link_ilmbase (imagebuf_test)
+-target_link_libraries (imagebuf_test OpenImageIO ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})
+-add_test (unit_imagebuf imagebuf_test)
++#add_executable (imagebuf_test imagebuf_test.cpp)
++#link_ilmbase (imagebuf_test)
++#target_link_libraries (imagebuf_test OpenImageIO ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})
++#add_test (unit_imagebuf imagebuf_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 (unit_imagebufalgo 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 (unit_imagebufalgo imagebufalgo_test)
+ 
+ 
+-add_executable (atomic_test atomic_test.cpp)
+-target_link_libraries (atomic_test OpenImageIO ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})
+-add_test (unit_atomic atomic_test)
++#add_executable (atomic_test atomic_test.cpp)
++#target_link_libraries (atomic_test OpenImageIO ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})
++#add_test (unit_atomic atomic_test)
+ 
+-add_executable (spinlock_test spinlock_test.cpp)
+-target_link_libraries (spinlock_test OpenImageIO ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})
+-add_test (unit_spinlock spinlock_test)
++#add_executable (spinlock_test spinlock_test.cpp)
++#target_link_libraries (spinlock_test OpenImageIO ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})
++#add_test (unit_spinlock spinlock_test)
+ 
+-add_executable (spin_rw_test spin_rw_test.cpp)
+-target_link_libraries (spin_rw_test OpenImageIO ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})
+-add_test (unit_spin_rw spin_rw_test)
++#add_executable (spin_rw_test spin_rw_test.cpp)
++#target_link_libraries (spin_rw_test OpenImageIO ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list