Hello community, here is the log from the commit of package ilmbase for openSUSE:Factory checked in at 2013-11-27 15:30:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ilmbase (Old) and /work/SRC/openSUSE:Factory/.ilmbase.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ilmbase" Changes: -------- --- /work/SRC/openSUSE:Factory/ilmbase/ilmbase.changes 2013-07-16 16:34:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ilmbase.new/ilmbase.changes 2013-11-27 15:30:41.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Nov 27 08:40:48 UTC 2013 - [email protected] + +- update to 2.1.0 + * Bumped version to track OpenEXR + (Piotr Stanczyk) +- small cleanup of spec file + +------------------------------------------------------------------- Old: ---- ilmbase-2.0.1.tar.gz ilmbase-2.0.1.tar.gz.sig New: ---- ilmbase-2.1.0.tar.gz ilmbase-2.1.0.tar.gz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ilmbase.spec ++++++ --- /var/tmp/diff_new_pack.GNwUZ4/_old 2013-11-27 15:30:43.000000000 +0100 +++ /var/tmp/diff_new_pack.GNwUZ4/_new 2013-11-27 15:30:43.000000000 +0100 @@ -16,16 +16,14 @@ # -%global so_suffix -2_0-10 +%global so_suffix -2_1-11 Name: ilmbase -BuildRequires: gcc-c++ -BuildRequires: pkg-config +Version: 2.1.0 +Release: 0 Summary: Base library for ILM software (OpenEXR) License: BSD-3-Clause Group: Development/Libraries/C and C++ -Version: 2.0.1 -Release: 0 Url: http://www.openexr.com BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: http://download.savannah.nongnu.org/releases/openexr/%{name}-%{version}.tar.gz @@ -59,7 +57,7 @@ * Iex is an exception-handling library. %package devel -Requires: libHalf10 +Requires: libHalf11 Requires: libIex%{so_suffix} Requires: libIexMath%{so_suffix} Requires: libIlmThread%{so_suffix} @@ -78,7 +76,7 @@ Devel files for ilmbase Base library for Industrial Light & Magic software (OpenEXR). -%files -n ilmbase-devel +%files devel %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING NEWS README* %{_includedir}/OpenEXR @@ -89,19 +87,19 @@ %_libdir/libIexMath.so %_libdir/pkgconfig/IlmBase.pc -%package -n libHalf10 +%package -n libHalf11 Summary: Base library for ILM software (OpenEXR) License: BSD-3-Clause Group: Development/Libraries/C and C++ -%description -n libHalf10 +%description -n libHalf11 %{summary}. -%post -n libHalf10 -p /sbin/ldconfig +%post -n libHalf11 -p /sbin/ldconfig -%postun -n libHalf10 -p /sbin/ldconfig +%postun -n libHalf11 -p /sbin/ldconfig -%files -n libHalf10 +%files -n libHalf11 %defattr(-,root,root,-) %{_libdir}/libHalf.so.* ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.GNwUZ4/_old 2013-11-27 15:30:43.000000000 +0100 +++ /var/tmp/diff_new_pack.GNwUZ4/_new 2013-11-27 15:30:43.000000000 +0100 @@ -1,6 +1,6 @@ -libHalf10 -libImath-2_0-10 -libIlmThread-2_0-10 -libIexMath-2_0-10 -libIex-2_0-10 +libHalf11 +libImath-2_1-11 +libIlmThread-2_1-11 +libIexMath-2_1-11 +libIex-2_1-11 ++++++ ilmbase-2.0.1.tar.gz -> ilmbase-2.1.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ilmbase-2.0.1/CMakeLists.txt new/ilmbase-2.1.0/CMakeLists.txt --- old/ilmbase-2.0.1/CMakeLists.txt 2013-06-18 21:51:38.000000000 +0200 +++ new/ilmbase-2.1.0/CMakeLists.txt 2013-11-12 00:09:51.000000000 +0100 @@ -1,7 +1,24 @@ # [email protected] CMAKE_MINIMUM_REQUIRED(VERSION 2.8) -PROJECT ( ILMBase ) +PROJECT ( ilmbase ) + +ENABLE_TESTING() + +SET(CPACK_PACKAGE_VERSION_MAJOR "2") +SET(CPACK_PACKAGE_VERSION_MINOR "1") +SET(CPACK_PACKAGE_VERSION_PATCH "0") +SET(CPACK_SOURCE_GENERATOR "TGZ") +set(CPACK_SOURCE_PACKAGE_FILE_NAME + "${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}" + ) +set(CPACK_SOURCE_IGNORE_FILES + "/.git*;/.cvs*;${CPACK_SOURCE_IGNORE_FILES}") +INCLUDE ( CPack ) + + +# Allow the developer to select if Dynamic or Static libraries are built +OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON) IF ( NOT WIN32) ADD_DEFINITIONS ( -pthread ) @@ -59,6 +76,16 @@ INSTALL( FILES ${_laname} DESTINATION ${CMAKE_INSTALL_PREFIX}${_install_DIR}) ENDMACRO(CREATE_LIBTOOL_FILE) +SET (LIB_TYPE STATIC) +IF (BUILD_SHARED_LIBS) + # User wants to build Dynamic Libraries, so change the LIB_TYPE variable to CMake keyword 'SHARED' + SET (LIB_TYPE SHARED) + IF (WIN32) + ADD_DEFINITIONS(-DOPENEXR_DLL) + ENDIF () +ENDIF (BUILD_SHARED_LIBS) + + ADD_SUBDIRECTORY ( Half ) ADD_SUBDIRECTORY ( Iex ) ADD_SUBDIRECTORY ( IexMath ) @@ -70,36 +97,65 @@ DESTINATION ${CMAKE_SOURCE_DIR}/config ) ELSE () - FILE ( WRITE ${CMAKE_SOURCE_DIR}/config/IlmBaseConfig.h "#define HAVE_PTHREAD 1\n" ) - FILE ( APPEND ${CMAKE_SOURCE_DIR}/config/IlmBaseConfig.h "#define HAVE_POSIX_SEMAPHORES 1\n" ) - FILE ( APPEND ${CMAKE_SOURCE_DIR}/config/IlmBaseConfig.h "#define ILMBASE_VERSION_STRING \"2.0.0\"\n" ) - FILE ( APPEND ${CMAKE_SOURCE_DIR}/config/IlmBaseConfig.h "#define ILMBASE_PACKAGE_STRING \"IlmBase 2.0.0\"\n" ) + IF (APPLE) + FILE ( WRITE ${CMAKE_SOURCE_DIR}/config/IlmBaseConfig.h "#define HAVE_PTHREAD 1\n" ) + ELSE () + FILE ( WRITE ${CMAKE_SOURCE_DIR}/config/IlmBaseConfig.h "#define HAVE_PTHREAD 1\n" ) + FILE ( APPEND ${CMAKE_SOURCE_DIR}/config/IlmBaseConfig.h "#define ILMBASE_HAVE_LARGE_STACK 1\n" ) + FILE ( APPEND ${CMAKE_SOURCE_DIR}/config/IlmBaseConfig.h "#define HAVE_POSIX_SEMAPHORES 1\n" ) + FILE ( APPEND ${CMAKE_SOURCE_DIR}/config/IlmBaseConfig.h "#define ILMBASE_HAVE_CONTROL_REGISTER_SUPPORT 1\n") + ENDIF () ENDIF () +FILE ( APPEND ${CMAKE_SOURCE_DIR}/config/IlmBaseConfig.h "#define ILMBASE_INTERNAL_NAMESPACE_CUSTOM 1\n") +FILE ( APPEND ${CMAKE_SOURCE_DIR}/config/IlmBaseConfig.h "#define IMATH_INTERNAL_NAMESPACE Imath_${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR}\n") +FILE ( APPEND ${CMAKE_SOURCE_DIR}/config/IlmBaseConfig.h "#define IEX_INTERNAL_NAMESPACE Iex_${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR}\n") +FILE ( APPEND ${CMAKE_SOURCE_DIR}/config/IlmBaseConfig.h "#define ILMTHREAD_INTERNAL_NAMESPACE IlmThread_${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR}\n") +FILE ( APPEND ${CMAKE_SOURCE_DIR}/config/IlmBaseConfig.h "#define IMATH_NAMESPACE Imath\n") +FILE ( APPEND ${CMAKE_SOURCE_DIR}/config/IlmBaseConfig.h "#define IEX_NAMESPACE Iex\n") +FILE ( APPEND ${CMAKE_SOURCE_DIR}/config/IlmBaseConfig.h "#define ILMTHREAD_NAMESPACE IlmThread\n") +FILE ( APPEND ${CMAKE_SOURCE_DIR}/config/IlmBaseConfig.h "#define ILMBASE_VERSION_STRING \"${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}\"\n" ) +FILE ( APPEND ${CMAKE_SOURCE_DIR}/config/IlmBaseConfig.h "#define ILMBASE_PACKAGE_STRING \"IlmBase ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}\"\n" ) +FILE ( APPEND ${CMAKE_SOURCE_DIR}/config/IlmBaseConfig.h "#define ILMBASE_VERSION_MAJOR ${CPACK_PACKAGE_VERSION_MAJOR}\n" ) +FILE ( APPEND ${CMAKE_SOURCE_DIR}/config/IlmBaseConfig.h "#define ILMBASE_VERSION_MINOR ${CPACK_PACKAGE_VERSION_MINOR}\n" ) +FILE ( APPEND ${CMAKE_SOURCE_DIR}/config/IlmBaseConfig.h "#define ILMBASE_VERSION_PATCH ${CPACK_PACKAGE_VERSION_PATCH}\n" ) + +FILE ( APPEND ${CMAKE_SOURCE_DIR}/config/IlmBaseConfig.h " +// Version as a single hex number, e.g. 0x01000300 == 1.0.3 +#define ILMBASE_VERSION_HEX ((ILMBASE_VERSION_MAJOR << 24) | \\ + (ILMBASE_VERSION_MINOR << 16) | \\ + (ILMBASE_VERSION_PATCH << 8)) +") + + SET_TARGET_PROPERTIES ( Half PROPERTIES - VERSION 10.0.0 - SOVERSION 10 + VERSION 11.0.0 + SOVERSION 11 ) SET_TARGET_PROPERTIES ( Iex PROPERTIES - VERSION 10.0.0 - SOVERSION 10 + VERSION 11.0.0 + SOVERSION 11 + OUTPUT_NAME "Iex-${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR}" ) SET_TARGET_PROPERTIES ( Imath PROPERTIES - VERSION 10.0.0 - SOVERSION 10 + VERSION 11.0.0 + SOVERSION 11 + OUTPUT_NAME "Imath-${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR}" ) SET_TARGET_PROPERTIES ( IlmThread PROPERTIES - VERSION 10.0.0 - SOVERSION 10 + VERSION 11.0.0 + SOVERSION 11 + OUTPUT_NAME "IlmThread-${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR}" ) SET_TARGET_PROPERTIES ( IexMath PROPERTIES - VERSION 10.0.0 - SOVERSION 10 + VERSION 11.0.0 + SOVERSION 11 + OUTPUT_NAME "IexMath-${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR}" ) IF ( NOT WIN32 ) @@ -133,9 +189,8 @@ Name: IlmBase Description: Base math and exception libraries -Version: 1.1.0 -Libs: -L\${libdir} -lImath -lIexMath -lHalf -lIex -lIlmThread -pthread -Cflags: -pthread -I\${OpenEXR_includedir} +Version: ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH} +Libs: -L\${libdir} -lImath-${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR} -lIexMath-${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR} -lHalf -lIex-${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR} -lIlmThread-${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR} -pthreadCflags: -pthread -I\${OpenEXR_includedir} ") INSTALL ( FILES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ilmbase-2.0.1/ChangeLog new/ilmbase-2.1.0/ChangeLog --- old/ilmbase-2.0.1/ChangeLog 2013-06-18 23:09:50.000000000 +0200 +++ new/ilmbase-2.1.0/ChangeLog 2013-10-16 00:55:09.000000000 +0200 @@ -1,3 +1,7 @@ +Version 2.x.x + * Bumped version to track OpenEXR + (Piotr Stanczyk) + Version 2.0.1 * Bumped version to track OpenEXR (Piotr Stanczyk) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ilmbase-2.0.1/Half/CMakeLists.txt new/ilmbase-2.1.0/Half/CMakeLists.txt --- old/ilmbase-2.0.1/Half/CMakeLists.txt 2013-06-18 21:51:38.000000000 +0200 +++ new/ilmbase-2.1.0/Half/CMakeLists.txt 2013-11-04 18:51:12.000000000 +0100 @@ -32,7 +32,11 @@ ${CMAKE_CURRENT_SOURCE_DIR}/toFloat.h ) -ADD_LIBRARY ( Half STATIC +IF(BUILD_SHARED_LIBS) + ADD_DEFINITIONS(-DHALF_EXPORTS) +ENDIF() + +ADD_LIBRARY ( Half ${LIB_TYPE} half.cpp ) @@ -48,6 +52,7 @@ INSTALL ( FILES half.h halfFunction.h + halfExport.h halfLimits.h DESTINATION include/OpenEXR diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ilmbase-2.0.1/Half/halfExport.h new/ilmbase-2.1.0/Half/halfExport.h --- old/ilmbase-2.0.1/Half/halfExport.h 2013-06-18 21:51:38.000000000 +0200 +++ new/ilmbase-2.1.0/Half/halfExport.h 2013-07-29 19:58:48.000000000 +0200 @@ -11,28 +11,16 @@ // This copyright notice does not imply publication. // -#if defined(PLATFORM_WINDOWS) -# if defined(PLATFORM_BUILD_STATIC) -# define PLATFORM_EXPORT_DEFINITION -# define PLATFORM_IMPORT_DEFINITION -# else -# define PLATFORM_EXPORT_DEFINITION __declspec(dllexport) -# define PLATFORM_IMPORT_DEFINITION __declspec(dllimport) -# endif -#else // linux/macos -# if defined(PLATFORM_VISIBILITY_AVAILABLE) -# define PLATFORM_EXPORT_DEFINITION __attribute__((visibility("default"))) -# define PLATFORM_IMPORT_DEFINITION -# else -# define PLATFORM_EXPORT_DEFINITION -# define PLATFORM_IMPORT_DEFINITION -# endif -#endif - -#if defined(HALF_EXPORTS) // create library -# define HALF_EXPORT PLATFORM_EXPORT_DEFINITION -#else // use library -# define HALF_EXPORT PLATFORM_IMPORT_DEFINITION +#if defined(OPENEXR_DLL) + #if defined(HALF_EXPORTS) + #define HALF_EXPORT __declspec(dllexport) + #else + #define HALF_EXPORT __declspec(dllimport) + #endif + #define HALF_EXPORT_CONST +#else + #define HALF_EXPORT + #define HALF_EXPORT_CONST const #endif #endif // #ifndef HALFEXPORT_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ilmbase-2.0.1/Iex/CMakeLists.txt new/ilmbase-2.1.0/Iex/CMakeLists.txt --- old/ilmbase-2.0.1/Iex/CMakeLists.txt 2013-06-18 21:51:38.000000000 +0200 +++ new/ilmbase-2.1.0/Iex/CMakeLists.txt 2013-11-11 21:46:45.000000000 +0100 @@ -1,10 +1,15 @@ # [email protected] -ADD_LIBRARY ( Iex STATIC +IF(BUILD_SHARED_LIBS) + ADD_DEFINITIONS(-DIEX_EXPORTS) +ENDIF() + +ADD_LIBRARY ( Iex ${LIB_TYPE} IexBaseExc.cpp IexThrowErrnoExc.cpp ) + INSTALL ( TARGETS Iex DESTINATION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ilmbase-2.0.1/Iex/IexBaseExc.cpp new/ilmbase-2.1.0/Iex/IexBaseExc.cpp --- old/ilmbase-2.0.1/Iex/IexBaseExc.cpp 2013-06-18 21:51:38.000000000 +0200 +++ new/ilmbase-2.1.0/Iex/IexBaseExc.cpp 2013-10-16 00:55:09.000000000 +0200 @@ -48,6 +48,8 @@ #include <windows.h> #endif +#include <stdlib.h> + IEX_INTERNAL_NAMESPACE_SOURCE_ENTER @@ -141,12 +143,14 @@ iex_debugTrap() { if (0 != getenv("IEXDEBUGTHROW")) - DebugBreak(); + ::DebugBreak(); } #else void iex_debugTrap() { // how to in Linux? + if (0 != ::getenv("IEXDEBUGTHROW")) + __builtin_trap(); } #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ilmbase-2.0.1/Iex/IexExport.h new/ilmbase-2.1.0/Iex/IexExport.h --- old/ilmbase-2.0.1/Iex/IexExport.h 2013-06-18 21:51:38.000000000 +0200 +++ new/ilmbase-2.1.0/Iex/IexExport.h 2013-07-29 19:58:48.000000000 +0200 @@ -35,29 +35,16 @@ // /////////////////////////////////////////////////////////////////////////// - -#if defined(PLATFORM_WINDOWS) -# if defined(PLATFORM_BUILD_STATIC) -# define IEX_EXPORT_DEFINITION -# define IEX_IMPORT_DEFINITION -# else -# define IEX_EXPORT_DEFINITION __declspec(dllexport) -# define IEX_IMPORT_DEFINITION __declspec(dllimport) -# endif -#else // linux/macos -# if defined(PLATFORM_VISIBILITY_AVAILABLE) -# define IEX_EXPORT_DEFINITION __attribute__((visibility("default"))) -# define IEX_IMPORT_DEFINITION -# else -# define IEX_EXPORT_DEFINITION -# define IEX_IMPORT_DEFINITION -# endif -#endif - -#if defined(IEX_EXPORTS) // create library -# define IEX_EXPORT IEX_EXPORT_DEFINITION -#else // use library -# define IEX_EXPORT IEX_IMPORT_DEFINITION +#if defined(OPENEXR_DLL) + #if defined(IEX_EXPORTS) + #define IEX_EXPORT __declspec(dllexport) + #else + #define IEX_EXPORT __declspec(dllimport) + #endif + #define IEX_EXPORT_CONST +#else + #define IEX_EXPORT + #define IEX_EXPORT_CONST const #endif #endif // #ifndef IEXEXPORT_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ilmbase-2.0.1/IexMath/CMakeLists.txt new/ilmbase-2.1.0/IexMath/CMakeLists.txt --- old/ilmbase-2.0.1/IexMath/CMakeLists.txt 2013-06-18 21:51:38.000000000 +0200 +++ new/ilmbase-2.1.0/IexMath/CMakeLists.txt 2013-11-11 22:10:04.000000000 +0100 @@ -1,9 +1,13 @@ # [email protected] -ADD_LIBRARY ( IexMath STATIC +IF(BUILD_SHARED_LIBS) + ADD_DEFINITIONS(-DIEXMATH_EXPORTS) +ENDIF() +ADD_LIBRARY ( IexMath ${LIB_TYPE} IexMathFloatExc.cpp IexMathFpu.cpp ) +TARGET_LINK_LIBRARIES(IexMath Iex) INSTALL ( TARGETS IexMath diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ilmbase-2.0.1/IexMath/IexMathFloatExc.h new/ilmbase-2.1.0/IexMath/IexMathFloatExc.h --- old/ilmbase-2.0.1/IexMath/IexMathFloatExc.h 2013-06-18 21:51:38.000000000 +0200 +++ new/ilmbase-2.1.0/IexMath/IexMathFloatExc.h 2013-07-29 19:58:48.000000000 +0200 @@ -39,17 +39,20 @@ #ifndef IEXMATH_EXPORT_H #define IEXMATH_EXPORT_H -#if defined(PLATFORM_WINDOWS) && !defined(ZENO_STATIC) -# ifdef IEXMATH_EXPORTS -# define IEXMATH_EXPORT __declspec(dllexport) -# else -# define IEXMATH_EXPORT __declspec(dllimport) -# endif + +#if defined(OPENEXR_DLL) + #if defined(IEX_EXPORTS) + #define IEXMATH_EXPORT __declspec(dllexport) + #else + #define IEXMATH_EXPORT __declspec(dllimport) + #endif + #define IEXMATH_EXPORT_CONST #else -# define IEXMATH_EXPORT -#endif + #define IEXMATH_EXPORT + #define IEXMATH_EXPORT_CONST const #endif +#endif #include "IexNamespace.h" #include "IexMathExc.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ilmbase-2.0.1/IlmThread/CMakeLists.txt new/ilmbase-2.1.0/IlmThread/CMakeLists.txt --- old/ilmbase-2.0.1/IlmThread/CMakeLists.txt 2013-06-18 21:51:38.000000000 +0200 +++ new/ilmbase-2.1.0/IlmThread/CMakeLists.txt 2013-11-11 22:10:49.000000000 +0100 @@ -1,37 +1,32 @@ # [email protected] +SET( ILMTHREAD_LIBRARY_SOURCES + IlmThread.cpp + IlmThreadMutex.cpp + IlmThreadMutexPosix.cpp + IlmThreadPool.cpp + IlmThreadPosix.cpp + IlmThreadSemaphore.cpp + IlmThreadSemaphorePosixCompat.cpp + IlmThreadSemaphorePosix.cpp +) IF (WIN32) - SET( ILMTHREAD_LIBRARY_SOURCES - IlmThread.cpp - IlmThreadMutex.cpp - IlmThreadMutexPosix.cpp + SET( ILMTHREAD_LIBRARY_SOURCES ${ILMTHREAD_LIBRARY_SOURCES} IlmThreadMutexWin32.cpp - IlmThreadPool.cpp - IlmThreadPosix.cpp - IlmThreadSemaphore.cpp - IlmThreadSemaphorePosix.cpp - IlmThreadSemaphorePosixCompat.cpp IlmThreadSemaphoreWin32.cpp IlmThreadWin32.cpp ) -ELSE () +ENDIF() - SET( ILMTHREAD_LIBRARY_SOURCES - IlmThread.cpp - IlmThreadMutex.cpp - IlmThreadMutexPosix.cpp - IlmThreadPool.cpp - IlmThreadPosix.cpp - IlmThreadSemaphore.cpp - IlmThreadSemaphorePosixCompat.cpp - IlmThreadSemaphorePosix.cpp - ) +IF(BUILD_SHARED_LIBS) + ADD_DEFINITIONS(-DILMTHREAD_EXPORTS) ENDIF() -ADD_LIBRARY ( IlmThread STATIC +ADD_LIBRARY ( IlmThread ${LIB_TYPE} ${ILMTHREAD_LIBRARY_SOURCES} ) +TARGET_LINK_LIBRARIES(IlmThread Iex) INSTALL ( TARGETS IlmThread diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ilmbase-2.0.1/Imath/CMakeLists.txt new/ilmbase-2.1.0/Imath/CMakeLists.txt --- old/ilmbase-2.0.1/Imath/CMakeLists.txt 2013-06-18 21:51:38.000000000 +0200 +++ new/ilmbase-2.1.0/Imath/CMakeLists.txt 2013-11-12 00:09:51.000000000 +0100 @@ -1,6 +1,10 @@ # [email protected] -ADD_LIBRARY ( Imath STATIC +IF(BUILD_SHARED_LIBS) + ADD_DEFINITIONS(-DIMATH_EXPORTS) +ENDIF() + +ADD_LIBRARY ( Imath ${LIB_TYPE} ImathBox.cpp ImathRandom.cpp ImathColorAlgo.cpp @@ -9,6 +13,8 @@ ImathVec.cpp ImathMatrixAlgo.cpp ) +TARGET_LINK_LIBRARIES(Imath Iex) + INSTALL ( TARGETS Imath @@ -17,38 +23,39 @@ ) INSTALL ( FILES - ImathColorAlgo.h - ImathMatrixAlgo.h - ImathVec.h - ImathShear.h - ImathFun.h - ImathBox.h ImathBoxAlgo.h + ImathBox.h + ImathColorAlgo.h + ImathColor.h ImathEuler.h ImathExc.h + ImathExport.h + ImathForward.h + ImathFrame.h + ImathFrustum.h + ImathFrustumTest.h + ImathFun.h + ImathGL.h + ImathGLU.h + ImathHalfLimits.h + ImathInt64.h + ImathInterval.h ImathLimits.h - ImathLine.h ImathLineAlgo.h + ImathLine.h + ImathMath.h + ImathMatrixAlgo.h ImathMatrix.h + ImathNamespace.h ImathPlane.h - ImathSphere.h - ImathVecAlgo.h + ImathPlatform.h ImathQuat.h - ImathFrustum.h - ImathMath.h - ImathGL.h - ImathColor.h ImathRandom.h ImathRoots.h - ImathHalfLimits.h - ImathInterval.h - ImathGLU.h - ImathFrame.h - ImathPlatform.h - ImathInt64.h - ImathForward.h - ImathNamespace.h - ImathExport.h + ImathShear.h + ImathSphere.h + ImathVecAlgo.h + ImathVec.h DESTINATION include/OpenEXR ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ilmbase-2.0.1/Imath/ImathFrustum.h new/ilmbase-2.1.0/Imath/ImathFrustum.h --- old/ilmbase-2.0.1/Imath/ImathFrustum.h 2013-06-18 21:51:38.000000000 +0200 +++ new/ilmbase-2.1.0/Imath/ImathFrustum.h 2013-11-12 00:09:51.000000000 +0100 @@ -129,8 +129,8 @@ // to transform the frustum before setting the planes. //----------------------------------------------------------------------- - void planes(Plane3<T> p[6]); - void planes(Plane3<T> p[6], const Matrix44<T> &M); + void planes(Plane3<T> p[6]) const; + void planes(Plane3<T> p[6], const Matrix44<T> &M) const; //---------------------- // Derived Quantities @@ -645,7 +645,7 @@ } template<class T> -void Frustum<T>::planes(Plane3<T> p[6]) +void Frustum<T>::planes(Plane3<T> p[6]) const { // // Plane order: Top, Right, Bottom, Left, Near, Far. @@ -678,7 +678,7 @@ template<class T> -void Frustum<T>::planes(Plane3<T> p[6], const Matrix44<T> &M) +void Frustum<T>::planes(Plane3<T> p[6], const Matrix44<T> &M) const { // // Plane order: Top, Right, Bottom, Left, Near, Far. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ilmbase-2.0.1/Imath/ImathFrustumTest.h new/ilmbase-2.1.0/Imath/ImathFrustumTest.h --- old/ilmbase-2.0.1/Imath/ImathFrustumTest.h 2013-06-18 21:51:38.000000000 +0200 +++ new/ilmbase-2.1.0/Imath/ImathFrustumTest.h 2013-11-12 00:09:51.000000000 +0100 @@ -134,7 +134,7 @@ cameraMat.makeIdentity(); setFrustum(frust, cameraMat); } - FrustumTest(Frustum<T> &frustum, const Matrix44<T> &cameraMat) + FrustumTest(const Frustum<T> &frustum, const Matrix44<T> &cameraMat) { setFrustum(frustum, cameraMat); } @@ -143,7 +143,7 @@ // setFrustum() // This updates the frustum test with a new frustum and matrix. // This should usually be called just once per frame. - void setFrustum(Frustum<T> &frustum, const Matrix44<T> &cameraMat); + void setFrustum(const Frustum<T> &frustum, const Matrix44<T> &cameraMat); //////////////////////////////////////////////////////////////////// // isVisible() @@ -189,7 +189,7 @@ // This should usually only be called once per frame, or however // often the camera moves. template<class T> -void FrustumTest<T>::setFrustum(Frustum<T> &frustum, +void FrustumTest<T>::setFrustum(const Frustum<T> &frustum, const Matrix44<T> &cameraMat) { Plane3<T> frustumPlanes[6]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ilmbase-2.0.1/Imath/Makefile.am new/ilmbase-2.1.0/Imath/Makefile.am --- old/ilmbase-2.0.1/Imath/Makefile.am 2013-06-18 21:51:38.000000000 +0200 +++ new/ilmbase-2.1.0/Imath/Makefile.am 2013-11-12 00:09:51.000000000 +0100 @@ -35,7 +35,8 @@ ImathColor.h ImathRandom.h ImathRoots.h \ ImathHalfLimits.h ImathInterval.h ImathGLU.h \ ImathFrame.h ImathPlatform.h ImathInt64.h \ - ImathNamespace.h ImathForward.h ImathExport.h + ImathNamespace.h ImathForward.h ImathExport.h \ + ImathFrustumTest.h INCLUDES = -I$(top_builddir) -I$(top_srcdir)/Iex -I$(top_srcdir)/Half \ -I$(top_srcdir)/config diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ilmbase-2.0.1/Imath/Makefile.in new/ilmbase-2.1.0/Imath/Makefile.in --- old/ilmbase-2.0.1/Imath/Makefile.in 2013-06-18 21:55:24.000000000 +0200 +++ new/ilmbase-2.1.0/Imath/Makefile.in 2013-11-12 01:23:33.000000000 +0100 @@ -268,7 +268,8 @@ ImathColor.h ImathRandom.h ImathRoots.h \ ImathHalfLimits.h ImathInterval.h ImathGLU.h \ ImathFrame.h ImathPlatform.h ImathInt64.h \ - ImathNamespace.h ImathForward.h ImathExport.h + ImathNamespace.h ImathForward.h ImathExport.h \ + ImathFrustumTest.h INCLUDES = -I$(top_builddir) -I$(top_srcdir)/Iex -I$(top_srcdir)/Half \ -I$(top_srcdir)/config diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ilmbase-2.0.1/ImathTest/CMakeLists.txt new/ilmbase-2.1.0/ImathTest/CMakeLists.txt --- old/ilmbase-2.0.1/ImathTest/CMakeLists.txt 2013-06-18 21:51:38.000000000 +0200 +++ new/ilmbase-2.1.0/ImathTest/CMakeLists.txt 2013-11-12 00:09:51.000000000 +0100 @@ -26,6 +26,6 @@ testVec.cpp ) +ADD_TEST ( TestImath ImathTest ) TARGET_LINK_LIBRARIES ( ImathTest Imath Iex ) -ADD_TEST ( TestImath ImathTest ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ilmbase-2.0.1/Makefile.in new/ilmbase-2.1.0/Makefile.in --- old/ilmbase-2.0.1/Makefile.in 2013-06-18 21:55:24.000000000 +0200 +++ new/ilmbase-2.1.0/Makefile.in 2013-11-12 01:23:33.000000000 +0100 @@ -602,7 +602,7 @@ *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) + chmod -R a-w $(distdir); chmod u+w $(distdir) mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ilmbase-2.0.1/README.OSX new/ilmbase-2.1.0/README.OSX --- old/ilmbase-2.0.1/README.OSX 2013-06-18 21:51:38.000000000 +0200 +++ new/ilmbase-2.1.0/README.OSX 2013-11-12 00:09:51.000000000 +0100 @@ -6,6 +6,39 @@ but see below re: shared libraries. +Missing gnu automake tools on Mac OS X 10.8+ +------------------ +Later versions of OS X ,10.8+, do not, by default have all the necessary +tools for building. In particular, Autoconf and Automake may be missing. + +The following commands will download and install the necessary components: + +cd ~/myDevLoc +curl -OL http://ftpmirror.gnu.org/autoconf/autoconf-2.64.tar.gz +tar xzf autoconf-2.64.tar.gz +cd autoconf-2.64 +./configure --prefix=~/myDevLoc/autotools-bin +make; make install + +cd ~/myDevLoc +curl -OL http://ftpmirror.gnu.org/automake/automake-1.12.tar.gz +tar xzf automake-1.12.tar.gz +cd automake-1.12 +./configure --prefix=~/myDevLoc/autotools-bin +make; make install + +cd ~/myDevLoc +curl -OL http://ftpmirror.gnu.org/libtool/libtool-2.4.tar.gz +tar xzf libtool-2.4.tar.gz +cd libtool-2.4 +./configure --prefix=~/myDevLoc/autotools-bin +make; make install + + +You may want to export the installation path for your convenience. +Finally, make sure that you have installed the command line tools for XCode. + + Universal Builds on Mac OS X ------------------ OS X supports multiple architectures. By default, IlmBase will be built diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ilmbase-2.0.1/bootstrap new/ilmbase-2.1.0/bootstrap --- old/ilmbase-2.0.1/bootstrap 2013-06-18 21:54:26.000000000 +0200 +++ new/ilmbase-2.1.0/bootstrap 2013-11-12 18:26:32.000000000 +0100 @@ -1,14 +1,15 @@ #! /bin/sh -# If we're on OS X, use glibtoolize instead of toolize +# If we're on OS X, use glibtoolize instead of toolize when available HOSTTYPE=`uname` -if [ "$HOSTTYPE" == "Darwin" ]; then +if [ "$HOSTTYPE" == "Darwin" ] && $(which glibtoolize > /dev/null 2>&1) ; then LIBTOOLIZE=glibtoolize else - LIBTOOLIZE=libtoolize + LIBTOOLIZE=libtoolize fi + # Check Autoconf version if [ -x `which autoconf` ]; then AC_VER=`autoconf --version | head -n 1 | sed 's/^[^0-9]*//'` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ilmbase-2.0.1/config/IlmBaseConfig.h new/ilmbase-2.1.0/config/IlmBaseConfig.h --- old/ilmbase-2.0.1/config/IlmBaseConfig.h 2013-06-18 21:55:33.000000000 +0200 +++ new/ilmbase-2.1.0/config/IlmBaseConfig.h 2013-11-12 23:52:39.000000000 +0100 @@ -1,72 +1,18 @@ -/* config/IlmBaseConfig.h. Generated from IlmBaseConfig.h.in by configure. */ -// -// Define and set to 1 if the target system has POSIX thread support -// and you want IlmBase to use it for multithreaded file I/O. -// - #define HAVE_PTHREAD 1 - -// -// Define and set to 1 if the target system supports POSIX semaphores -// and you want OpenEXR to use them; otherwise, OpenEXR will use its -// own semaphore implementation. -// - -#define HAVE_POSIX_SEMAPHORES 1 - - -#define HAVE_UCONTEXT_H 1 - - -// -// Dealing with FPEs -// -#define ILMBASE_HAVE_CONTROL_REGISTER_SUPPORT 1 - - -// -// Define and set to 1 if the target system has support for large -// stack sizes. -// - -#define ILMBASE_HAVE_LARGE_STACK 1 - -// -// Current (internal) library namepace name and corresponding public -// client namespaces. -// #define ILMBASE_INTERNAL_NAMESPACE_CUSTOM 1 -#define IMATH_INTERNAL_NAMESPACE Imath_2_0 -#define IEX_INTERNAL_NAMESPACE Iex_2_0 -#define ILMTHREAD_INTERNAL_NAMESPACE IlmThread_2_0 - -/* #undef ILMBASE_NAMESPACE_CUSTOM */ +#define IMATH_INTERNAL_NAMESPACE Imath_2_1 +#define IEX_INTERNAL_NAMESPACE Iex_2_1 +#define ILMTHREAD_INTERNAL_NAMESPACE IlmThread_2_1 #define IMATH_NAMESPACE Imath #define IEX_NAMESPACE Iex #define ILMTHREAD_NAMESPACE IlmThread - - -// -// Define and set to 1 if the target system has support for large -// stack sizes. -// - -#define ILMBASE_HAVE_LARGE_STACK 1 - - -// -// Version information -// -#define ILMBASE_VERSION_STRING "2.0.1" -#define ILMBASE_PACKAGE_STRING "IlmBase 2.0.1" - +#define ILMBASE_VERSION_STRING "2.1.0" +#define ILMBASE_PACKAGE_STRING "IlmBase 2.1.0" #define ILMBASE_VERSION_MAJOR 2 -#define ILMBASE_VERSION_MINOR 0 -#define ILMBASE_VERSION_PATCH 1 +#define ILMBASE_VERSION_MINOR 1 +#define ILMBASE_VERSION_PATCH 0 // Version as a single hex number, e.g. 0x01000300 == 1.0.3 #define ILMBASE_VERSION_HEX ((ILMBASE_VERSION_MAJOR << 24) | \ (ILMBASE_VERSION_MINOR << 16) | \ (ILMBASE_VERSION_PATCH << 8)) - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ilmbase-2.0.1/configure new/ilmbase-2.1.0/configure --- old/ilmbase-2.0.1/configure 2013-06-18 21:55:25.000000000 +0200 +++ new/ilmbase-2.1.0/configure 2013-11-12 00:10:15.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for IlmBase 2.0.1. +# Generated by GNU Autoconf 2.63 for IlmBase 2.1.0. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. @@ -743,8 +743,8 @@ # Identity of this package. PACKAGE_NAME='IlmBase' PACKAGE_TARNAME='ilmbase' -PACKAGE_VERSION='2.0.1' -PACKAGE_STRING='IlmBase 2.0.1' +PACKAGE_VERSION='2.1.0' +PACKAGE_STRING='IlmBase 2.1.0' PACKAGE_BUGREPORT='' ac_unique_file="ImathTest/main.cpp" @@ -1504,7 +1504,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures IlmBase 2.0.1 to adapt to many kinds of systems. +\`configure' configures IlmBase 2.1.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1574,7 +1574,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of IlmBase 2.0.1:";; + short | recursive ) echo "Configuration of IlmBase 2.1.0:";; esac cat <<\_ACEOF @@ -1699,7 +1699,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -IlmBase configure 2.0.1 +IlmBase configure 2.1.0 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1713,7 +1713,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by IlmBase $as_me 2.0.1, which was +It was created by IlmBase $as_me 2.1.0, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2084,9 +2084,9 @@ ILMBASE_VERSION_MAJOR=2 -ILMBASE_VERSION_MINOR=0 +ILMBASE_VERSION_MINOR=1 -ILMBASE_VERSION_PATCH=1 +ILMBASE_VERSION_PATCH=0 ILMBASE_VERSION=${ILMBASE_VERSION_MAJOR}.${ILMBASE_VERSION_MINOR}.${ILMBASE_VERSION_PATCH} @@ -2661,7 +2661,7 @@ # Define the identity of the package. PACKAGE='ilmbase' - VERSION='2.0.1' + VERSION='2.1.0' cat >>confdefs.h <<_ACEOF @@ -2725,8 +2725,8 @@ -LIBTOOL_CURRENT=10 -LIBTOOL_REVISION=1 +LIBTOOL_CURRENT=11 +LIBTOOL_REVISION=0 LIBTOOL_AGE=0 LIBTOOL_VERSION=$LIBTOOL_CURRENT:$LIBTOOL_REVISION:$LIBTOOL_AGE @@ -17916,7 +17916,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by IlmBase $as_me 2.0.1, which was +This file was extended by IlmBase $as_me 2.1.0, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17979,7 +17979,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -IlmBase config.status 2.0.1 +IlmBase config.status 2.1.0 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ilmbase-2.0.1/configure.ac new/ilmbase-2.1.0/configure.ac --- old/ilmbase-2.0.1/configure.ac 2013-06-18 21:55:16.000000000 +0200 +++ new/ilmbase-2.1.0/configure.ac 2013-11-12 00:09:51.000000000 +0100 @@ -1,9 +1,9 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(IlmBase, 2.0.1) +AC_INIT(IlmBase, 2.1.0) AC_SUBST(ILMBASE_VERSION_MAJOR, 2) -AC_SUBST(ILMBASE_VERSION_MINOR, 0) -AC_SUBST(ILMBASE_VERSION_PATCH, 1) +AC_SUBST(ILMBASE_VERSION_MINOR, 1) +AC_SUBST(ILMBASE_VERSION_PATCH, 0) AC_SUBST(ILMBASE_VERSION, ${ILMBASE_VERSION_MAJOR}.${ILMBASE_VERSION_MINOR}.${ILMBASE_VERSION_PATCH}) AC_SUBST(ILMBASE_VERSION_API, ${ILMBASE_VERSION_MAJOR}_${ILMBASE_VERSION_MINOR}) @@ -15,8 +15,8 @@ AM_MAINTAINER_MODE -LIBTOOL_CURRENT=10 -LIBTOOL_REVISION=1 +LIBTOOL_CURRENT=11 +LIBTOOL_REVISION=0 LIBTOOL_AGE=0 LIBTOOL_VERSION=$LIBTOOL_CURRENT:$LIBTOOL_REVISION:$LIBTOOL_AGE AC_SUBST(LIBTOOL_VERSION) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
