hdrflow-svn Mailing List for HDRFlow (Page 5)
Status: Pre-Alpha
Brought to you by:
glslang
Menu
▾
▴
hdrflow-svn — HDRFlow SVN notifications
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
(30) |
May
(38) |
Jun
(22) |
Jul
(53) |
Aug
(66) |
Sep
(56) |
Oct
(29) |
Nov
(13) |
Dec
(6) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(16) |
Feb
(22) |
Mar
(12) |
Apr
(4) |
May
|
Jun
|
Jul
|
Aug
|
Sep
(6) |
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
(12) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <gl...@us...> - 2007-10-20 20:35:42
|
Revision: 362
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=362&view=rev
Author: glslang
Date: 2007-10-20 13:35:32 -0700 (Sat, 20 Oct 2007)
Log Message:
-----------
+ adds initial code for swizzling and lut-based conversion.
Modified Paths:
--------------
trunk/lib/openlibraries/src/openimagelib/il/il.hpp
trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/il/utility.cpp
Added Paths:
-----------
trunk/lib/openlibraries/src/openimagelib/il/lut_converter.hpp
Modified: trunk/lib/openlibraries/src/openimagelib/il/il.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/il.hpp 2007-10-18 21:58:43 UTC (rev 361)
+++ trunk/lib/openlibraries/src/openimagelib/il/il.hpp 2007-10-20 20:35:32 UTC (rev 362)
@@ -14,6 +14,7 @@
#include <openimagelib/il/basic_image.hpp>
#include <openimagelib/il/traits.hpp>
#include <openimagelib/il/utility.hpp>
+#include <openimagelib/il/lut_converter.hpp>
namespace olib { namespace openimagelib {
Modified: trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj 2007-10-18 21:58:43 UTC (rev 361)
+++ trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj 2007-10-20 20:35:32 UTC (rev 362)
@@ -227,6 +227,10 @@
>
</File>
<File
+ RelativePath=".\lut_converter.hpp"
+ >
+ </File>
+ <File
RelativePath=".\openimagelib_plugin.hpp"
>
</File>
Added: trunk/lib/openlibraries/src/openimagelib/il/lut_converter.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/lut_converter.hpp (rev 0)
+++ trunk/lib/openlibraries/src/openimagelib/il/lut_converter.hpp 2007-10-20 20:35:32 UTC (rev 362)
@@ -0,0 +1,44 @@
+
+// il - An image library representation.
+
+// Copyright (C) 2007 Goncalo Nuno M. de Carvalho
+// Released under the LGPL.
+// For more information, see http://www.hdrflow.com.
+
+#ifndef LUT_CONVERTER_INC_
+#define LUT_CONVERTER_INC_
+
+#include <functional>
+
+namespace olib { namespace openimagelib { namespace il {
+
+struct byte_to_byte : public std::unary_function<unsigned char, unsigned char>
+{
+ typedef unsigned char value_type;
+ typedef unsigned char convert_type;
+
+ convert_type operator( )( value_type v ) const
+ { return v; }
+};
+
+struct byte_to_float : public std::unary_function<unsigned char, float>
+{
+ typedef unsigned char value_type;
+ typedef float convert_type;
+
+ convert_type operator( )( value_type v ) const
+ { return v / 255.0f; }
+};
+
+struct float_to_float : public std::unary_function<float, float>
+{
+ typedef float value_type;
+ typedef float convert_type;
+
+ convert_type operator( )( value_type v ) const
+ { return v; }
+};
+
+} } }
+
+#endif
Property changes on: trunk/lib/openlibraries/src/openimagelib/il/lut_converter.hpp
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/lib/openlibraries/src/openimagelib/il/utility.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/utility.cpp 2007-10-18 21:58:43 UTC (rev 361)
+++ trunk/lib/openlibraries/src/openimagelib/il/utility.cpp 2007-10-20 20:35:32 UTC (rev 362)
@@ -1112,7 +1112,8 @@
{ L"", L"", 0, { 0, 0, 0, 0 }, 0, { 0, 0, 0, 0 } }
};
-static image_type_ptr rgb_to_rgb( const image_type_ptr &src_img, const std::wstring &format )
+template<typename const_pointer, typename pointer>
+image_type_ptr rgb_to_rgb( const image_type_ptr &src_img, const std::wstring &format )
{
size_type width = src_img->width( );
size_type height = src_img->height( );
@@ -1802,11 +1803,11 @@
else if ( src_pf == L"r8g8b8" )
{
if ( dst_pf == L"b8g8r8" )
- return rgb_to_rgb( src, dst_pf );
+ return rgb_to_rgb<const_pointer, pointer>( src, dst_pf );
else if ( dst_pf == L"r8g8b8a8" )
- return rgb_to_rgb( src, dst_pf );
+ return rgb_to_rgb<const_pointer, pointer>( src, dst_pf );
else if ( dst_pf == L"b8g8r8a8" )
- return rgb_to_rgb( src, dst_pf );
+ return rgb_to_rgb<const_pointer, pointer>( src, dst_pf );
else if ( dst_pf == L"yuv444" )
return rgb_to_yuv444( src, dst_pf, 3, 0, 1, 2 );
else if ( dst_pf == L"yuv422" )
@@ -1822,11 +1823,11 @@
else if ( src_pf == L"b8g8r8" )
{
if ( dst_pf == L"r8g8b8" )
- return rgb_to_rgb( src, dst_pf );
+ return rgb_to_rgb<const_pointer, pointer>( src, dst_pf );
else if ( dst_pf == L"r8g8b8a8" )
- return rgb_to_rgb( src, dst_pf );
+ return rgb_to_rgb<const_pointer, pointer>( src, dst_pf );
else if ( dst_pf == L"b8g8r8a8" )
- return rgb_to_rgb( src, dst_pf );
+ return rgb_to_rgb<const_pointer, pointer>( src, dst_pf );
else if ( dst_pf == L"yuv444" )
return rgb_to_yuv444( src, dst_pf, 3, 2, 1, 0 );
else if ( dst_pf == L"yuv422" )
@@ -1837,11 +1838,11 @@
else if ( src_pf == L"r8g8b8a8" )
{
if ( dst_pf == L"r8g8b8" )
- return rgb_to_rgb( src, dst_pf );
+ return rgb_to_rgb<const_pointer, pointer>( src, dst_pf );
else if ( dst_pf == L"b8g8r8" )
- return rgb_to_rgb( src, dst_pf );
+ return rgb_to_rgb<const_pointer, pointer>( src, dst_pf );
else if ( dst_pf == L"b8g8r8a8" )
- return rgb_to_rgb( src, dst_pf );
+ return rgb_to_rgb<const_pointer, pointer>( src, dst_pf );
else if ( dst_pf == L"yuv444" )
return rgb_to_yuv444( src, dst_pf, 4, 0, 1, 2 );
else if ( dst_pf == L"yuv422" )
@@ -1857,11 +1858,11 @@
else if ( src_pf == L"b8g8r8a8" )
{
if ( dst_pf == L"r8g8b8" )
- return rgb_to_rgb( src, dst_pf );
+ return rgb_to_rgb<const_pointer, pointer>( src, dst_pf );
else if ( dst_pf == L"r8g8b8a8" )
- return rgb_to_rgb( src, dst_pf );
+ return rgb_to_rgb<const_pointer, pointer>( src, dst_pf );
else if ( dst_pf == L"b8g8r8" )
- return rgb_to_rgb( src, dst_pf );
+ return rgb_to_rgb<const_pointer, pointer>( src, dst_pf );
else if ( dst_pf == L"yuv444" )
return rgb_to_yuv444( src, dst_pf, 4, 2, 1, 0 );
else if ( dst_pf == L"yuv422" )
@@ -1874,11 +1875,11 @@
else if ( src_pf == L"a8r8g8b8" )
{
if( dst_pf == L"a8b8g8r8" )
- return rgb_to_rgb( src, dst_pf );
+ return rgb_to_rgb<const_pointer, pointer>( src, dst_pf );
else if( dst_pf == L"b8g8r8")
- return rgb_to_rgb( src, dst_pf );
+ return rgb_to_rgb<const_pointer, pointer>( src, dst_pf );
else if( dst_pf == L"b8g8r8a8")
- return rgb_to_rgb( src, dst_pf );
+ return rgb_to_rgb<const_pointer, pointer>( src, dst_pf );
else if ( dst_pf == L"yuv444" )
return rgb_to_yuv444( src, dst_pf, 4, 1, 2, 3 );
else if ( dst_pf == L"yuv422" )
@@ -1889,11 +1890,11 @@
else if( src_pf == L"a8b8g8r8" )
{
if( dst_pf == L"b8g8r8a8" )
- return rgb_to_rgb( src, dst_pf );
+ return rgb_to_rgb<const_pointer, pointer>( src, dst_pf );
else if( dst_pf == L"r8g8b8a8" )
- return rgb_to_rgb( src, dst_pf );
+ return rgb_to_rgb<const_pointer, pointer>( src, dst_pf );
else if( dst_pf == L"r8g8b8" )
- return rgb_to_rgb( src, dst_pf );
+ return rgb_to_rgb<const_pointer, pointer>( src, dst_pf );
else if ( dst_pf == L"yuv444" )
return rgb_to_yuv444( src, dst_pf, 4, 3, 2, 1 );
else if ( dst_pf == L"yuv422" )
@@ -1904,12 +1905,12 @@
else if( src_pf == L"r8g8b8log" )
{
if( dst_pf == L"b8g8r8a8" )
- return convert_log_to_linear( rgb_to_rgb( src, dst_pf ) );
+ return convert_log_to_linear( rgb_to_rgb<const_pointer, pointer>( src, dst_pf ) );
}
else if( src_pf == L"r8g8b8a8log" )
{
if( dst_pf == L"b8g8r8a8" )
- return convert_log_to_linear( rgb_to_rgb( src, dst_pf ) );
+ return convert_log_to_linear( rgb_to_rgb<const_pointer, pointer>( src, dst_pf ) );
}
else if( src_pf == L"r10g10b10" )
{
@@ -2057,11 +2058,11 @@
else if( src_pf == L"l8a8" )
{
if( dst_pf == L"b8g8r8a8" )
- return rgb_to_rgb( src, dst_pf );
+ return rgb_to_rgb<const_pointer, pointer>( src, dst_pf );
else if( dst_pf == L"b8g8r8" )
- return rgb_to_rgb( src, dst_pf );
+ return rgb_to_rgb<const_pointer, pointer>( src, dst_pf );
else if( dst_pf == L"r8g8b8a8" )
- return rgb_to_rgb( src, dst_pf );
+ return rgb_to_rgb<const_pointer, pointer>( src, dst_pf );
}
else if( src_pf == L"l8a8p" )
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-10-18 21:58:45
|
Revision: 361
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=361&view=rev
Author: glslang
Date: 2007-10-18 14:58:43 -0700 (Thu, 18 Oct 2007)
Log Message:
-----------
+ build fixes
Modified Paths:
--------------
trunk/lib/openlibraries/src/openimagelib/il/openimagelib_plugin.hpp
trunk/lib/openlibraries/src/openimagelib/py/il.cpp
trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_vc8.vcproj
Modified: trunk/lib/openlibraries/src/openimagelib/il/openimagelib_plugin.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/openimagelib_plugin.hpp 2007-10-18 20:30:13 UTC (rev 360)
+++ trunk/lib/openlibraries/src/openimagelib/il/openimagelib_plugin.hpp 2007-10-18 21:58:43 UTC (rev 361)
@@ -8,8 +8,6 @@
#ifndef OPENIMAGELIB_PLUGIN_INC_
#define OPENIMAGELIB_PLUGIN_INC_
-#include <boost/filesystem/path.hpp>
-
#include <openpluginlib/pl/openpluginlib.hpp>
#include <openpluginlib/pl/stream.hpp>
Modified: trunk/lib/openlibraries/src/openimagelib/py/il.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/py/il.cpp 2007-10-18 20:30:13 UTC (rev 360)
+++ trunk/lib/openlibraries/src/openimagelib/py/il.cpp 2007-10-18 21:58:43 UTC (rev 361)
@@ -9,7 +9,6 @@
#include <openimagelib/il/openimagelib_plugin.hpp>
#include <openimagelib/py/py.hpp>
-namespace fs = boost::filesystem;
namespace il = olib::openimagelib;
namespace opl = olib::openpluginlib;
namespace py = boost::python;
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_vc8.vcproj 2007-10-18 20:30:13 UTC (rev 360)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_vc8.vcproj 2007-10-18 21:58:43 UTC (rev 361)
@@ -46,7 +46,7 @@
MinimalRebuild="true"
ExceptionHandling="2"
BasicRuntimeChecks="3"
- RuntimeLibrary="3"
+ RuntimeLibrary="1"
OpenMP="true"
UsePrecompiledHeader="0"
WarningLevel="4"
@@ -71,6 +71,7 @@
OutputFile="$(OutDir)\openmedialib_quicktime-vc80-d-0_5_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)";"$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)";"C:\Program Files\QuickTime SDK\Libraries""
+ IgnoreDefaultLibraryNames="libcmt.lib"
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
@@ -128,7 +129,7 @@
AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";"C:\Program Files\QuickTime SDK\CIncludes""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;QUICKTIME_EXPORTS;ML_PLUGIN_EXPORTS;OPENMEDIALIB_BUILD;HAVE_FLEX_STRING"
ExceptionHandling="2"
- RuntimeLibrary="2"
+ RuntimeLibrary="0"
BufferSecurityCheck="false"
FloatingPointModel="2"
OpenMP="true"
@@ -155,6 +156,7 @@
OutputFile="$(OutDir)\openmedialib_quicktime-vc80-r-0_5_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)";"$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)";"C:\Program Files\QuickTime SDK\Libraries""
+ IgnoreDefaultLibraryNames="libcmt.lib"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-10-18 20:30:14
|
Revision: 360
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=360&view=rev
Author: glslang
Date: 2007-10-18 13:30:13 -0700 (Thu, 18 Oct 2007)
Log Message:
-----------
+ merge from olibs cvs
Modified Paths:
--------------
trunk/lib/openlibraries/src/openimagelib/il/utility.cpp
Modified: trunk/lib/openlibraries/src/openimagelib/il/utility.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/utility.cpp 2007-10-14 14:46:13 UTC (rev 359)
+++ trunk/lib/openlibraries/src/openimagelib/il/utility.cpp 2007-10-18 20:30:13 UTC (rev 360)
@@ -576,25 +576,37 @@
pointer dst = dst_img->data( );
size_type dst_rem = dst_img->pitch( ) - dst_img->linesize( );
+ size_type y_src_rem = src_img->pitch( ) - src_img->linesize( );
int uv_offset;
+ const_pointer pu = src_img->data( 1 );
+ int ppu = src_img->pitch( 1 );
+ const_pointer pv = src_img->data( 2 );
+ int ppv = src_img->pitch( 2 );
+
+ const_pointer Y = src_img->data( 0 );
+ const_pointer U, V;
+
+ int mx = dst_width * x_factor;
+ int x = 0;
+
for ( int y = 0; y < dst_height; y ++ )
{
- const_pointer Y = src_img->data( 0 ) + ( y * src_img->pitch( 0 ) );
- const_pointer U = src_img->data( 1 ) + ( ( y * y_factor ) >> 8 ) * src_img->pitch( 1 );
- const_pointer V = src_img->data( 2 ) + ( ( y * y_factor ) >> 8 ) * src_img->pitch( 2 );
+ U = pu + ( ( y * y_factor ) >> 8 ) * ppu;
+ V = pv + ( ( y * y_factor ) >> 8 ) * ppv;
- for ( int x = 0; x < dst_width; x ++ )
+ for( x = 0; x < mx; x += x_factor )
{
- uv_offset = ( x * x_factor ) >> 8;
- *dst ++ = ( unsigned char )( *Y ++ );
- *dst ++ = ( unsigned char )( U[ uv_offset ] );
- *dst ++ = ( unsigned char )( *Y ++ );
- *dst ++ = ( unsigned char )( V[ uv_offset ] );
- }
+ uv_offset = x >> 8;
+ *dst ++ = *Y ++;
+ *dst ++ = U[ uv_offset ];
+ *dst ++ = *Y ++;
+ *dst ++ = V[ uv_offset ];
+ }
dst += dst_rem;
+ Y += y_src_rem;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-10-14 14:46:15
|
Revision: 359
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=359&view=rev
Author: glslang
Date: 2007-10-14 07:46:13 -0700 (Sun, 14 Oct 2007)
Log Message:
-----------
+ fixes out of bounds addressing
Modified Paths:
--------------
trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_plugin.cpp
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_plugin.cpp 2007-10-14 13:23:05 UTC (rev 358)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_plugin.cpp 2007-10-14 14:46:13 UTC (rev 359)
@@ -308,6 +308,8 @@
{
namespace fs = boost::filesystem;
+ if( files_.empty( ) ) return il::image_type_ptr( );
+
int index = get_position( );
// Just make sure we're in bounds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-10-14 13:23:07
|
Revision: 358
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=358&view=rev
Author: glslang
Date: 2007-10-14 06:23:05 -0700 (Sun, 14 Oct 2007)
Log Message:
-----------
+ build fix
Modified Paths:
--------------
trunk/lib/openlibraries/installer/openlibraries_sdk.nsi
Modified: trunk/lib/openlibraries/installer/openlibraries_sdk.nsi
===================================================================
--- trunk/lib/openlibraries/installer/openlibraries_sdk.nsi 2007-10-13 17:50:57 UTC (rev 357)
+++ trunk/lib/openlibraries/installer/openlibraries_sdk.nsi 2007-10-14 13:23:05 UTC (rev 358)
@@ -316,7 +316,7 @@
;--------------------------------
;Include environment variable
Push "OPENLIBRARIES_INCLUDE_PATH"
- Push "$INSTDIR\include\openlibraries-${VERSION}"
+ Push "$INSTDIR\include\openlibraries-${VERSION_DOT}"
Call WriteEnvStr
;--------------------------------
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-10-13 17:50:58
|
Revision: 357
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=357&view=rev
Author: glslang
Date: 2007-10-13 10:50:57 -0700 (Sat, 13 Oct 2007)
Log Message:
-----------
+ build fix
Modified Paths:
--------------
trunk/unity.sh
Modified: trunk/unity.sh
===================================================================
--- trunk/unity.sh 2007-10-13 14:56:36 UTC (rev 356)
+++ trunk/unity.sh 2007-10-13 17:50:57 UTC (rev 357)
@@ -542,11 +542,6 @@
esac
done
- # Copy Boost and GLEW headers
- #cp -R /usr/local/include/boost-$boost_new_version/boost HDRFlow.framework/Versions/$framework_version/Frameworks/HDRFlowPlugin.framework/Headers
- #cp -R /usr/local/include/GL/glew.h HDRFlow.framework/Versions/$framework_version/Frameworks/HDRFlowPlugin.framework/Headers
- #header_prefix="HDRFlow.framework/Versions/$framework_version/Frameworks/HDRFlowPlugin.framework/Headers/boost"
- #find $header_prefix -name '*.hpp' | xargs sed -e "s|boost/|HDRFlowPlugin/boost/|g" -i ''
check_status $?
}
@@ -587,7 +582,8 @@
{
libraries=`ls HDRFlow.framework/Versions/$framework_version/Libraries/*.dylib`
for i in $libraries
- do if [ -e HDRFlow.framework/Versions/$framework_version/Frameworks/$1.framework/Versions/$framework_version/Libraries/`basename $i` ]
+ do install_name_tool -id $install_name_prefix/HDRFlow.framework/Versions/$framework_version/Libraries/`basename $i` $i
+ if [ -e HDRFlow.framework/Versions/$framework_version/Frameworks/$1.framework/Versions/$framework_version/Libraries/`basename $i` ]
then rm -rf HDRFlow.framework/Versions/$framework_version/Frameworks/$1.framework/Versions/$framework_version/Libraries/`basename $i`
fi
done
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-10-13 14:56:39
|
Revision: 356
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=356&view=rev
Author: glslang
Date: 2007-10-13 07:56:36 -0700 (Sat, 13 Oct 2007)
Log Message:
-----------
+ build fixes
Modified Paths:
--------------
trunk/HDRFlowFramework.pmproj
trunk/HDRFlowMayaBundle.pmproj
trunk/lib/extras/src/imf/mfn/mfn.cpp
trunk/unity.sh
Modified: trunk/HDRFlowFramework.pmproj
===================================================================
(Binary files differ)
Modified: trunk/HDRFlowMayaBundle.pmproj
===================================================================
(Binary files differ)
Modified: trunk/lib/extras/src/imf/mfn/mfn.cpp
===================================================================
--- trunk/lib/extras/src/imf/mfn/mfn.cpp 2007-10-12 20:56:05 UTC (rev 355)
+++ trunk/lib/extras/src/imf/mfn/mfn.cpp 2007-10-13 14:56:36 UTC (rev 356)
@@ -148,6 +148,8 @@
}
}
+ im = il::conform( im, il::flipped );
+
int width = im->width( );
int height = im->height( );
int pitch = im->pitch( );
Modified: trunk/unity.sh
===================================================================
--- trunk/unity.sh 2007-10-12 20:56:05 UTC (rev 355)
+++ trunk/unity.sh 2007-10-13 14:56:36 UTC (rev 356)
@@ -614,6 +614,10 @@
make_framework_libraries_unique "HDRFlowImage" &&
make_framework_libraries_unique "HDRFlowMedia"
check_status $?
+
+ if [ x"$USER" = x"root" ]
+ then chown -Rh root:admin HDRFlow.framework
+ fi
fi
if [ "$build_application" -eq 1 ]
@@ -624,7 +628,7 @@
fi
if [ "$build_installer" -eq 1 ]
- then echo " Building packages..."
+ then echo " Building packages..."
make_installer HDRFlowFramework
check_status $?
fi
@@ -642,6 +646,10 @@
install_name_tool -id HDRFlowMayaImageReaders.bundle HDRFlowMaya/HDRFlowMayaImageReaders.bundle &&
make_umbrella_framework_deps HDRFlowMaya/HDRFlowMayaImageReaders.bundle
+ if [ x"$USER" = x"root" ]
+ then chown -Rh root:admin HDRFlowMaya
+ fi
+
if [ "$build_installer" -eq 1 ]
then echo " Building packages..."
make_installer HDRFlowMaya
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-10-12 20:56:07
|
Revision: 355
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=355&view=rev
Author: glslang
Date: 2007-10-12 13:56:05 -0700 (Fri, 12 Oct 2007)
Log Message:
-----------
+ reverts back bad checkin
Modified Paths:
--------------
trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_plugin.cpp
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_plugin.cpp 2007-10-12 20:53:22 UTC (rev 354)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_plugin.cpp 2007-10-12 20:56:05 UTC (rev 355)
@@ -5,9 +5,8 @@
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
-//#include <ImfRgbaFile.h>
-#include <ImfInputFile.h>
-//#include <ImfOutputFile.h>
+#include <ImfRgbaFile.h>
+#include <ImfCRgbaFile.h>
#include <ImfArray.h>
#include <openimagelib/il/openimagelib_plugin.hpp>
@@ -23,15 +22,9 @@
{ delete im; }
il::image_type_ptr load_exr( const pl::string& uri )
- {printf("EXR IMAGE FILE %s\n", uri.c_str());
- try
- {
- Imf::InputFile file( uri.c_str( ) );
- }
- catch( ... )
- {
- }
-/*
+ {
+ Imf::RgbaInputFile file( uri.c_str( ) );
+
Imath::Box2i dw = file.header( ).dataWindow( );
int width = dw.max.x - dw.min.x + 1;
int height = dw.max.y - dw.min.y + 1;
@@ -59,8 +52,7 @@
texels += ( im->pitch( ) - im->linesize( ) ) * sizeof( float );
}
- return im;*/
- return il::image_type_ptr( );
+ return im;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-10-12 20:53:26
|
Revision: 354
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=354&view=rev
Author: glslang
Date: 2007-10-12 13:53:22 -0700 (Fri, 12 Oct 2007)
Log Message:
-----------
+ maya bundle package maker
Modified Paths:
--------------
trunk/HDRFlowMaya.pmproj
trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_plugin.cpp
Added Paths:
-----------
trunk/HDRFlowMayaBundle.pmproj
Modified: trunk/HDRFlowMaya.pmproj
===================================================================
(Binary files differ)
Added: trunk/HDRFlowMayaBundle.pmproj
===================================================================
(Binary files differ)
Property changes on: trunk/HDRFlowMayaBundle.pmproj
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_plugin.cpp 2007-10-10 21:22:34 UTC (rev 353)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_plugin.cpp 2007-10-12 20:53:22 UTC (rev 354)
@@ -5,8 +5,9 @@
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
-#include <ImfRgbaFile.h>
-#include <ImfCRgbaFile.h>
+//#include <ImfRgbaFile.h>
+#include <ImfInputFile.h>
+//#include <ImfOutputFile.h>
#include <ImfArray.h>
#include <openimagelib/il/openimagelib_plugin.hpp>
@@ -22,9 +23,15 @@
{ delete im; }
il::image_type_ptr load_exr( const pl::string& uri )
- {
- Imf::RgbaInputFile file( uri.c_str( ) );
-
+ {printf("EXR IMAGE FILE %s\n", uri.c_str());
+ try
+ {
+ Imf::InputFile file( uri.c_str( ) );
+ }
+ catch( ... )
+ {
+ }
+/*
Imath::Box2i dw = file.header( ).dataWindow( );
int width = dw.max.x - dw.min.x + 1;
int height = dw.max.y - dw.min.y + 1;
@@ -52,7 +59,8 @@
texels += ( im->pitch( ) - im->linesize( ) ) * sizeof( float );
}
- return im;
+ return im;*/
+ return il::image_type_ptr( );
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-10-10 21:36:01
|
Revision: 353
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=353&view=rev
Author: glslang
Date: 2007-10-10 14:22:34 -0700 (Wed, 10 Oct 2007)
Log Message:
-----------
+ makes crop underlying element size aware
Modified Paths:
--------------
trunk/lib/openlibraries/src/openimagelib/il/basic_image.hpp
trunk/lib/openlibraries/src/openimagelib/il/float_traits.hpp
trunk/lib/openlibraries/src/openimagelib/il/rgb_traits.hpp
Modified: trunk/lib/openlibraries/src/openimagelib/il/basic_image.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/basic_image.hpp 2007-10-09 21:21:59 UTC (rev 352)
+++ trunk/lib/openlibraries/src/openimagelib/il/basic_image.hpp 2007-10-10 21:22:34 UTC (rev 353)
@@ -215,20 +215,22 @@
bool is_flipped = ( flags & flipped ) != 0;
bool is_flopped = ( flags & flopped ) != 0;
+ size_type element_size = bitdepth( ) / 8;
+
plane &p = crop[ 0 ];
p.width = w;
p.height = h;
p.linesize = w * block_size_;
if ( !is_flipped )
- p.offset = p.pitch * y;
+ p.offset = p.pitch * y * element_size;
else
- p.offset = ( ( height_ - y - h ) * p.pitch );
+ p.offset = ( ( height_ - y - h ) * p.pitch ) * element_size;
if ( !is_flopped )
- p.offset += x * block_size_;
+ p.offset += x * block_size_ * element_size;
else
- p.offset += ( width_ - w - x ) * block_size_;
+ p.offset += ( width_ - w - x ) * block_size_ * element_size;
}
// Flop scan which assumes block_size_ is known and <= 4 - associated plane is
@@ -350,7 +352,7 @@
// Obtain the number of planes and iterate through each
size_type count = structure_->plane_count( );
- size_type sfactor = structure_->bitdepth( ) / 8;
+ size_type element_size = structure_->bitdepth( ) / 8;
for ( size_type i = 0; i < count; i ++ )
{
@@ -358,7 +360,7 @@
const_pointer src = other.data( i );
size_type src_pitch = other.pitch( i );
- src_pitch *= sfactor;
+ src_pitch *= element_size;
// The destination plane, pitch and height
pointer dst = data( i );
@@ -367,8 +369,8 @@
size_type dst_scan = linesize( i );
size_type dst_height = height( i );
- dst_scan *= sfactor;
- dst_pitch *= sfactor;
+ dst_scan *= element_size;
+ dst_pitch *= element_size;
// We need to orient the dest correctly
if ( need_flip )
Modified: trunk/lib/openlibraries/src/openimagelib/il/float_traits.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/float_traits.hpp 2007-10-09 21:21:59 UTC (rev 352)
+++ trunk/lib/openlibraries/src/openimagelib/il/float_traits.hpp 2007-10-10 21:22:34 UTC (rev 353)
@@ -91,6 +91,9 @@
virtual r16g16b16f* clone( size_type w, size_type h )
{ return new r16g16b16f( *this, w, h ); }
+
+ virtual void flop_scan_line( size_t p, pointer dst, const_pointer src, size_type w ) const
+ { flop_scan_line_( p, ( short* ) dst, ( const unsigned short* ) src, w ); }
};
template<typename T = float, class storage = default_storage<T> >
@@ -131,6 +134,9 @@
virtual b16g16r16f* clone( size_type w, size_type h )
{ return new b16g16r16f( *this, w, h ); }
+
+ virtual void flop_scan_line( size_t p, pointer dst, const_pointer src, size_type w ) const
+ { flop_scan_line_( p, ( short* ) dst, ( const unsigned short* ) src, w ); }
};
template<typename T = float, class storage = default_storage<T> >
@@ -171,6 +177,9 @@
virtual r16g16b16a16f* clone( size_type w, size_type h )
{ return new r16g16b16a16f( *this, w, h ); }
+
+ virtual void flop_scan_line( size_t p, pointer dst, const_pointer src, size_type w ) const
+ { flop_scan_line_( p, ( short* ) dst, ( const unsigned short* ) src, w ); }
};
template<typename T = float, class storage = default_storage<T> >
@@ -213,9 +222,7 @@
{ return new r32g32b32f( *this, w, h ); }
virtual void flop_scan_line( size_t p, pointer dst, const_pointer src, size_type w ) const
- {
- flop_scan_line_( p, ( float* ) dst, ( const float* ) src, w );
- }
+ { flop_scan_line_( p, ( float* ) dst, ( const float* ) src, w ); }
};
template<typename T = float, class storage = default_storage<T> >
@@ -258,9 +265,7 @@
{ return new r32g32b32a32f( *this, w, h ); }
virtual void flop_scan_line( size_t p, pointer dst, const_pointer src, size_type w ) const
- {
- flop_scan_line_( p, ( float* ) dst, ( const float* ) src, w );
- }
+ { flop_scan_line_( p, ( float* ) dst, ( const float* ) src, w ); }
};
} } }
Modified: trunk/lib/openlibraries/src/openimagelib/il/rgb_traits.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/rgb_traits.hpp 2007-10-09 21:21:59 UTC (rev 352)
+++ trunk/lib/openlibraries/src/openimagelib/il/rgb_traits.hpp 2007-10-10 21:22:34 UTC (rev 353)
@@ -521,7 +521,7 @@
{ return bs * sizeof( unsigned short ) * detail::rgb_Allocate_size<T>( )( 1, width, height, depth ); }
virtual size_type bitdepth( ) const
- { return 12; }
+ { return 16; }
virtual l12a12p* clone( size_type w, size_type h )
{ return new l12a12p( *this, w, h ); }
@@ -684,7 +684,7 @@
{ return sizeof( unsigned short ) * detail::rgb_Allocate_size<T>( )( bs, width, height, depth ); }
virtual size_type bitdepth( ) const
- { return 10; }
+ { return 16; }
virtual r10g10b10* clone( size_type w, size_type h )
{ return new r10g10b10( *this, w, h ); }
@@ -743,7 +743,7 @@
{ return sizeof( unsigned short ) * detail::rgb_Allocate_size<T>( )( bs, width, height, depth ); }
virtual size_type bitdepth( ) const
- { return 10; }
+ { return 16; }
virtual r10g10b10a10* clone( size_type w, size_type h )
{ return new r10g10b10a10( *this, w, h ); }
@@ -803,7 +803,7 @@
{ return bs * sizeof( unsigned short ) * detail::rgb_Allocate_size<T>( )( 1, width, height, depth ); }
virtual size_type bitdepth( ) const
- { return 10; }
+ { return 16; }
virtual r10g10b10p* clone( size_type w, size_type h )
{ return new r10g10b10p( *this, w, h ); }
@@ -869,7 +869,7 @@
{ return bs * sizeof( unsigned short ) * detail::rgb_Allocate_size<T>( )( 1, width, height, depth ); }
virtual size_type bitdepth( ) const
- { return 10; }
+ { return 16; }
virtual r10g10b10a10p* clone( size_type w, size_type h )
{ return new r10g10b10a10p( *this, w, h ); }
@@ -937,7 +937,7 @@
{ return sizeof( unsigned short ) * detail::rgb_Allocate_size<T>( )( bs, width, height, depth ); }
virtual size_type bitdepth( ) const
- { return 12; }
+ { return 16; }
virtual r12g12b12* clone( size_type w, size_type h )
{ return new r12g12b12( *this, w, h ); }
@@ -996,7 +996,7 @@
{ return sizeof( unsigned short ) * detail::rgb_Allocate_size<T>( )( bs, width, height, depth ); }
virtual size_type bitdepth( ) const
- { return 12; }
+ { return 16; }
virtual r12g12b12a12* clone( size_type w, size_type h )
{ return new r12g12b12a12( *this, w, h ); }
@@ -1056,7 +1056,7 @@
{ return bs * sizeof( unsigned short ) * detail::rgb_Allocate_size<T>( )( 1, width, height, depth ); }
virtual size_type bitdepth( ) const
- { return 12; }
+ { return 16; }
virtual r12g12b12p* clone( size_type w, size_type h )
{ return new r12g12b12p( *this, w, h ); }
@@ -1122,7 +1122,7 @@
{ return bs * sizeof( unsigned short ) * detail::rgb_Allocate_size<T>( )( 1, width, height, depth ); }
virtual size_type bitdepth( ) const
- { return 12; }
+ { return 16; }
virtual r12g12b12a12p* clone( size_type w, size_type h )
{ return new r12g12b12a12p( *this, w, h ); }
@@ -1504,7 +1504,7 @@
{ return sizeof( unsigned short ) * detail::rgb_Allocate_size<T>( )( bs, width, height, depth ); }
virtual size_type bitdepth( ) const
- { return 10; }
+ { return 16; }
virtual r10g10b10log* clone( size_type w, size_type h )
{ return new r10g10b10log( *this, w, h ); }
@@ -1563,7 +1563,7 @@
{ return sizeof( unsigned short ) * detail::rgb_Allocate_size<T>( )( bs, width, height, depth ); }
virtual size_type bitdepth( ) const
- { return 12; }
+ { return 16; }
virtual r12g12b12log* clone( size_type w, size_type h )
{ return new r12g12b12log( *this, w, h ); }
@@ -1740,7 +1740,7 @@
{ return sizeof( unsigned short ) * detail::rgb_Allocate_size<T>( )( bs, width, height, depth ); }
virtual size_type bitdepth( ) const
- { return 10; }
+ { return 16; }
virtual r10g10b10a10log* clone( size_type w, size_type h )
{ return new r10g10b10a10log( *this, w, h ); }
@@ -1799,7 +1799,7 @@
{ return sizeof( unsigned short ) * detail::rgb_Allocate_size<T>( )( bs, width, height, depth ); }
virtual size_type bitdepth( ) const
- { return 12; }
+ { return 16; }
virtual r12g12b12a12log* clone( size_type w, size_type h )
{ return new r12g12b12a12log( *this, w, h ); }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-10-09 21:45:26
|
Revision: 352
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=352&view=rev
Author: glslang
Date: 2007-10-09 14:21:59 -0700 (Tue, 09 Oct 2007)
Log Message:
-----------
+ generalises flips and flops
Modified Paths:
--------------
trunk/lib/openlibraries/src/openimagelib/il/basic_image.hpp
trunk/lib/openlibraries/src/openimagelib/il/float_traits.hpp
trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_plugin.cpp
trunk/lib/openlibraries/test/openimagelib/GL/_2D_exr/_2D_exr.cpp
Modified: trunk/lib/openlibraries/src/openimagelib/il/basic_image.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/basic_image.hpp 2007-10-08 21:33:45 UTC (rev 351)
+++ trunk/lib/openlibraries/src/openimagelib/il/basic_image.hpp 2007-10-09 21:21:59 UTC (rev 352)
@@ -233,7 +233,8 @@
// Flop scan which assumes block_size_ is known and <= 4 - associated plane is
// the first argument, thus allowing a different block/sample size per plane
- virtual void flop_scan_line( size_t, pointer dst, const_pointer src, size_type w ) const
+ template<typename pointer_, typename const_pointer_>
+ void flop_scan_line_( size_t, pointer_ dst, const_pointer_ src, size_type w ) const
{
src += block_size_ * ( w - 1 );
while( w -- )
@@ -249,6 +250,11 @@
}
}
+ virtual void flop_scan_line( size_t p, pointer dst, const_pointer src, size_type w ) const
+ {
+ flop_scan_line_( p, dst, src, w );
+ }
+
// Convenience method to assist image class
virtual const planes &get_planes( )
{
@@ -343,13 +349,16 @@
bool need_flop = is_flopped( ) != other.is_flopped( );
// Obtain the number of planes and iterate through each
- size_t count = structure_->plane_count( );
+ size_type count = structure_->plane_count( );
+ size_type sfactor = structure_->bitdepth( ) / 8;
- for ( size_t i = 0; i < count; i ++ )
+ for ( size_type i = 0; i < count; i ++ )
{
// We need the src and pitch of the cropped source plane
const_pointer src = other.data( i );
size_type src_pitch = other.pitch( i );
+
+ src_pitch *= sfactor;
// The destination plane, pitch and height
pointer dst = data( i );
@@ -357,6 +366,9 @@
size_type dst_pitch = pitch( i );
size_type dst_scan = linesize( i );
size_type dst_height = height( i );
+
+ dst_scan *= sfactor;
+ dst_pitch *= sfactor;
// We need to orient the dest correctly
if ( need_flip )
Modified: trunk/lib/openlibraries/src/openimagelib/il/float_traits.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/float_traits.hpp 2007-10-08 21:33:45 UTC (rev 351)
+++ trunk/lib/openlibraries/src/openimagelib/il/float_traits.hpp 2007-10-09 21:21:59 UTC (rev 352)
@@ -211,6 +211,11 @@
virtual r32g32b32f* clone( size_type w, size_type h )
{ return new r32g32b32f( *this, w, h ); }
+
+ virtual void flop_scan_line( size_t p, pointer dst, const_pointer src, size_type w ) const
+ {
+ flop_scan_line_( p, ( float* ) dst, ( const float* ) src, w );
+ }
};
template<typename T = float, class storage = default_storage<T> >
@@ -251,6 +256,11 @@
virtual r32g32b32a32f* clone( size_type w, size_type h )
{ return new r32g32b32a32f( *this, w, h ); }
+
+ virtual void flop_scan_line( size_t p, pointer dst, const_pointer src, size_type w ) const
+ {
+ flop_scan_line_( p, ( float* ) dst, ( const float* ) src, w );
+ }
};
} } }
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_plugin.cpp 2007-10-08 21:33:45 UTC (rev 351)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_plugin.cpp 2007-10-09 21:21:59 UTC (rev 352)
@@ -15,6 +15,7 @@
#include <cstring>
#include <new>
#include <vector>
+#include <limits>
#include <ofxCore.h>
#include <ofxImageEffect.h>
Modified: trunk/lib/openlibraries/test/openimagelib/GL/_2D_exr/_2D_exr.cpp
===================================================================
--- trunk/lib/openlibraries/test/openimagelib/GL/_2D_exr/_2D_exr.cpp 2007-10-08 21:33:45 UTC (rev 351)
+++ trunk/lib/openlibraries/test/openimagelib/GL/_2D_exr/_2D_exr.cpp 2007-10-09 21:21:59 UTC (rev 352)
@@ -77,6 +77,7 @@
il::image_type_ptr image = plug->load( path );
if( !image ) return 0;
+ image = il::conform( image, il::flipped | il::flopped );
image = il::tm_linear( image );
GLint internal_format;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-10-08 21:33:48
|
Revision: 351
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=351&view=rev
Author: glslang
Date: 2007-10-08 14:33:45 -0700 (Mon, 08 Oct 2007)
Log Message:
-----------
+build fix
Modified Paths:
--------------
trunk/lib/extras/m4/maya.m4
Modified: trunk/lib/extras/m4/maya.m4
===================================================================
--- trunk/lib/extras/m4/maya.m4 2007-10-07 21:32:23 UTC (rev 350)
+++ trunk/lib/extras/m4/maya.m4 2007-10-08 21:33:45 UTC (rev 351)
@@ -22,15 +22,18 @@
CXXFLAGS="$CXXFLAGS ${MAYA_CXXFLAGS}"
AC_LANG(C++)
- AC_CHECK_HEADER(maya/IMF.h,
+ AC_CHECK_HEADER(maya/MFnPlugin.h,
[ac_have_maya="yes" AC_DEFINE(HAVE_MAYA,1,[Define this if you have Maya devkit])],
- [AC_MSG_WARN([*** Maya development headers not available. Please check your Maya installation ***])])
+ [AC_MSG_WARN([*** Maya development headers not available. Please check your Maya installation ***])],
+ [[#ifdef __APPLE__
+ # include <maya/OpenMayaMac.h>
+ #endif]])
if test x$ac_have_maya = "xyes"; then
case $host in
*-apple-darwin*)
MAYA_LDFLAGS="${MAYA_LDFLAGS} -Wl,-executable_path,${with_mayadir}/Maya.app/Contents/MacOS"
- MAYA_LIBS="-Xlinker -lIMFbase -Xlinker -lOpenMaya -Xlinker -lOpenMayaUI -Xlinker -lFoundation -Xlinker -framework -Xlinker AGL -Xlinker -framework -Xlinker OpenGL"
+ MAYA_LIBS="-Xlinker -lOpenMaya -Xlinker -lOpenMayaUI -Xlinker -lFoundation -Xlinker -framework -Xlinker AGL -Xlinker -framework -Xlinker OpenGL"
;;
esac
ac_use_maya=yes
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-10-07 21:32:26
|
Revision: 350
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=350&view=rev
Author: glslang
Date: 2007-10-07 14:32:23 -0700 (Sun, 07 Oct 2007)
Log Message:
-----------
+ use msxml6
Modified Paths:
--------------
trunk/lib/openlibraries/src/openpluginlib/pl/opl_importer.cpp
trunk/lib/openlibraries/src/openpluginlib/pl/stream.cpp
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/opl_importer.cpp
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/opl_importer.cpp 2007-10-06 19:49:45 UTC (rev 349)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/opl_importer.cpp 2007-10-07 21:32:23 UTC (rev 350)
@@ -45,18 +45,20 @@
#ifdef WIN32
MSXML2::ISAXXMLReaderPtr pSAXReader = NULL;
- HRESULT hr = pSAXReader.CreateInstance( __uuidof( MSXML2::SAXXMLReader40 ) );
-
- assert( SUCCEEDED( hr ) && L"openpluginlib::opl_importer::operator( ) SAXReader instantiation failed." );
+ HRESULT hr = pSAXReader.CreateInstance( __uuidof( MSXML2::SAXXMLReader60 ) );
+ if( FAILED( hr ) )
+ return;
content_handler_msxml* ch = new content_handler_msxml( );
ch->set_branch_path( file.branch_path( ) );
hr = pSAXReader->putContentHandler( ch );
- assert( SUCCEEDED( hr && L"openpluginlib::opl_importer::opl_importer:operator( ) putContentHandler failed." ) );
+ if( FAILED( hr ) )
+ return;
hr = pSAXReader->parseURL( ( unsigned short* ) to_wstring( file.native_file_string( ).c_str( ) ).c_str( ) );
- assert( SUCCEEDED( hr ) && L"openpluginlib::opl_importer::opl_importer:operator( ) parseURL failed." );
+ if( FAILED( hr ) )
+ return;
#else
std::auto_ptr<content_handler_libxml> ch( new content_handler_libxml( ) );
ch->set_branch_path( file.branch_path( ) );
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/stream.cpp
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/stream.cpp 2007-10-06 19:49:45 UTC (rev 349)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/stream.cpp 2007-10-07 21:32:23 UTC (rev 350)
@@ -27,7 +27,7 @@
mapped_.open( fs_path.native_file_string( ), flags );
if( mapped_.is_open( ) )
{
- if( ( flags_ && std::ios::out ) != 0 )data_ = const_cast<char*>( mapped_.const_data( ) );
+ if( ( flags_ && std::ios::out ) != 0 ) data_ = const_cast<char*>( mapped_.const_data( ) );
else data_ = mapped_.data( );
max_size_ = mapped_.size( );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-10-06 19:49:46
|
Revision: 349
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=349&view=rev
Author: glslang
Date: 2007-10-06 12:49:45 -0700 (Sat, 06 Oct 2007)
Log Message:
-----------
+ build fixes (make deps explicit)
Modified Paths:
--------------
trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/bmp/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/dds/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/dpx/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/exr/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/hdr/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/jpg/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/png/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/psd/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/sgi/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/tga/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/tiff/Makefile.am
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/Makefile.am 2007-10-06 16:21:38 UTC (rev 348)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/Makefile.am 2007-10-06 19:49:45 UTC (rev 349)
@@ -16,7 +16,8 @@
-DIL_EXPORTS
libopenimagelib_3D_lightmap_la_LIBADD = \
- $(BOOST_FILESYSTEM_LIBS)
+ $(top_builddir)/src/openpluginlib/pl/libopenpluginlib_pl.la \
+ $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la
libopenimagelib_3D_lightmap_la_LDFLAGS = \
$(OLIB_LDFLAGS) \
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/bmp/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/bmp/Makefile.am 2007-10-06 16:21:38 UTC (rev 348)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/bmp/Makefile.am 2007-10-06 19:49:45 UTC (rev 349)
@@ -16,7 +16,8 @@
-DIL_EXPORTS
libopenimagelib_bmp_la_LIBADD = \
- $(BOOST_FILESYSTEM_LIBS)
+ $(top_builddir)/src/openpluginlib/pl/libopenpluginlib_pl.la \
+ $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la
libopenimagelib_bmp_la_LDFLAGS = \
$(OLIB_LDFLAGS) \
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/dds/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dds/Makefile.am 2007-10-06 16:21:38 UTC (rev 348)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dds/Makefile.am 2007-10-06 19:49:45 UTC (rev 349)
@@ -16,7 +16,8 @@
-DIL_EXPORTS
libopenimagelib_dds_la_LIBADD = \
- $(BOOST_FILESYSTEM_LIBS)
+ $(top_builddir)/src/openpluginlib/pl/libopenpluginlib_pl.la \
+ $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la
libopenimagelib_dds_la_LDFLAGS = \
$(OLIB_LDFLAGS) \
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/dpx/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dpx/Makefile.am 2007-10-06 16:21:38 UTC (rev 348)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dpx/Makefile.am 2007-10-06 19:49:45 UTC (rev 349)
@@ -16,7 +16,8 @@
-DIL_EXPORTS
libopenimagelib_dpx_la_LIBADD = \
- $(BOOST_FILESYSTEM_LIBS)
+ $(top_builddir)/src/openpluginlib/pl/libopenpluginlib_pl.la \
+ $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la
libopenimagelib_dpx_la_LDFLAGS = \
$(OLIB_LDFLAGS) \
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/exr/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/exr/Makefile.am 2007-10-06 16:21:38 UTC (rev 348)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/exr/Makefile.am 2007-10-06 19:49:45 UTC (rev 349)
@@ -18,7 +18,8 @@
-DIL_EXPORTS
libopenimagelib_exr_la_LIBADD = \
- $(BOOST_FILESYSTEM_LIBS) \
+ $(top_builddir)/src/openpluginlib/pl/libopenpluginlib_pl.la \
+ $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la \
$(OPENEXR_LIBS)
libopenimagelib_exr_la_LDFLAGS = \
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/hdr/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/hdr/Makefile.am 2007-10-06 16:21:38 UTC (rev 348)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/hdr/Makefile.am 2007-10-06 19:49:45 UTC (rev 349)
@@ -16,7 +16,8 @@
-DIL_EXPORTS
libopenimagelib_hdr_la_LIBADD = \
- $(BOOST_FILESYSTEM_LIBS)
+ $(top_builddir)/src/openpluginlib/pl/libopenpluginlib_pl.la \
+ $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la
libopenimagelib_hdr_la_LDFLAGS = \
$(OLIB_LDFLAGS) \
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/jpg/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/jpg/Makefile.am 2007-10-06 16:21:38 UTC (rev 348)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/jpg/Makefile.am 2007-10-06 19:49:45 UTC (rev 349)
@@ -17,8 +17,8 @@
-DIL_EXPORTS
libopenimagelib_jpg_la_LIBADD = \
- $(BOOST_FILESYSTEM_LIBS) \
$(JPEG_LIBS) \
+ $(top_builddir)/src/openpluginlib/pl/libopenpluginlib_pl.la \
$(top_builddir)/src/openimagelib/il/libopenimagelib_il.la
libopenimagelib_jpg_la_LDFLAGS = \
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/png/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/png/Makefile.am 2007-10-06 16:21:38 UTC (rev 348)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/png/Makefile.am 2007-10-06 19:49:45 UTC (rev 349)
@@ -17,7 +17,8 @@
-DIL_EXPORTS
libopenimagelib_png_la_LIBADD = \
- $(BOOST_FILESYSTEM_LIBS) \
+ $(top_builddir)/src/openpluginlib/pl/libopenpluginlib_pl.la \
+ $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la \
$(PNG_LIBS)
libopenimagelib_png_la_LDFLAGS = \
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/psd/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/psd/Makefile.am 2007-10-06 16:21:38 UTC (rev 348)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/psd/Makefile.am 2007-10-06 19:49:45 UTC (rev 349)
@@ -16,7 +16,8 @@
-DIL_EXPORTS
libopenimagelib_psd_la_LIBADD = \
- $(BOOST_FILESYSTEM_LIBS)
+ $(top_builddir)/src/openpluginlib/pl/libopenpluginlib_pl.la \
+ $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la
libopenimagelib_psd_la_LDFLAGS = \
$(OLIB_LDFLAGS) \
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/Makefile.am 2007-10-06 16:21:38 UTC (rev 348)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/Makefile.am 2007-10-06 19:49:45 UTC (rev 349)
@@ -18,7 +18,8 @@
-DIL_EXPORTS
libopenimagelib_quicktime_la_LIBADD = \
- $(BOOST_FILESYSTEM_LIBS) \
+ $(top_builddir)/src/openpluginlib/pl/libopenpluginlib_pl.la \
+ $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la \
$(QUICKTIME_LIBS)
libopenimagelib_quicktime_la_LDFLAGS = \
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/sgi/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/sgi/Makefile.am 2007-10-06 16:21:38 UTC (rev 348)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/sgi/Makefile.am 2007-10-06 19:49:45 UTC (rev 349)
@@ -16,7 +16,8 @@
-DIL_EXPORTS
libopenimagelib_sgi_la_LIBADD = \
- $(BOOST_FILESYSTEM_LIBS)
+ $(top_builddir)/src/openpluginlib/pl/libopenpluginlib_pl.la \
+ $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la
libopenimagelib_sgi_la_LDFLAGS = \
$(OLIB_LDFLAGS) \
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/tga/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tga/Makefile.am 2007-10-06 16:21:38 UTC (rev 348)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tga/Makefile.am 2007-10-06 19:49:45 UTC (rev 349)
@@ -16,7 +16,8 @@
-DIL_EXPORTS
libopenimagelib_tga_la_LIBADD = \
- $(BOOST_FILESYSTEM_LIBS)
+ $(top_builddir)/src/openpluginlib/pl/libopenpluginlib_pl.la \
+ $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la
libopenimagelib_tga_la_LDFLAGS = \
$(OLIB_LDFLAGS) \
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/tiff/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tiff/Makefile.am 2007-10-06 16:21:38 UTC (rev 348)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tiff/Makefile.am 2007-10-06 19:49:45 UTC (rev 349)
@@ -19,7 +19,8 @@
-DIL_EXPORTS
libopenimagelib_tiff_la_LIBADD = \
- $(BOOST_FILESYSTEM_LIBS) \
+ $(top_builddir)/src/openpluginlib/pl/libopenpluginlib_pl.la \
+ $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la \
$(TIFF_LIBS)
libopenimagelib_tiff_la_LDFLAGS = \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-10-06 16:21:39
|
Revision: 348
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=348&view=rev
Author: glslang
Date: 2007-10-06 09:21:38 -0700 (Sat, 06 Oct 2007)
Log Message:
-----------
+build fixes
Modified Paths:
--------------
trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj
trunk/unity.sh
Modified: trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj
===================================================================
--- trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj 2007-10-06 16:11:16 UTC (rev 347)
+++ trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj 2007-10-06 16:21:38 UTC (rev 348)
@@ -404,6 +404,8 @@
HEADER_SEARCH_PATHS = (
"$(inherited)",
/usr/include/python2.3,
+ "/usr/local/include/boost-1_34_1",
+ /usr/local/include,
);
PREBINDING = NO;
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
@@ -422,6 +424,8 @@
HEADER_SEARCH_PATHS = (
"$(inherited)",
/usr/include/python2.3,
+ "/usr/local/include/boost-1_34_1",
+ /usr/local/include,
);
PREBINDING = NO;
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
Modified: trunk/unity.sh
===================================================================
--- trunk/unity.sh 2007-10-06 16:11:16 UTC (rev 347)
+++ trunk/unity.sh 2007-10-06 16:21:38 UTC (rev 348)
@@ -165,7 +165,7 @@
esac
done
- #sed -e "s|$header_path|$2|g" -e "s|GL/glew.h|HDRFlowPlugin/glew.h|g" -e "s|boost/|HDRFlowPlugin/boost/|" current_header.$$ > $2.framework/Versions/Current/Headers/$i
+ sed -e "s|$header_path|$2|g" current_header.$$ > $2.framework/Versions/Current/Headers/$i
rm current_header.$$
fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-10-06 16:11:17
|
Revision: 347
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=347&view=rev
Author: glslang
Date: 2007-10-06 09:11:16 -0700 (Sat, 06 Oct 2007)
Log Message:
-----------
+build fixes
Modified Paths:
--------------
trunk/HDRFlowMaya.pmproj
trunk/unity.sh
Modified: trunk/HDRFlowMaya.pmproj
===================================================================
(Binary files differ)
Modified: trunk/unity.sh
===================================================================
--- trunk/unity.sh 2007-10-06 13:25:04 UTC (rev 346)
+++ trunk/unity.sh 2007-10-06 16:11:16 UTC (rev 347)
@@ -4,6 +4,7 @@
# Unification of build and distribution:
# recurses into lib and app directories, building each in turn.
# updates Boost version in VC project files.
+# updates version.
# builds OS/X frameworks
check_status( )
@@ -164,7 +165,7 @@
esac
done
- sed -e "s|$header_path|$2|g" -e "s|GL/glew.h|HDRFlowPlugin/glew.h|g" -e "s|boost/|HDRFlowPlugin/boost/|" current_header.$$ > $2.framework/Versions/Current/Headers/$i
+ #sed -e "s|$header_path|$2|g" -e "s|GL/glew.h|HDRFlowPlugin/glew.h|g" -e "s|boost/|HDRFlowPlugin/boost/|" current_header.$$ > $2.framework/Versions/Current/Headers/$i
rm current_header.$$
fi
@@ -448,7 +449,16 @@
done
done
done
- fi
+ fi
+
+ libs=`ls HDRFlow.framework/Versions/A/Frameworks/$1.framework/Versions/A/Libraries/*.dylib`
+ for i in $libs
+ do deps=`otool -L $i | grep $install_name_prefix/$1.framework | cut -d ' ' -f 1`
+ for k in $deps
+ do install_name_tool -change $k \
+ $install_name_prefix/HDRFlow.framework/Versions/A/Frameworks/$1.framework/Versions/A/Libraries/`basename $k` $i
+ done
+ done
}
make_umbrella_framework( )
@@ -533,10 +543,10 @@
done
# Copy Boost and GLEW headers
- cp -R /usr/local/include/boost-$boost_new_version/boost HDRFlow.framework/Versions/$framework_version/Frameworks/HDRFlowPlugin.framework/Headers
- cp -R /usr/local/include/GL/glew.h HDRFlow.framework/Versions/$framework_version/Frameworks/HDRFlowPlugin.framework/Headers
- header_prefix="HDRFlow.framework/Versions/$framework_version/Frameworks/HDRFlowPlugin.framework/Headers/boost"
- find $header_prefix -name '*.hpp' | xargs sed -e "s|boost/|HDRFlowPlugin/boost/|g" -i ''
+ #cp -R /usr/local/include/boost-$boost_new_version/boost HDRFlow.framework/Versions/$framework_version/Frameworks/HDRFlowPlugin.framework/Headers
+ #cp -R /usr/local/include/GL/glew.h HDRFlow.framework/Versions/$framework_version/Frameworks/HDRFlowPlugin.framework/Headers
+ #header_prefix="HDRFlow.framework/Versions/$framework_version/Frameworks/HDRFlowPlugin.framework/Headers/boost"
+ #find $header_prefix -name '*.hpp' | xargs sed -e "s|boost/|HDRFlowPlugin/boost/|g" -i ''
check_status $?
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-10-06 13:25:06
|
Revision: 346
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=346&view=rev
Author: glslang
Date: 2007-10-06 06:25:04 -0700 (Sat, 06 Oct 2007)
Log Message:
-----------
+build fixes
Modified Paths:
--------------
trunk/lib/extras/src/imf/hdr/Makefile.am
trunk/lib/extras/src/imf/mfn/Makefile.am
trunk/lib/extras/src/panoramic/Makefile.am
trunk/lib/extras/src/ppm/Makefile.am
trunk/lib/extras/src/raw/Makefile.am
Modified: trunk/lib/extras/src/imf/hdr/Makefile.am
===================================================================
--- trunk/lib/extras/src/imf/hdr/Makefile.am 2007-10-06 11:32:43 UTC (rev 345)
+++ trunk/lib/extras/src/imf/hdr/Makefile.am 2007-10-06 13:25:04 UTC (rev 346)
@@ -17,11 +17,11 @@
libhdrflow_extras_imfhdr_la_CXXFLAGS = \
$(BOOST_INCLUDE_PATH) \
$(MAYA_CXXFLAGS) \
- -I$(top_builddir)/../openlibraries/src
+ -I$(top_srcdir)/../openlibraries/src
libhdrflow_extras_imfhdr_la_LIBADD = \
$(MAYA_LIBS) \
- $(top_builddir)/../openlibraries/src/openpluginlib/pl/libopenpluginlib_pl.la
+ $(top_srcdir)/../openlibraries/src/openpluginlib/pl/libopenpluginlib_pl.la
libhdrflow_extras_imfhdr_la_LDFLAGS = \
$(MAYA_LDFLAGS)
Modified: trunk/lib/extras/src/imf/mfn/Makefile.am
===================================================================
--- trunk/lib/extras/src/imf/mfn/Makefile.am 2007-10-06 11:32:43 UTC (rev 345)
+++ trunk/lib/extras/src/imf/mfn/Makefile.am 2007-10-06 13:25:04 UTC (rev 346)
@@ -15,12 +15,12 @@
libhdrflow_extras_mfn_la_CXXFLAGS = \
$(BOOST_INCLUDE_PATH) \
$(MAYA_CXXFLAGS) \
- -I$(top_builddir)/../openlibraries/src
+ -I$(top_srcdir)/../openlibraries/src
libhdrflow_extras_mfn_la_LIBADD = \
$(MAYA_LIBS) \
- $(top_builddir)/../openlibraries/src/openpluginlib/pl/libopenpluginlib_pl.la \
- $(top_builddir)/../openlibraries/src/openimagelib/il/libopenimagelib_il.la
+ $(top_srcdir)/../openlibraries/src/openpluginlib/pl/libopenpluginlib_pl.la \
+ $(top_srcdir)/../openlibraries/src/openimagelib/il/libopenimagelib_il.la
libhdrflow_extras_mfn_la_LDFLAGS = \
$(MAYA_LDFLAGS)
Modified: trunk/lib/extras/src/panoramic/Makefile.am
===================================================================
--- trunk/lib/extras/src/panoramic/Makefile.am 2007-10-06 11:32:43 UTC (rev 345)
+++ trunk/lib/extras/src/panoramic/Makefile.am 2007-10-06 13:25:04 UTC (rev 346)
@@ -12,5 +12,5 @@
libhdrflow_extras_panoramic_la_CXXFLAGS = \
$(BOOST_INCLUDE_PATH) \
- -I$(top_builddir)/../openlibraries/src \
+ -I$(top_srcdir)/../openlibraries/src \
$(OFX_INCLUDE_PATH)
Modified: trunk/lib/extras/src/ppm/Makefile.am
===================================================================
--- trunk/lib/extras/src/ppm/Makefile.am 2007-10-06 11:32:43 UTC (rev 345)
+++ trunk/lib/extras/src/ppm/Makefile.am 2007-10-06 13:25:04 UTC (rev 346)
@@ -13,11 +13,11 @@
libhdrflow_extras_ppm_la_CXXFLAGS = \
$(EXTRAS_CXXFLAGS) \
$(BOOST_INCLUDE_PATH) \
- -I$(top_builddir)/../openlibraries/src
+ -I$(top_srcdir)/../openlibraries/src
libhdrflow_extras_ppm_la_LIBADD = \
- $(top_builddir)/../openlibraries/src/openpluginlib/pl/libopenpluginlib_pl.la \
- $(top_builddir)/../openlibraries/src/openimagelib/il/libopenimagelib_il.la
+ $(top_srcdir)/../openlibraries/src/openpluginlib/pl/libopenpluginlib_pl.la \
+ $(top_srcdir)/../openlibraries/src/openimagelib/il/libopenimagelib_il.la
libhdrflow_extras_ppm_la_LDFLAGS = \
$(EXTRAS_LDFLAGS)
Modified: trunk/lib/extras/src/raw/Makefile.am
===================================================================
--- trunk/lib/extras/src/raw/Makefile.am 2007-10-06 11:32:43 UTC (rev 345)
+++ trunk/lib/extras/src/raw/Makefile.am 2007-10-06 13:25:04 UTC (rev 346)
@@ -14,15 +14,15 @@
libhdrflow_extras_raw_la_CXXFLAGS = \
$(EXTRAS_CXXFLAGS) \
$(BOOST_INCLUDE_PATH) \
- -I$(top_builddir)/../openlibraries/src
+ -I$(top_srcdir)/../openlibraries/src
libhdrflow_extras_raw_la_CFLAGS = \
-DNO_JPEG \
-DNO_LCMS
libhdrflow_extras_raw_la_LIBADD = \
- $(top_builddir)/../openlibraries/src/openpluginlib/pl/libopenpluginlib_pl.la \
- $(top_builddir)/../openlibraries/src/openimagelib/il/libopenimagelib_il.la
+ $(top_srcdir)/../openlibraries/src/openpluginlib/pl/libopenpluginlib_pl.la \
+ $(top_srcdir)/../openlibraries/src/openimagelib/il/libopenimagelib_il.la
libhdrflow_extras_raw_la_LDFLAGS = \
$(EXTRAS_LDFLAGS)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-10-06 11:33:33
|
Revision: 345
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=345&view=rev
Author: glslang
Date: 2007-10-06 04:32:43 -0700 (Sat, 06 Oct 2007)
Log Message:
-----------
+ fixes memory leak in opl
Modified Paths:
--------------
trunk/lib/openlibraries/src/openpluginlib/pl/content_handler_libxml.cpp
trunk/lib/openlibraries/src/openpluginlib/pl/content_handler_libxml.hpp
trunk/lib/openlibraries/src/openpluginlib/pl/opl_importer.cpp
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/content_handler_libxml.cpp
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/content_handler_libxml.cpp 2007-10-03 20:54:17 UTC (rev 344)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/content_handler_libxml.cpp 2007-10-06 11:32:43 UTC (rev 345)
@@ -53,6 +53,11 @@
handler_.endElement = opl_endElement;
}
+content_handler_libxml::~content_handler_libxml( )
+{
+ xmlCleanupParser( );
+}
+
//
actions::opl_parser_action& content_handler_libxml::get_action( )
{ return action_; }
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/content_handler_libxml.hpp
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/content_handler_libxml.hpp 2007-10-03 20:54:17 UTC (rev 344)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/content_handler_libxml.hpp 2007-10-06 11:32:43 UTC (rev 345)
@@ -18,10 +18,11 @@
{
public:
explicit content_handler_libxml( );
+ ~content_handler_libxml( );
- actions::opl_parser_action& get_action( );
- xmlSAXHandler* get_content_handler( );
- void set_branch_path( const boost::filesystem::path& branch_path );
+ actions::opl_parser_action& get_action( );
+ xmlSAXHandler* get_content_handler( );
+ void set_branch_path( const boost::filesystem::path& branch_path );
private:
actions::opl_parser_action action_;
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/opl_importer.cpp
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/opl_importer.cpp 2007-10-03 20:54:17 UTC (rev 344)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/opl_importer.cpp 2007-10-06 11:32:43 UTC (rev 345)
@@ -58,7 +58,7 @@
hr = pSAXReader->parseURL( ( unsigned short* ) to_wstring( file.native_file_string( ).c_str( ) ).c_str( ) );
assert( SUCCEEDED( hr ) && L"openpluginlib::opl_importer::opl_importer:operator( ) parseURL failed." );
#else
- content_handler_libxml* ch = new content_handler_libxml( );
+ std::auto_ptr<content_handler_libxml> ch( new content_handler_libxml( ) );
ch->set_branch_path( file.branch_path( ) );
if( xmlSAXUserParseFile( ch->get_content_handler( ), &ch->get_action( ), file.native_file_string( ).c_str( ) ) < 0 )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-10-03 20:54:18
|
Revision: 344
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=344&view=rev
Author: glslang
Date: 2007-10-03 13:54:17 -0700 (Wed, 03 Oct 2007)
Log Message:
-----------
+generalise for install name prefix
Modified Paths:
--------------
trunk/unity.sh
Modified: trunk/unity.sh
===================================================================
--- trunk/unity.sh 2007-10-01 20:10:44 UTC (rev 343)
+++ trunk/unity.sh 2007-10-03 20:54:17 UTC (rev 344)
@@ -21,12 +21,12 @@
then
echo "usage: `basename $0` options (-evbfioxupasmd)"
echo " -e ) update Boost version (Win32 only)"
- echo " -v ) boost_old_version"
- echo " -b ) boost_new_version"
+ echo " -v ) boost old version"
+ echo " -b ) boost new version"
echo " -f ) build OS/X frameworks"
echo " -x ) framework version"
echo " -o ) output_directory"
- echo " -i ) install_name_prefix"
+ echo " -i ) install name prefix"
echo " -u ) build OS/X umbrella framework"
echo " -p ) build installer"
echo " -a ) build application"
@@ -413,7 +413,7 @@
install_name_tool -id $install_name_prefix/HDRFlow.framework/Frameworks/$1.framework/Versions/A/PlugIns/$1.so $2
fmwklist="HDRFlowPlugin HDRFlowImage HDRFlowMedia"
for i in $fmwklist
- do install_name_tool -change /Library/Frameworks/$i.framework/Versions/A/$i \
+ do install_name_tool -change $install_name_prefix/$i.framework/Versions/A/$i \
$install_name_prefix/HDRFlow.framework/Frameworks/$i.framework/Versions/A/$i $2
done
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-10-01 20:10:47
|
Revision: 343
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=343&view=rev
Author: glslang
Date: 2007-10-01 13:10:44 -0700 (Mon, 01 Oct 2007)
Log Message:
-----------
+ oops, missed opl files
Modified Paths:
--------------
trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite3_metadata_plugin.opl
trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_plugin.opl
trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_plugin.opl
trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.opl
trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_plugin.opl
trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.opl
trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_plugin.opl
trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi_plugin.opl
trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_plugin.opl
trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_plugin.opl
trunk/lib/openlibraries/src/openimagelib/plugins/png/png_plugin.opl
trunk/lib/openlibraries/src/openimagelib/plugins/psd/psd_plugin.opl
trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_plugin.opl
trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.opl
trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_plugin.opl
trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.opl
trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_plugin.opl
trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_plugin.opl
trunk/lib/openlibraries/src/openmedialib/plugins/glew/glew_plugin.opl
trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_plugin.opl
trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_plugin.opl
trunk/lib/openlibraries/src/openmedialib/plugins/openal/openal_plugin.opl
trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_plugin.opl
trunk/lib/openlibraries/src/openmedialib/plugins/template/template_plugin.opl
trunk/lib/openlibraries/src/openobjectlib/plugins/3ds/3ds_plugin.opl
trunk/lib/openlibraries/src/openobjectlib/plugins/X3D/x3d_plugin.opl
trunk/lib/openlibraries/src/openobjectlib/plugins/obj/obj_plugin.opl
trunk/unity.sh
Modified: trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite3_metadata_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite3_metadata_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite3_metadata_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<openlibraries version="1.0">
<openassetlib name="oal" version="0.2.0">
- <plugin name="OpenLibraries sqlite3 metadata plugin" type="input" extension='".*sqlite.*"' merit="80" filename='"libopenassetlib_sqlite3_plugin.so", "libopenassetlib_sqlite3_plugin.dylib", "openassetlib_sqlite-vc80-r-0_4_0.dll", "openassetlib_sqlite-vc80-d-0_4_0.dll"'/>
+ <plugin name="OpenLibraries sqlite3 metadata plugin" type="input" extension='".*sqlite.*"' merit="80" filename='"libopenassetlib_sqlite3_plugin.so", "libopenassetlib_sqlite3_plugin.dylib", "openassetlib_sqlite-vc80-r-0_5_0.dll", "openassetlib_sqlite-vc80-d-0_5_0.dll"'/>
</openassetlib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -2,6 +2,6 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openeffectslib name="oel" version="0.1.0">
- <plugin name="OpenLibraries tonemap plugin" type="filter" extension='"tm_linear", "tm_ilm_exr", "tm_ferwerda"' merit="0" filename='"libopeneffectslib_tonemap.so", "libopeneffectslib_tonemap.dylib", "openeffectslib_tonemap-vc80-d-0_4_0.dll", "openeffectslib_tonemap-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries tonemap plugin" type="filter" extension='"tm_linear", "tm_ilm_exr", "tm_ferwerda"' merit="0" filename='"libopeneffectslib_tonemap.so", "libopeneffectslib_tonemap.dylib", "openeffectslib_tonemap-vc80-d-0_5_0.dll", "openeffectslib_tonemap-vc80-r-0_5_0.dll"'/>
</openeffectslib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -2,6 +2,6 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openimagelib name="oil" version="0.2.0">
- <plugin name="OpenLibraries 3D lightmap plugin" type="input" extension='".*\.3D_lightmap"' merit="80" filename='"libopenimagelib_3D_lightmap.so", "libopenimagelib_3D_lightmap.dylib", "./plugins/openimagelib_3D_lightmap-vc80-d-0_4_0.dll" "./plugins/openimagelib_3D_lightmap-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries 3D lightmap plugin" type="input" extension='".*\.3D_lightmap"' merit="80" filename='"libopenimagelib_3D_lightmap.so", "libopenimagelib_3D_lightmap.dylib", "./plugins/openimagelib_3D_lightmap-vc80-d-0_5_0.dll" "./plugins/openimagelib_3D_lightmap-vc80-r-0_5_0.dll"'/>
</openimagelib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -2,6 +2,6 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openimagelib name="oil" version="0.2.0">
- <plugin name="OpenLibraries BMP plugin" type="input" in_filter="*.bmp" extension='".*\.bmp"' merit="80" filename='"libopenimagelib_bmp.so", "libopenimagelib_bmp.dylib", "openimagelib_bmp-vc80-d-0_4_0.dll" "openimagelib_bmp-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries BMP plugin" type="input" in_filter="*.bmp" extension='".*\.bmp"' merit="80" filename='"libopenimagelib_bmp.so", "libopenimagelib_bmp.dylib", "openimagelib_bmp-vc80-d-0_5_0.dll" "openimagelib_bmp-vc80-r-0_5_0.dll"'/>
</openimagelib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -2,6 +2,6 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openimagelib name="oil" version="0.2.0">
- <plugin name="OpenLibraries DDS plugin" type="input" in_filter="*.dds" extension='".*\.dds"' merit="80" filename='"libopenimagelib_dds.so", "libopenimagelib_dds.dylib", "openimagelib_dds-vc80-d-0_4_0.dll", "openimagelib_dds-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries DDS plugin" type="input" in_filter="*.dds" extension='".*\.dds"' merit="80" filename='"libopenimagelib_dds.so", "libopenimagelib_dds.dylib", "openimagelib_dds-vc80-d-0_5_0.dll", "openimagelib_dds-vc80-r-0_5_0.dll"'/>
</openimagelib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -2,7 +2,7 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openimagelib name="oil" version="0.2.0">
- <plugin name="OpenLibraries DPX plugin" type="input" in_filter="*.dpx" extension='".*\.dpx"' merit="80" filename='"libopenimagelib_dpx.so", "libopenimagelib_dpx.dylib", "openimagelib_dpx-vc80-d-0_4_0.dll", "openimagelib_dpx-vc80-r-0_4_0.dll"'/>
- <plugin name="OpenLibraries DPX plugin" type="output" in_filter="*.dpx" extension='".*\.dpx"' merit="80" filename='"libopenimagelib_dpx.so", "libopenimagelib_dpx.dylib", "openimagelib_dpx-vc80-d-0_4_0.dll", "openimagelib_dpx-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries DPX plugin" type="input" in_filter="*.dpx" extension='".*\.dpx"' merit="80" filename='"libopenimagelib_dpx.so", "libopenimagelib_dpx.dylib", "openimagelib_dpx-vc80-d-0_5_0.dll", "openimagelib_dpx-vc80-r-0_5_0.dll"'/>
+ <plugin name="OpenLibraries DPX plugin" type="output" in_filter="*.dpx" extension='".*\.dpx"' merit="80" filename='"libopenimagelib_dpx.so", "libopenimagelib_dpx.dylib", "openimagelib_dpx-vc80-d-0_5_0.dll", "openimagelib_dpx-vc80-r-0_5_0.dll"'/>
</openimagelib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -2,6 +2,6 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openimagelib name="oil" version="0.2.0">
- <plugin name="OpenLibraries EXR plugin" type="input" in_filter="*.exr" extension='".*\.exr"' merit="40" filename='"libopenimagelib_exr.so", "libopenimagelib_exr.dylib", "openimagelib_exr-vc80-d-0_4_0.dll", "openimagelib_exr-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries EXR plugin" type="input" in_filter="*.exr" extension='".*\.exr"' merit="40" filename='"libopenimagelib_exr.so", "libopenimagelib_exr.dylib", "openimagelib_exr-vc80-d-0_5_0.dll", "openimagelib_exr-vc80-r-0_5_0.dll"'/>
</openimagelib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -2,6 +2,6 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openimagelib name="oil" version="0.2.0">
- <plugin name="OpenLibraries GDI+ plugin" type="input" in_filter="*.bmp *.gif *.jpg *.jpeg *.png, *.tif *.tiff *.wmf *.emf *.ico" extension='".*\.bmp", ".*\.gif", ".*\.jpg", ".*\.jpeg", ".*\.png", ".*\.tif", ".*\.tiff", ".*\.wmf", ".*\.emf", ".*\.ico"' merit="40" filename='"openimagelib_gdi-vc80-d-0_4_0.dll", "openimagelib_gdi-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries GDI+ plugin" type="input" in_filter="*.bmp *.gif *.jpg *.jpeg *.png, *.tif *.tiff *.wmf *.emf *.ico" extension='".*\.bmp", ".*\.gif", ".*\.jpg", ".*\.jpeg", ".*\.png", ".*\.tif", ".*\.tiff", ".*\.wmf", ".*\.emf", ".*\.ico"' merit="40" filename='"openimagelib_gdi-vc80-d-0_5_0.dll", "openimagelib_gdi-vc80-r-0_5_0.dll"'/>
</openimagelib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -2,6 +2,6 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openimagelib name="oil" version="0.2.0">
- <plugin name="OpenLibraries HDR plugin" type="input" in_filter="*.hdr" extension='".*\.hdr"' merit="80" filename='"libopenimagelib_hdr.so", "libopenimagelib_hdr.dylib", "openimagelib_hdr-vc80-d-0_4_0.dll", "openimagelib_hdr-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries HDR plugin" type="input" in_filter="*.hdr" extension='".*\.hdr"' merit="80" filename='"libopenimagelib_hdr.so", "libopenimagelib_hdr.dylib", "openimagelib_hdr-vc80-d-0_5_0.dll", "openimagelib_hdr-vc80-r-0_5_0.dll"'/>
</openimagelib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -2,7 +2,7 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openimagelib name="oil" version="0.2.0">
- <plugin name="OpenLibraries JPG plugin" type="input" in_filter="*.jpg" extension='".*\.jpg"' merit="80" filename='"libopenimagelib_jpg.so", "libopenimagelib_jpg.dylib", "openimagelib_jpg-vc80-d-0_4_0.dll", "openimagelib_jpg-vc80-r-0_4_0.dll"'/>
- <plugin name="OpenLibraries JPG plugin" type="output" in_filter="*.jpg" extension='".*\.jpg"' merit="80" filename='"libopenimagelib_jpg.so", "libopenimagelib_jpg.dylib", "openimagelib_jpg-vc80-d-0_4_0.dll", "openimagelib_jpg-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries JPG plugin" type="input" in_filter="*.jpg" extension='".*\.jpg"' merit="80" filename='"libopenimagelib_jpg.so", "libopenimagelib_jpg.dylib", "openimagelib_jpg-vc80-d-0_5_0.dll", "openimagelib_jpg-vc80-r-0_5_0.dll"'/>
+ <plugin name="OpenLibraries JPG plugin" type="output" in_filter="*.jpg" extension='".*\.jpg"' merit="80" filename='"libopenimagelib_jpg.so", "libopenimagelib_jpg.dylib", "openimagelib_jpg-vc80-d-0_5_0.dll", "openimagelib_jpg-vc80-r-0_5_0.dll"'/>
</openimagelib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/png/png_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/png/png_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/png/png_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -2,7 +2,7 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openimagelib name="oil" version="0.2.0">
- <plugin name="OpenLibraries PNG plugin" type="input" extension='".*\.png"' merit="80" filename='"libopenimagelib_png.so", "libopenimagelib_png.dylib", "openimagelib_png-vc80-d-0_4_0.dll", "openimagelib_png-vc80-r-0_4_0.dll"'/>
- <plugin name="OpenLibraries PNG plugin" type="output" extension='".*\.png"' merit="80" filename='"libopenimagelib_png.so", "libopenimagelib_png.dylib", "openimagelib_png-vc80-d-0_4_0.dll", "openimagelib_png-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries PNG plugin" type="input" extension='".*\.png"' merit="80" filename='"libopenimagelib_png.so", "libopenimagelib_png.dylib", "openimagelib_png-vc80-d-0_5_0.dll", "openimagelib_png-vc80-r-0_5_0.dll"'/>
+ <plugin name="OpenLibraries PNG plugin" type="output" extension='".*\.png"' merit="80" filename='"libopenimagelib_png.so", "libopenimagelib_png.dylib", "openimagelib_png-vc80-d-0_5_0.dll", "openimagelib_png-vc80-r-0_5_0.dll"'/>
</openimagelib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/psd/psd_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/psd/psd_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/psd/psd_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -2,6 +2,6 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openimagelib name="oil" version="0.2.0">
- <plugin name="OpenLibraries PSD plugin" type="input" extension='".*\.psd"' merit="80" filename='"libopenimagelib_psd.so", "libopenimagelib_psd.dylib", "openimagelib_psd-vc80-d-0_4_0.dll" "openimagelib_psd-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries PSD plugin" type="input" extension='".*\.psd"' merit="80" filename='"libopenimagelib_psd.so", "libopenimagelib_psd.dylib", "openimagelib_psd-vc80-d-0_5_0.dll" "openimagelib_psd-vc80-r-0_5_0.dll"'/>
</openimagelib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -2,6 +2,6 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openimagelib name="oil" version="0.2.0">
- <plugin name="OpenLibraries QuickTime plugin" type="input" in_filter="*.sgi *.rgb *.rgba *.la *.bw *.pict *.text *.gif *.png *.pics *.tiff *.psd *.tif *.bmp *.jpg *.jif *.jpeg *.tga *.qtif *.jp2" extension='".*\.sgi", ".*\.rgb", ".*\.rgba", ".*\.la", ".*\.bw", ".*\.pict", ".*\.text", ".*\.gif", ".*\.png", ".*\.pics", ".*\.tiff", ".*\.psd", ".*\.tif", ".*\.bmp", ".*\.jpg", ".*\.jif", ".*\.jpeg", ".*\.tga", ".*\.qtif", ".*\.jp2"' merit="40" filename='"libopenimagelib_quicktime.so", "libopenimagelib_quicktime.dylib", "openimagelib_quicktime-vc80-d-0_4_0.dll", "openimagelib_quicktime-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries QuickTime plugin" type="input" in_filter="*.sgi *.rgb *.rgba *.la *.bw *.pict *.text *.gif *.png *.pics *.tiff *.psd *.tif *.bmp *.jpg *.jif *.jpeg *.tga *.qtif *.jp2" extension='".*\.sgi", ".*\.rgb", ".*\.rgba", ".*\.la", ".*\.bw", ".*\.pict", ".*\.text", ".*\.gif", ".*\.png", ".*\.pics", ".*\.tiff", ".*\.psd", ".*\.tif", ".*\.bmp", ".*\.jpg", ".*\.jif", ".*\.jpeg", ".*\.tga", ".*\.qtif", ".*\.jp2"' merit="40" filename='"libopenimagelib_quicktime.so", "libopenimagelib_quicktime.dylib", "openimagelib_quicktime-vc80-d-0_5_0.dll", "openimagelib_quicktime-vc80-r-0_5_0.dll"'/>
</openimagelib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -2,6 +2,6 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openimagelib name="oil" version="0.2.0">
- <plugin name="OpenLibraries SGI plugin" type="input" in_filter="*.sgi *.rgb *.rgba *.la *.bw" extension='".*\.sgi", ".*\.rgb", ".*\.rgba", ".*\.la", ".*\.bw"' merit="40" filename='"libopenimagelib_sgi.so", "libopenimagelib_sgi.dylib", "openimagelib_sgi-vc80-d-0_4_0.dll", "openimagelib_sgi-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries SGI plugin" type="input" in_filter="*.sgi *.rgb *.rgba *.la *.bw" extension='".*\.sgi", ".*\.rgb", ".*\.rgba", ".*\.la", ".*\.bw"' merit="40" filename='"libopenimagelib_sgi.so", "libopenimagelib_sgi.dylib", "openimagelib_sgi-vc80-d-0_5_0.dll", "openimagelib_sgi-vc80-r-0_5_0.dll"'/>
</openimagelib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -2,6 +2,6 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openimagelib name="oil" version="0.2.0">
- <plugin name="OpenLibraries TGA plugin" type="input" in_filter="*.tga" extension='".*\.tga"' merit="80" filename='"libopenimagelib_tga.so", "libopenimagelib_tga.dylib", "openimagelib_tga-vc80-d-0_4_0.dll", "openimagelib_tga-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries TGA plugin" type="input" in_filter="*.tga" extension='".*\.tga"' merit="80" filename='"libopenimagelib_tga.so", "libopenimagelib_tga.dylib", "openimagelib_tga-vc80-d-0_5_0.dll", "openimagelib_tga-vc80-r-0_5_0.dll"'/>
</openimagelib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -2,6 +2,6 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openimagelib name="oil" version="0.2.0">
- <plugin name="OpenLibraries TIFF plugin" type="input" in_filter="*.tiff *.tif" extension='".*\.tiff", ".*\.tif"' merit="30" filename='"libopenimagelib_tiff.so", "libopenimagelib_tiff.dylib", "openimagelib_tiff-vc80-d-0_4_0.dll", "openimagelib_tiff-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries TIFF plugin" type="input" in_filter="*.tiff *.tif" extension='".*\.tiff", ".*\.tif"' merit="30" filename='"libopenimagelib_tiff.so", "libopenimagelib_tiff.dylib", "openimagelib_tiff-vc80-d-0_5_0.dll", "openimagelib_tiff-vc80-r-0_5_0.dll"'/>
</openimagelib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -2,8 +2,8 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openmedialib name="oml" version="0.1.0">
- <plugin name="OpenLibraries avformat plugin" type="input" in_filter="*.avi *.dv *.dif *.mpg *.mpeg *.mp3 *.mp2 *.wav *.aif" extension='"oml:.*", ".*\.avi", ".*\.dv", ".*\.dif", ".*\.mp4", ".*\.mov", ".*\.mpg", ".*\.mpeg", ".*\.mp3", ".*\.mp2", ".*\.mxf", ".*\.wav", ".*\.wmv", ".*\.aif", "/dev/.*1394/.*", "dv:-", "mpeg:-", ".*\.flv", ".*\.swf", ".*\.asf", ".*\.ts", ".*\.vob"' merit="5" filename='"libopenmedialib_avformat.so", "libopenmedialib_avformat.dylib", "openmedialib_avformat-vc80-d-0_4_0.dll", "openmedialib_avformat-vc80-r-0_4_0.dll"'/>
- <plugin name="OpenLibraries avformat plugin" type="output" extension='"pipe:", ".*\.mpg", ".*\.avi", ".*\.dv", ".*\.mov", ".*\.ogg", ".*\.mp2", ".*\.mp3", ".*\.mp4", ".*\.vob", ".*\.wav", ".*\.flv", ".*\.swf", ".*\.swf"' merit="5" filename='"libopenmedialib_avformat.so", "libopenmedialib_avformat.dylib", "openmedialib_avformat-vc80-d-0_4_0.dll", "openmedialib_avformat-vc80-r-0_4_0.dll"'/>
- <plugin name="OpenLibraries avformat plugin" type="filter" extension='"resampler"' merit="0" filename='"libopenmedialib_avformat.so", "libopenmedialib_avformat.dylib", "openmedialib_avformat-vc80-d-0_4_0.dll", "openmedialib_avformat-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries avformat plugin" type="input" in_filter="*.avi *.dv *.dif *.mpg *.mpeg *.mp3 *.mp2 *.wav *.aif" extension='"oml:.*", ".*\.avi", ".*\.dv", ".*\.dif", ".*\.mp4", ".*\.mov", ".*\.mpg", ".*\.mpeg", ".*\.mp3", ".*\.mp2", ".*\.mxf", ".*\.wav", ".*\.wmv", ".*\.aif", "/dev/.*1394/.*", "dv:-", "mpeg:-", ".*\.flv", ".*\.swf", ".*\.asf", ".*\.ts", ".*\.vob"' merit="5" filename='"libopenmedialib_avformat.so", "libopenmedialib_avformat.dylib", "openmedialib_avformat-vc80-d-0_5_0.dll", "openmedialib_avformat-vc80-r-0_5_0.dll"'/>
+ <plugin name="OpenLibraries avformat plugin" type="output" extension='"pipe:", ".*\.mpg", ".*\.avi", ".*\.dv", ".*\.mov", ".*\.ogg", ".*\.mp2", ".*\.mp3", ".*\.mp4", ".*\.vob", ".*\.wav", ".*\.flv", ".*\.swf", ".*\.swf"' merit="5" filename='"libopenmedialib_avformat.so", "libopenmedialib_avformat.dylib", "openmedialib_avformat-vc80-d-0_5_0.dll", "openmedialib_avformat-vc80-r-0_5_0.dll"'/>
+ <plugin name="OpenLibraries avformat plugin" type="filter" extension='"resampler"' merit="0" filename='"libopenmedialib_avformat.so", "libopenmedialib_avformat.dylib", "openmedialib_avformat-vc80-d-0_5_0.dll", "openmedialib_avformat-vc80-r-0_5_0.dll"'/>
</openmedialib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -2,7 +2,7 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openmedialib name="oml" version="0.1.0">
- <plugin name="OpenLibraries gensys plugin" type="input" extension='"colour:", "color:", "pusher:"' merit="0" filename='"libopenmedialib_gensys.so", "libopenmedialib_gensys.dylib", "openmedialib_gensys-vc80-d-0_4_0.dll", "openmedialib_gensys-vc80-r-0_4_0.dll"'/>
- <plugin name="OpenLibraries gensys plugin" type="filter" extension='"bezier", "chroma", "clip", "composite", "conform", "correction", "crop", "deinterlace", "lerp", "playlist", "temporal", "threader", "visualise", "frame_rate"' merit="0" filename='"libopenmedialib_gensys.so", "libopenmedialib_gensys.dylib", "openmedialib_gensys-vc80-d-0_4_0.dll", "openmedialib_gensys-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries gensys plugin" type="input" extension='"colour:", "color:", "pusher:"' merit="0" filename='"libopenmedialib_gensys.so", "libopenmedialib_gensys.dylib", "openmedialib_gensys-vc80-d-0_5_0.dll", "openmedialib_gensys-vc80-r-0_5_0.dll"'/>
+ <plugin name="OpenLibraries gensys plugin" type="filter" extension='"bezier", "chroma", "clip", "composite", "conform", "correction", "crop", "deinterlace", "lerp", "playlist", "temporal", "threader", "visualise", "frame_rate"' merit="0" filename='"libopenmedialib_gensys.so", "libopenmedialib_gensys.dylib", "openmedialib_gensys-vc80-d-0_5_0.dll", "openmedialib_gensys-vc80-r-0_5_0.dll"'/>
</openmedialib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/glew/glew_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/glew/glew_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/glew/glew_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -2,6 +2,6 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openmedialib name="oml" version="0.1.0">
- <plugin name="OpenLibraries glew plugin" type="output" extension='"glew:"' merit="0" filename='"libopenmedialib_glew.so", "libopenmedialib_glew.dylib", "openmedialib_glew-vc80-d-0_4_0.dll", "openmedialib_glew-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries glew plugin" type="output" extension='"glew:"' merit="0" filename='"libopenmedialib_glew.so", "libopenmedialib_glew.dylib", "openmedialib_glew-vc80-d-0_5_0.dll", "openmedialib_glew-vc80-r-0_5_0.dll"'/>
</openmedialib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -2,6 +2,6 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openmedialib name="oml" version="0.1.0">
- <plugin name="OpenLibraries ofx plugin" type="filter" extension='"ofx_.*"' merit="0" filename='"libopenmedialib_ofx.so", "libopenmedialib_ofx.dylib", "openmedialib_ofx-vc80-d-0_4_0.dll", "openmedialib_ofx-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries ofx plugin" type="filter" extension='"ofx_.*"' merit="0" filename='"libopenmedialib_ofx.so", "libopenmedialib_ofx.dylib", "openmedialib_ofx-vc80-d-0_5_0.dll", "openmedialib_ofx-vc80-r-0_5_0.dll"'/>
</openmedialib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -2,7 +2,7 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openmedialib name="oml" version="0.1.0">
- <plugin name="OpenLibraries oil plugin" type="input" extension='".*\.jpg/sequence:.*", ".*\.png/sequence:.*", ".*\.bmp/sequence:.*", ".*\.gif/sequence:.*", ".*\.tga/sequence:.*", ".*\.exr/sequence:.*", ".*\.sgi/sequence:.*", ".*\.rgb/sequence:.*", ".*\.rgba/sequence:.*", ".*\.la/sequence:.*", ".*\.bw/sequence:.*", ".*\.tif/sequence:.*", ".*\.tiff/sequence:.*", ".*\.dpx/sequence:.*", ".*\.hdr/sequence:.*"' merit="0" filename='"libopenmedialib_oil.so", "libopenmedialib_oil.dylib", "openmedialib_oil-vc80-d-0_4_0.dll", "openmedialib_oil-vc80-r-0_4_0.dll"'/>
- <plugin name="OpenLibraries oil plugin" type="output" extension='".*\.jpg/sequence:.*", ".*\.png/sequence:.*", ".*\.bmp/sequence:.*", ".*\.gif/sequence:.*", ".*\.tga/sequence:.*", ".*\.exr/sequence:.*", ".*\.sgi/sequence:.*", ".*\.rgb/sequence:.*", ".*\.rgba/sequence:.*", ".*\.la/sequence:.*", ".*\.bw/sequence:.*", ".*\.tif/sequence:.*", ".*\.tiff/sequence:.*", ".*\.dpx/sequence:.*"' merit="0" filename='"libopenmedialib_oil.so", "libopenmedialib_oil.dylib", "openmedialib_oil-vc80-d-0_4_0.dll", "openmedialib_oil-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries oil plugin" type="input" extension='".*\.jpg/sequence:.*", ".*\.png/sequence:.*", ".*\.bmp/sequence:.*", ".*\.gif/sequence:.*", ".*\.tga/sequence:.*", ".*\.exr/sequence:.*", ".*\.sgi/sequence:.*", ".*\.rgb/sequence:.*", ".*\.rgba/sequence:.*", ".*\.la/sequence:.*", ".*\.bw/sequence:.*", ".*\.tif/sequence:.*", ".*\.tiff/sequence:.*", ".*\.dpx/sequence:.*", ".*\.hdr/sequence:.*"' merit="0" filename='"libopenmedialib_oil.so", "libopenmedialib_oil.dylib", "openmedialib_oil-vc80-d-0_5_0.dll", "openmedialib_oil-vc80-r-0_5_0.dll"'/>
+ <plugin name="OpenLibraries oil plugin" type="output" extension='".*\.jpg/sequence:.*", ".*\.png/sequence:.*", ".*\.bmp/sequence:.*", ".*\.gif/sequence:.*", ".*\.tga/sequence:.*", ".*\.exr/sequence:.*", ".*\.sgi/sequence:.*", ".*\.rgb/sequence:.*", ".*\.rgba/sequence:.*", ".*\.la/sequence:.*", ".*\.bw/sequence:.*", ".*\.tif/sequence:.*", ".*\.tiff/sequence:.*", ".*\.dpx/sequence:.*"' merit="0" filename='"libopenmedialib_oil.so", "libopenmedialib_oil.dylib", "openmedialib_oil-vc80-d-0_5_0.dll", "openmedialib_oil-vc80-r-0_5_0.dll"'/>
</openmedialib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/openal/openal_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/openal/openal_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/openal/openal_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -2,6 +2,6 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openmedialib name="oml" version="0.1.0">
- <plugin name="OpenLibraries openal plugin" type="output" extension='"openal:"' merit="0" filename='"libopenmedialib_openal.so", "libopenmedialib_openal.dylib", "openmedialib_openal-vc80-d-0_4_0.dll", "openmedialib_openal-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries openal plugin" type="output" extension='"openal:"' merit="0" filename='"libopenmedialib_openal.so", "libopenmedialib_openal.dylib", "openmedialib_openal-vc80-d-0_5_0.dll", "openmedialib_openal-vc80-r-0_5_0.dll"'/>
</openmedialib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -2,7 +2,7 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openmedialib name="oml" version="0.1.0">
- <plugin name="OpenLibraries quicktime plugin" type="input" in_filter="*.mov" extension='".*\.mov"' merit="10" filename='"libopenmedialib_quicktime.so", "libopenmedialib_quicktime.dylib", "openmedialib_quicktime-vc80-d-0_4_0.dll", "openmedialib_quicktime-vc80-r-0_4_0.dll"'/>
- <plugin name="OpenLibraries quicktime plugin" type="output" extension='".*\.mov"' merit="80" filename='"libopenmedialib_quicktime.so", "libopenmedialib_quciktime.dylib", "openmedialib_quicktime-vc80-d-0_4_0.dll", "openmedialib_quicktime-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries quicktime plugin" type="input" in_filter="*.mov" extension='".*\.mov"' merit="10" filename='"libopenmedialib_quicktime.so", "libopenmedialib_quicktime.dylib", "openmedialib_quicktime-vc80-d-0_5_0.dll", "openmedialib_quicktime-vc80-r-0_5_0.dll"'/>
+ <plugin name="OpenLibraries quicktime plugin" type="output" extension='".*\.mov"' merit="80" filename='"libopenmedialib_quicktime.so", "libopenmedialib_quciktime.dylib", "openmedialib_quicktime-vc80-d-0_5_0.dll", "openmedialib_quicktime-vc80-r-0_5_0.dll"'/>
</openmedialib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/template/template_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/template/template_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/template/template_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -2,8 +2,8 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openmedialib name="oml" version="0.1.0">
- <plugin name="OpenLibraries template plugin" type="input" extension='"test:"' merit="0" filename='"libopenmedialib_template.so", "libopenmedialib_template.dylib", "openmedialib_template-vc80-d-0_4_0.dll", "openmedialib_template-vc80-r-0_4_0.dll"'/>
- <plugin name="OpenLibraries template plugin" type="output" extension='"ppm:"' merit="0" filename='"libopenmedialib_template.so", "libopenmedialib_template.dylib", "openmedialib_template-vc80-d-0_4_0.dll", "openmedialib_template-vc80-r-0_4_0.dll"'/>
- <plugin name="OpenLibraries template plugin" type="filter" extension='"greyscale"' merit="0" filename='"libopenmedialib_template.so", "libopenmedialib_template.dylib", "openmedialib_template-vc80-d-0_4_0.dll", "openmedialib_template-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries template plugin" type="input" extension='"test:"' merit="0" filename='"libopenmedialib_template.so", "libopenmedialib_template.dylib", "openmedialib_template-vc80-d-0_5_0.dll", "openmedialib_template-vc80-r-0_5_0.dll"'/>
+ <plugin name="OpenLibraries template plugin" type="output" extension='"ppm:"' merit="0" filename='"libopenmedialib_template.so", "libopenmedialib_template.dylib", "openmedialib_template-vc80-d-0_5_0.dll", "openmedialib_template-vc80-r-0_5_0.dll"'/>
+ <plugin name="OpenLibraries template plugin" type="filter" extension='"greyscale"' merit="0" filename='"libopenmedialib_template.so", "libopenmedialib_template.dylib", "openmedialib_template-vc80-d-0_5_0.dll", "openmedialib_template-vc80-r-0_5_0.dll"'/>
</openmedialib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openobjectlib/plugins/3ds/3ds_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openobjectlib/plugins/3ds/3ds_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openobjectlib/plugins/3ds/3ds_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -2,6 +2,6 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openobjectlib name="ool" version="0.2.0">
- <plugin name="OpenLibraries 3DS plugin" type="input" extension='".*\.3ds"' merit="80" filename='"libopenobjectlib_3ds.so", "libopenobjectlib_3ds.dylib", "openobjectlib_3ds-vc80-d-0_4_0.dll", "openobjectlib_3ds-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries 3DS plugin" type="input" extension='".*\.3ds"' merit="80" filename='"libopenobjectlib_3ds.so", "libopenobjectlib_3ds.dylib", "openobjectlib_3ds-vc80-d-0_5_0.dll", "openobjectlib_3ds-vc80-r-0_5_0.dll"'/>
</openobjectlib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openobjectlib/plugins/X3D/x3d_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openobjectlib/plugins/X3D/x3d_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openobjectlib/plugins/X3D/x3d_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -2,6 +2,6 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openobjectlib name="ool" version="0.2.0">
- <plugin name="OpenLibraries X3D plugin" type="input" extension='".*\.x3d"' merit="80" filename='"libopenobjectlib_x3d.so", "libopenobjectlib_x3d.dylib", "openobjectlib_x3d-vc80-d-0_4_0.dll", "openobjectlib_x3d-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries X3D plugin" type="input" extension='".*\.x3d"' merit="80" filename='"libopenobjectlib_x3d.so", "libopenobjectlib_x3d.dylib", "openobjectlib_x3d-vc80-d-0_5_0.dll", "openobjectlib_x3d-vc80-r-0_5_0.dll"'/>
</openobjectlib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openobjectlib/plugins/obj/obj_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openobjectlib/plugins/obj/obj_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openobjectlib/plugins/obj/obj_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -2,6 +2,6 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openobjectlib name="ool" version="0.2.0">
- <plugin name="OpenLibraries OBJ plugin" type="input" extension='".*\.obj"' merit="80" filename='"libopenobjectlib_obj.so", "libopenobjectlib_obj.dylib", "openobjectlib_obj-vc80-d-0_4_0.dll", "openobjectlib_obj-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries OBJ plugin" type="input" extension='".*\.obj"' merit="80" filename='"libopenobjectlib_obj.so", "libopenobjectlib_obj.dylib", "openobjectlib_obj-vc80-d-0_5_0.dll", "openobjectlib_obj-vc80-r-0_5_0.dll"'/>
</openobjectlib>
</openlibraries>
Modified: trunk/unity.sh
===================================================================
--- trunk/unity.sh 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/unity.sh 2007-10-01 20:10:44 UTC (rev 343)
@@ -32,7 +32,7 @@
echo " -a ) build application"
echo " -s ) strip symbols"
echo " -m ) package maya plugins"
- echo " -d ) update OpenLibraries version (Win32 only)"
+ echo " -d ) update OpenLibraries version"
echo
echo " Examples:"
echo " sh ./unity.sh -fu - build OS/X umbrella framework"
@@ -102,6 +102,12 @@
sed -e "s|-$olibs_old_version.dll|-$olibs_new_version.dll|g" -e "s|$olibs_old_version.lib|$olibs_new_version.lib|g" $i.unity.bak > $i &&
rm -f $i.unity.bak
done
+
+ find . -type f -name '*.opl' -print | while read i
+ do cp $i $i.unity.bak &&
+ sed -e "s|-$olibs_old_version.dll|-$olibs_new_version.dll|g" $i.unity.bak > $i &&
+ rm -f $i.unity.bak
+ done
find lib/openlibraries -type f -name 'config.hpp' -print | while read i
do cp $i $i.unity.bak &&
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-09-30 20:37:25
|
Revision: 342
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=342&view=rev
Author: glslang
Date: 2007-09-30 13:37:23 -0700 (Sun, 30 Sep 2007)
Log Message:
-----------
+ eol-style to native
Property Changed:
----------------
trunk/lib/extras/m4/Makefile.am
Property changes on: trunk/lib/extras/m4/Makefile.am
___________________________________________________________________
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-09-30 20:36:30
|
Revision: 341
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=341&view=rev
Author: glslang
Date: 2007-09-30 13:36:22 -0700 (Sun, 30 Sep 2007)
Log Message:
-----------
+ build fixes
Modified Paths:
--------------
trunk/lib/extras/Makefile.am
trunk/lib/extras/configure.ac
Added Paths:
-----------
trunk/lib/extras/m4/Makefile.am
Removed Paths:
-------------
trunk/lib/extras/m4/aclocal.m4
Modified: trunk/lib/extras/Makefile.am
===================================================================
--- trunk/lib/extras/Makefile.am 2007-09-30 20:23:01 UTC (rev 340)
+++ trunk/lib/extras/Makefile.am 2007-09-30 20:36:22 UTC (rev 341)
@@ -3,5 +3,5 @@
#
#
-SUBDIRS = src
+SUBDIRS = src m4
Modified: trunk/lib/extras/configure.ac
===================================================================
--- trunk/lib/extras/configure.ac 2007-09-30 20:23:01 UTC (rev 340)
+++ trunk/lib/extras/configure.ac 2007-09-30 20:36:22 UTC (rev 341)
@@ -189,6 +189,7 @@
dnl
AC_CONFIG_FILES([
Makefile
+m4/Makefile
src/Makefile
src/imf/Makefile
src/imf/hdr/Makefile
Added: trunk/lib/extras/m4/Makefile.am
===================================================================
--- trunk/lib/extras/m4/Makefile.am (rev 0)
+++ trunk/lib/extras/m4/Makefile.am 2007-09-30 20:36:22 UTC (rev 341)
@@ -0,0 +1,16 @@
+
+#
+#
+#
+
+EXTRA_DIST = \
+ boost.m4 \
+ cg.m4 \
+ fast_math.m4 \
+ glew.m4 \
+ maya.m4 \
+ ofx.m4 \
+ opengl.m4 \
+ quicktime.m4 \
+ universal_binary.m4
+
Deleted: trunk/lib/extras/m4/aclocal.m4
===================================================================
--- trunk/lib/extras/m4/aclocal.m4 2007-09-30 20:23:01 UTC (rev 340)
+++ trunk/lib/extras/m4/aclocal.m4 2007-09-30 20:36:22 UTC (rev 341)
@@ -1,6716 +0,0 @@
-# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*-
-
-# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
-
-# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-AC_PREREQ([2.52])
-
-# serial 6
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated. We must strip everything past the first ":",
-# and everything past the last "/".
-
-# _AM_DIRNAME(PATH)
-# -----------------
-# Like AS_DIRNAME, only do it during macro expansion
-AC_DEFUN([_AM_DIRNAME],
- [m4_if(regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1,
- m4_if(regexp([$1], [^//\([^/]\|$\)]), -1,
- m4_if(regexp([$1], [^/.*]), -1,
- [.],
- patsubst([$1], [^\(/\).*], [\1])),
- patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])),
- patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl
-])# _AM_DIRNAME
-
-
-# The stamp files are numbered to have different names.
-# We could number them on a directory basis, but that's additional
-# complications, let's have a unique counter.
-m4_define([_AM_STAMP_Count], [0])
-
-
-# _AM_STAMP(HEADER)
-# -----------------
-# The name of the stamp file for HEADER.
-AC_DEFUN([_AM_STAMP],
-[m4_define([_AM_STAMP_Count], m4_incr(_AM_STAMP_Count))dnl
-AS_ESCAPE(_AM_DIRNAME(patsubst([$1],
- [:.*])))/stamp-h[]_AM_STAMP_Count])
-
-
-# _AM_CONFIG_HEADER(HEADER[:SOURCES], COMMANDS, INIT-COMMANDS)
-# ------------------------------------------------------------
-# We used to try to get a real timestamp in stamp-h. But the fear is that
-# that will cause unnecessary cvs conflicts.
-AC_DEFUN([_AM_CONFIG_HEADER],
-[# Add the stamp file to the list of files AC keeps track of,
-# along with our hook.
-AC_CONFIG_HEADERS([$1],
- [# update the timestamp
-echo 'timestamp for $1' >"_AM_STAMP([$1])"
-$2],
- [$3])
-])# _AM_CONFIG_HEADER
-
-
-# AM_CONFIG_HEADER(HEADER[:SOURCES]..., COMMANDS, INIT-COMMANDS)
-# --------------------------------------------------------------
-AC_DEFUN([AM_CONFIG_HEADER],
-[AC_FOREACH([_AM_File], [$1], [_AM_CONFIG_HEADER(_AM_File, [$2], [$3])])
-])# AM_CONFIG_HEADER
-
-# Do all the work for Automake. -*- Autoconf -*-
-
-# This macro actually does too much some checks are only needed if
-# your package does certain things. But this isn't really a big deal.
-
-# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 8
-
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery. Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-AC_PREREQ([2.52])
-
-# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow
-# the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out. PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition. After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
- AC_REQUIRE([AC_PROG_INSTALL])dnl
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
- test -f $srcdir/config.status; then
- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
- AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl
- AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_MISSING_PROG(AMTAR, tar)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_][CC],
- [_AM_DEPENDENCIES(CC)],
- [define([AC_PROG_][CC],
- defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_][CXX],
- [_AM_DEPENDENCIES(CXX)],
- [define([AC_PROG_][CXX],
- defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-])
-])
-
-# Copyright 2002 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.6"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
- [AM_AUTOMAKE_VERSION([1.6.3])])
-
-# Helper functions for option handling. -*- Autoconf -*-
-
-# Copyright 2001, 2002 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 2
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# ------------------------------
-# Set option NAME. Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-#
-# Check to make sure that the build environment is sane.
-#
-
-# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 3
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments. Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
- if test "$[*]" = "X"; then
- # -L didn't work.
- set X `ls -t $srcdir/configure conftest.file`
- fi
- rm -f conftest.file
- if test "$[*]" != "X $srcdir/configure conftest.file" \
- && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
-alias in your environment])
- fi
-
- test "$[2]" = conftest.file
- )
-then
- # Ok.
- :
-else
- AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT(yes)])
-
-# -*- Autoconf -*-
-
-
-# Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 3
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
- am_missing_run="$MISSING --run "
-else
- am_missing_run=
- AC_MSG_WARN([`missing' script is too old or missing])
-fi
-])
-
-# AM_AUX_DIR_EXPAND
-
-# Copyright 2001 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory. The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run. This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-# fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-# fails if $ac_aux_dir is absolute,
-# fails when called from a subdirectory in a VPATH build with
-# a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir. In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
-# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-# MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH. The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-# Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])
-
-AC_DEFUN([AM_AUX_DIR_EXPAND], [
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-
-# Copyright 2001 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
-AC_SUBST(install_sh)])
-
-# AM_PROG_INSTALL_STRIP
-
-# Copyright 2001 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# One issue with vendor `install' (even GNU) is that you can't
-# specify the program used to strip binaries. This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'. However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-if test "$cross_compiling" != no; then
- AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
-# serial 4 -*- Autoconf -*-
-
-# Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery. Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
- [$1], CXX, [depcc="$CXX" am_compiler_list=],
- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
- [depcc="$$1" am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
- [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
- # We make a subdir and do the tests there. Otherwise we can end up
- # making bogus files that we don't know about and never remove. For
- # instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
- mkdir conftest.dir
- # Copy depcomp to subdir because otherwise we won't find it if we're
- # using a relative directory.
- cp "$am_depcomp" conftest.dir
- cd conftest.dir
-
- am_cv_$1_dependencies_compiler_type=none
- if test "$am_compiler_list" = ""; then
- am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
- fi
- for depmode in $am_compiler_list; do
- # We need to recreate these files for each test, as the compiler may
- # overwrite some of them when testing with obscure command lines.
- # This happens at least with the AIX C compiler.
- echo '#include "conftest.h"' > conftest.c
- echo 'int i;' > conftest.h
- echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
-
- case $depmode in
- nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
- if test "x$enable_dependency_tracking" = xyes; then
- continue
- else
- break
- fi
- ;;
- none) break ;;
- esac
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this.
- if depmode=$depmode \
- source=conftest.c object=conftest.o \
- depfile=conftest.Po tmpdepfile=conftest.TPo \
- $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
- grep conftest.h conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
- am_cv_$1_dependencies_compiler_type=$depmode
- break
- fi
- done
-
- cd ..
- rm -rf conftest.dir
-else
- am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-])
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-AC_DEFUN([AM_SET_DEPDIR],
-[rm -f .deps 2>/dev/null
-mkdir .deps 2>/dev/null
-if test -d .deps; then
- DEPDIR=.deps
-else
- # MS-DOS does not allow filenames that begin with a dot.
- DEPDIR=_deps
-fi
-rmdir .deps 2>/dev/null
-AC_SUBST([DEPDIR])
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[ --disable-dependency-tracking Speeds up one-time builds
- --enable-dependency-tracking Do not reject slow dependency extractors])
-if test "x$enable_dependency_tracking" != xno; then
- am_depcomp="$ac_aux_dir/depcomp"
- AMDEPBACKSLASH='\'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])
-])
-
-# Generate code to set up dependency tracking. -*- Autoconf -*-
-
-# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-#serial 2
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[for mf in $CONFIG_FILES; do
- # Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # So let's grep whole file.
- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
- fi
- grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
- # Extract the definition of DEP_FILES from the Makefile without
- # running `make'.
- DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
- test -z "$DEPDIR" && continue
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n -e '/^U = / s///p' < "$mf"`
- test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
- # We invoke sed twice because it is the simplest approach to
- # changing $(DEPDIR) to its actual value in the expansion.
- for file in `sed -n -e '
- /^DEP_FILES = .*\\\\$/ {
- s/^DEP_FILES = //
- :loop
- s/\\\\$//
- p
- n
- /\\\\$/ b loop
- p
- }
- /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`AS_DIRNAME(["$file"])`
- AS_MKDIR_P([$dirpart/$fdir])
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
-done
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled. FIXME. This creates each `.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-
-# Copyright 2001 Free Software Foundation, Inc. -*- Autoconf -*-
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 2
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-doit:
- @echo done
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then
- am__include=include
- am__quote=
- _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
- am__include=.include
- am__quote="\""
- _am_result=BSD
- fi
-fi
-AC_SUBST(am__include)
-AC_SUBST(am__quote)
-AC_MSG_RESULT($_am_result)
-rm -f confinc confmf
-])
-
-# AM_CONDITIONAL -*- Autoconf -*-
-
-# Copyright 1997, 2000, 2001 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 5
-
-AC_PREREQ(2.52)
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])
-AC_SUBST([$1_FALSE])
-if $2; then
- $1_TRUE=
- $1_FALSE='#'
-else
- $1_TRUE='#'
- $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
- AC_MSG_ERROR([conditional \"$1\" was never defined.
-Usually this means the macro was only invoked conditionally.])
-fi])])
-
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-
-# serial 47 AC_PROG_LIBTOOL
-
-
-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-# -----------------------------------------------------------
-# If this macro is not defined by Autoconf, define it here.
-m4_ifdef([AC_PROVIDE_IFELSE],
- [],
- [m4_define([AC_PROVIDE_IFELSE],
- [m4_ifdef([AC_PROVIDE_$1],
- [$2], [$3])])])
-
-
-# AC_PROG_LIBTOOL
-# ---------------
-AC_DEFUN([AC_PROG_LIBTOOL],
-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
- AC_PROVIDE_IFELSE([AC_PROG_CXX],
- [AC_LIBTOOL_CXX],
- [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
- ])])
-dnl And a similar setup for Fortran 77 support
- AC_PROVIDE_IFELSE([AC_PROG_F77],
- [AC_LIBTOOL_F77],
- [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
-])])
-
-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
- AC_PROVIDE_IFELSE([AC_PROG_GCJ],
- [AC_LIBTOOL_GCJ],
- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
- [AC_LIBTOOL_GCJ],
- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
- [AC_LIBTOOL_GCJ],
- [ifdef([AC_PROG_GCJ],
- [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
- ifdef([A][M_PROG_GCJ],
- [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
- ifdef([LT_AC_PROG_GCJ],
- [define([LT_AC_PROG_GCJ],
- defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
-])])# AC_PROG_LIBTOOL
-
-
-# _AC_PROG_LIBTOOL
-# ----------------
-AC_DEFUN([_AC_PROG_LIBTOOL],
-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-# Prevent multiple expansion
-define([AC_PROG_LIBTOOL], [])
-])# _AC_PROG_LIBTOOL
-
-
-# AC_LIBTOOL_SETUP
-# ----------------
-AC_DEFUN([AC_LIBTOOL_SETUP],
-[AC_PREREQ(2.50)dnl
-AC_REQUIRE([AC_ENABLE_SHARED])dnl
-AC_REQUIRE([AC_ENABLE_STATIC])dnl
-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_LD])dnl
-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
-AC_REQUIRE([AC_PROG_NM])dnl
-
-AC_REQUIRE([AC_PROG_LN_S])dnl
-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-AC_REQUIRE([AC_OBJEXT])dnl
-AC_REQUIRE([AC_EXEEXT])dnl
-dnl
-
-AC_LIBTOOL_SYS_MAX_CMD_LEN
-AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-AC_LIBTOOL_OBJDIR
-
-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-_LT_AC_PROG_ECHO_BACKSLASH
-
-case $host_os in
-aix3*)
- # AIX sometimes has problems with the GCC collect2 program. For some
- # reason, if we set the COLLECT_NAMES environment variable, the problems
- # vanish in a puff of smoke.
- if test "X${COLLECT_NAMES+set}" != Xset; then
- COLLECT_NAMES=
- export COLLECT_NAMES
- fi
- ;;
-esac
-
-# Sed substitution that helps us do robust quoting. It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='sed -e s/^X//'
-[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
-
-# Same as above, but do not quote variable references.
-[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to undo escaping of the cmd sep variable
-unescape_variable_subst='s/\\\(${_S_}\)/\1/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-# Constants:
-rm="rm -f"
-
-# Global variables:
-default_ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except M$VC,
-# which needs '.lib').
-libext=a
-ltmain="$ac_aux_dir/ltmain.sh"
-ofile="$default_ofile"
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-AC_CHECK_TOOL(AR, ar, false)
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-AC_CHECK_TOOL(STRIP, strip, :)
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-test -z "$AS" && AS=as
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-test -z "$LD" && LD=ld
-test -z "$LN_S" && LN_S="ln -s"
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-test -z "$NM" && NM=nm
-test -z "$SED" && SED=sed
-test -z "$OBJDUMP" && OBJDUMP=objdump
-test -z "$RANLIB" && RANLIB=:
-test -z "$STRIP" && STRIP=:
-test -z "$ac_objext" && ac_objext=o
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
- case $host_os in
- openbsd*)
- old_postinstall_cmds="\$RANLIB -t \$oldlib\${_S_}$old_postinstall_cmds"
- ;;
- *)
- old_postinstall_cmds="\$RANLIB \$oldlib\${_S_}$old_postinstall_cmds"
- ;;
- esac
- old_archive_cmds="$old_archive_cmds\${_S_}\$RANLIB \$oldlib"
-fi
-
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
- if test "$file_magic_cmd" = '$MAGIC_CMD'; then
- AC_PATH_MAGIC
- fi
- ;;
-esac
-
-AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
-enable_win32_dll=yes, enable_win32_dll=no)
-
-AC_ARG_ENABLE([libtool-lock],
- [AC_HELP_STRING([--disable-libtool-lock],
- [avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-AC_ARG_WITH([pic],
- [AC_HELP_STRING([--with-pic],
- [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
- [pic_mode="$withval"],
- [pic_mode=default])
-test -z "$pic_mode" && pic_mode=default
-
-# Use C for the default configuration in the libtool script
-tagname=
-AC_LIBTOOL_LANG_C_CONFIG
-_LT_AC_TAGCONFIG
-])# AC_LIBTOOL_SETUP
-
-
-# _LT_AC_SYS_COMPILER
-# -------------------
-AC_DEFUN([_LT_AC_SYS_COMPILER],
-[AC_REQUIRE([AC_PROG_CC])dnl
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-])# _LT_AC_SYS_COMPILER
-
-
-# _LT_AC_SYS_LIBPATH_AIX
-# ----------------------
-# Links a minimal program and checks the executable
-# for the system default hardcoded library path. In most cases,
-# this is /usr/lib:/lib, but when the MPI compilers are used
-# the location of the communication and MPI libs are included too.
-# If we don't find anything, use the default library path according
-# to the aix ld manual.
-AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`; fi],[])
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-])# _LT_AC_SYS_LIBPATH_AIX
-
-
-# _LT_AC_SHELL_INIT(ARG)
-# ----------------------
-AC_DEFUN([_LT_AC_SHELL_INIT],
-[ifdef([AC_DIVERSION_NOTICE],
- [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
- [AC_DIVERT_PUSH(NOTICE)])
-$1
-AC_DIVERT_POP
-])# _LT_AC_SHELL_INIT
-
-
-# _LT_AC_PROG_ECHO_BACKSLASH
-# --------------------------
-# Add some code to the start of the generated configure script which
-# will find an echo command which doesn't interpret backslashes.
-AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
-[_LT_AC_SHELL_INIT([
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-case X$ECHO in
-X*--fallback-echo)
- # Remove one level of quotation (which was required for Make).
- ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
- ;;
-esac
-
-echo=${ECHO-echo}
-if test "X[$]1" = X--no-reexec; then
- # Discard the --no-reexec flag, and continue.
- shift
-elif test "X[$]1" = X--fallback-echo; then
- # Avoid inline document here, it may be left over
- :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
- # Yippee, $echo works!
- :
-else
- # Restart under the correct shell.
- exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
-fi
-
-if test "X[$]1" = X--fallback-echo; then
- # used as fallback echo
- shift
- cat <<EOF
-[$]*
-EOF
- exit 0
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-
-if test -z "$ECHO"; then
-if test "X${echo_test_string+set}" != Xset; then
-# find a string as large as possible, as long as the shell can cope with it
- for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
- if (echo_test_string="`eval $cmd`") 2>/dev/null &&
- echo_test_string="`eval $cmd`" &&
- (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
- then
- break
- fi
- done
-fi
-
-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- :
-else
- # The Solaris, AIX, and Digital Unix default echo programs unquote
- # backslashes. This makes it impossible to quote backslashes using
- # echo "$something" | sed 's/\\/\\\\/g'
- #
- # So, first we look for a working echo in the user's PATH.
-
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- for dir in $PATH /usr/ucb; do
- IFS="$lt_save_ifs"
- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- echo="$dir/echo"
- break
- fi
- done
- IFS="$lt_save_ifs"
-
- if test "X$echo" = Xecho; then
- # We didn't find a better echo, so look for alternatives.
- if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- # This shell has a builtin print -r that does the trick.
- echo='print -r'
- elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
- test "X$CONFIG_SHELL" != X/bin/ksh; then
- # If we have ksh, try running configure again with it.
- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
- export ORIGINAL_CONFIG_SHELL
- CONFIG_SHELL=/bin/ksh
- export CONFIG_SHELL
- exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
- else
- # Try using printf.
- echo='printf %s\n'
- if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- # Cool, printf works
- :
- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
- test "X$echo_testing_string" = 'X\t' &&
- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
- export CONFIG_SHELL
- SHELL="$CONFIG_SHELL"
- export SHELL
- echo="$CONFIG_SHELL [$]0 --fallback-echo"
- elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
- test "X$echo_testing_string" = 'X\t' &&
- echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- echo="$CONFIG_SHELL [$]0 --fallback-echo"
- else
- # maybe with a smaller string...
- prev=:
-
- for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
- if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
- then
- break
- fi
- prev="$cmd"
- done
-
- if test "$prev" != 'sed 50q "[$]0"'; then
- echo_test_string=`eval $prev`
- export echo_test_string
- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
- else
- # Oops. We lost completely, so just stick with echo.
- echo=echo
- fi
- fi
- fi
- fi
-fi
-fi
-
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-ECHO=$echo
-if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
- ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
-fi
-
-AC_SUBST(ECHO)
-])])# _LT_AC_PROG_ECHO_BACKSLASH
-
-
-# _LT_AC_LOCK
-# -----------
-AC_DEFUN([_LT_AC_LOCK],
-[AC_ARG_ENABLE([libtool-lock],
- [AC_HELP_STRING([--disable-libtool-lock],
- [avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
- # Find out which ABI we are using.
- echo 'int i;' > conftest.$ac_ext
- if AC_TRY_EVAL(ac_compile); then
- case `/usr/bin/file conftest.$ac_objext` in
- *ELF-32*)
- HPUX_IA64_MODE="32"
- ;;
- *ELF-64*)
- HPUX_IA64_MODE="64"
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
-*-*-irix6*)
- # Find out which ABI we are using.
- echo '[#]line __oline__ "configure"' > conftest.$ac_ext
- if AC_TRY_EVAL(ac_compile); then
- if test "$lt_cv_prog_gnu_ld" = yes; then
- case `/usr/bin/file conftest.$ac_objext` in
- *32-bit*)
- LD="${LD-ld} -melf32bsmip"
- ;;
- *N32*)
- LD="${LD-ld} -melf32bmipn32"
- ;;
- *64-bit*)
- LD="${LD-ld} -melf64bmip"
- ;;
- esac
- else
- case `/usr/bin/file conftest.$ac_objext` in
- *32-bit*)
- LD="${LD-ld} -32"
- ;;
- *N32*)
- LD="${LD-ld} -n32"
- ;;
- *64-bit*)
- LD="${LD-ld} -64"
- ;;
- esac
- fi
- fi
- rm -rf conftest*
- ;;
-
-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
- # Find out which ABI we are using.
- echo 'int i;' > conftest.$ac_ext
- if AC_TRY_EVAL(ac_compile); then
- case "`/usr/bin/file conftest.o`" in
- *32-bit*)
- case $host in
- x86_64-*linux*)
- LD="${LD-ld} -m elf_i386"
- ;;
- ppc64-*linux*)
- LD="${LD-ld} -m elf32ppclinux"
- ;;
- s390x-*linux*)
- LD="${LD-ld} -m elf_s390"
- ;;
- sparc64-*linux*)
- LD="${LD-ld} -m elf32_sparc"
- ;;
- esac
- ;;
- *64-bit*)
- case $host in
- x86_64-*linux*)
- LD="${LD-ld} -m elf_x86_64"
- ;;
- ppc*-*linux*|powerpc*-*linux*)
- LD="${LD-ld} -m elf64ppc"
- ;;
- s390*-*linux*)
- LD="${LD-ld} -m elf64_s390"
- ;;
- sparc*-*linux*)
- LD="${LD-ld} -m elf64_sparc"
- ;;
- esac
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
-
-*-*-sco3.2v5*)
- # On SCO OpenServer 5, we need -belf to get full-featured binaries.
- SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -belf"
- AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
- [AC_LANG_PUSH(C)
- AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
- AC_LANG_POP])
- if test x"$lt_cv_cc_needs_belf" != x"yes"; then
- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
- CFLAGS="$SAVE_CFLAGS"
- fi
- ;;
-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
- AC_CHECK_TOOL(DLLTOOL, dlltool, false)
- AC_CHECK_TOOL(AS, as, false)
- AC_CHECK_TOOL(OBJDUMP, objdump, false)
- ;;
- ])
-esac
-
-need_locks="$enable_libtool_lock"
-
-])# _LT_AC_LOCK
-
-
-# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
-[AC_CACHE_CHECK([$1], [$2],
- [$2=no
- ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$3"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
- # Note that $ac_compile itself does not contain backslashes and begins
- # with a dollar sign (not a hyphen), so the echo should work correctly.
- # The option is referenced via a variable to avoid confusing sed.
- lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
- -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&AS_MESSAGE_LOG_FD
- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
- if test ! -s conftest.err; then
- $2=yes
- fi
- fi
- $rm conftest*
-])
-
-if test x"[$]$2" = xyes; then
- ifelse([$5], , :, [$5])
-else
- ifelse([$6], , :, [$6])
-fi
-])# AC_LIBTOOL_COMPILER_OPTION
-
-
-# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-# [ACTION-SUCCESS], [ACTION-FAILURE])
-# ------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
-[AC_CACHE_CHECK([$1], [$2],
- [$2=no
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS $3"
- printf "$lt_simple_link_test_code" > conftest.$ac_ext
- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
- if test -s conftest.err; then
- # Append any errors to the config.log.
- cat conftest.err 1>&AS_MESSAGE_LOG_FD
- else
- $2=yes
- fi
- fi
- $rm conftest*
- LDFLAGS="$save_LDFLAGS"
-])
-
-if test x"[$]$2" = xyes; then
- ifelse([$4], , :, [$4])
-else
- ifelse([$5], , :, [$5])
-fi
-])# AC_LIBTOOL_LINKER_OPTION
-
-
-# AC_LIBTOOL_SYS_MAX_CMD_LEN
-# --------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
-[# find the maximum length of command line arguments
-AC_MSG_CHECKING([the maximum length of command line arguments])
-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
- i=0
- testring="ABCD"
-
- case $build_os in
- msdosdjgpp*)
- # On DJGPP, this test can blow up pretty badly due to problems in libc
- # (any single argument exceeding 2000 bytes causes a buffer overrun
- # during glob expansion). Even if it were fixed, the result of this
- # check would be larger than it should be.
- lt_cv_sys_max_cmd_len=12288; # 12K is about right
- ;;
-
- gnu*)
- # Under GNU Hurd, this test is not required because there is
- # no limit to the length of command line arguments.
- # Libtool will interpret -1 as no limit whatsoever
- lt_cv_sys_max_cmd_len=-1;
- ;;
-
- cygwin* | mingw*)
- # On Win9x/ME, this test blows up -- it succeeds, but takes
- # about 5 minutes as the teststring grows exponentially.
- # Worse, since 9x/ME are not pre-emptively multitasking,
- # you end up with a "frozen" computer, even though with patience
- # the test eventually succeeds (with a max line length of 256k).
- # Instead, let's just punt: use the minimum linelength reported by
- # all of the supported platforms: 8192 (on NT/2K/XP).
- lt_cv_sys_max_cmd_len=8192;
- ;;
-
- *)
- # If test is not a shell built-in, we'll probably end up computing a
- # maximum length that is only half of the actual maximum length, but
- # we can't tell.
- while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \
- = "XX$testring") >/dev/null 2>&1 &&
- new_result=`expr "X$testring" : ".*" 2>&1` &&
- lt_cv_sys_max_cmd_len=$new_result &&
- test $i != 17 # 1/2 MB should be enough
- do
- i=`expr $i + 1`
- testring=$testring$testring
- done
- testring=
- # Add a significant safety factor because C++ compilers can tack on massive
- # amounts of additional arguments before passing them to the linker.
- # It appears as though 1/2 is a usable value.
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
- ;;
- esac
-])
-if test -n $lt_cv_sys_max_cmd_len ; then
- AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
-else
- AC_MSG_RESULT(none)
-fi
-])# AC_LIBTOOL_SYS_MAX_CMD_LEN
-
-
-# _LT_AC_CHECK_DLFCN
-# --------------------
-AC_DEFUN([_LT_AC_CHECK_DLFCN],
-[AC_CHECK_HEADERS(dlfcn.h)dnl
-])# _LT_AC_CHECK_DLFCN
-
-
-# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-# ------------------------------------------------------------------
-AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
-if test "$cross_compiling" = yes; then :
- [$4]
-else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
-[#line __oline__ "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
-#else
-# ifdef DL_GLOBAL
-# define LT_DLGLOBAL DL_GLOBAL
-# else
-# define LT_DLGLOBAL 0
-# endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
- find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-# ifdef RTLD_LAZY
-# define LT_DLLAZY_OR_NOW RTLD_LAZY
-# else
-# ifdef DL_LAZY
-# define LT_DLLAZY_OR_NOW DL_LAZY
-# else
-# ifdef RTLD_NOW
-# define LT_DLLAZY_OR_NOW RTLD_NOW
-# else
-# ifdef DL_NOW
-# define LT_DLLAZY_OR_NOW DL_NOW
-# else
-# define LT_DLLAZY_OR_NOW 0
-# endif
-# endif
-# endif
-# endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
-
- if (self)
- {
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
-
- exit (status);
-}]
-EOF
- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
- (./conftest; exit; ) 2>/dev/null
- lt_status=$?
- case x$lt_status in
- x$lt_dlno_uscore) $1 ;;
- x$lt_dlneed_uscore) $2 ;;
- x$lt_unknown|x*) $3 ;;
- esac
- else :
- # compilation failed
- $3
- fi
-fi
-rm -fr conftest*
-])# _LT_AC_TRY_DLOPEN_SELF
-
-
-# AC_LIBTOOL_DLOPEN_SELF
-# -------------------
-AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
-if test "x$enable_dlopen" != xyes; then
- enable_dlopen=unknown
- enable_dlopen_self=unknown
- enable_dlopen_self_static=unknown
-else
- lt_cv_dlopen=no
- lt_cv_dlopen_libs=
-
- case $host_os in
- beos*)
- lt_cv_dlopen="load_add_on"
- lt_cv_dlopen_libs=
- lt_cv_dlopen_self=yes
- ;;
-
- mingw* | pw32*)
- lt_cv_dlopen="LoadLibrary"
- lt_cv_dlopen_libs=
- ;;
-
- cygwin*)
- lt_cv_dlopen="dlopen"
- lt_cv_dlopen_libs=
- ;;
-
- darwin*)
- # if libdl is installed we need to link against it
- AC_CHECK_LIB([dl], [dlopen],
- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
- lt_cv_dlopen="dyld"
- lt_cv_dlopen_libs=
- lt_cv_dlopen_self=yes
- ])
- ;;
-
- *)
- AC_CHECK_FUNC([shl_load],
- [lt_cv_dlopen="shl_load"],
- [AC_CHECK_LIB([dld], [shl_load],
- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
- [AC_CHECK_FUNC([dlopen],
- [lt_cv_dlopen="dlopen"],
- [AC_CHECK_LIB([dl], [dlopen],
- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
- [AC_CHECK_LIB([svld], [dlopen],
- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
- [AC_CHECK_LIB([dld], [dld_link],
- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
- ])
- ])
- ])
- ])
- ])
- ;;
- esac
-
- if test "x$lt_cv_dlopen" != xno; then
- enable_dlopen=yes
- else
- enable_dlopen=no
- fi
-
- case $lt_cv_dlopen in
- dlopen)
- save_CPPFLAGS="$CPPFLAGS"
- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
- save_LDFLAGS="$LDFLAGS"
- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
- save_LIBS="$LIBS"
- LIBS="$lt_cv_dlopen_libs $LIBS"
-
- AC_CACHE_CHECK([whether a program can dlopen itself],
- lt_cv_dlopen_self, [dnl
- _LT_AC_TRY_DLOPEN_SELF(
- lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
- lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
- ])
-
- if test "x$lt_cv_dlopen_self" = xyes; then
- LDFLAGS="$LDFLAGS $link_static_flag"
- AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
- lt_cv_dlopen_self_static, [dnl
- _LT_AC_TRY_DLOPEN_SELF(
- lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
- lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross)
- ])
- fi
-
- CPPFLAGS="$save_CPPFLAGS"
- LDFLAGS="$save_LDFLAGS"
- LIBS="$save_LIBS"
- ;;
- esac
-
- case $lt_cv_dlopen_self in
- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
- *) enable_dlopen_self=unknown ;;
- esac
-
- case $lt_cv_dlopen_self_static in
- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
- *) enable_dlopen_self_static=unknown ;;
- esac
-fi
-])# AC_LIBTOOL_DLOPEN_SELF
-
-
-# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
-# ---------------------------------
-# Check to see if options -c and -o are simultaneously supported by compiler
-AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
- [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
- [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
- $rm -r conftest 2>/dev/null
- mkdir conftest
- cd conftest
- mkdir out
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
- # that will create temporary files in the current directory regardless of
- # the output directory. Thus, making CWD read-only will cause this test
- # to fail, enabling locking or at least warning the user not to...
[truncated message content] |
|
From: <gl...@us...> - 2007-09-30 20:23:05
|
Revision: 340
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=340&view=rev
Author: glslang
Date: 2007-09-30 13:23:01 -0700 (Sun, 30 Sep 2007)
Log Message:
-----------
+ eol-style to native
Property Changed:
----------------
trunk/lib/openlibraries/m4/Makefile.am
Property changes on: trunk/lib/openlibraries/m4/Makefile.am
___________________________________________________________________
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-09-30 20:21:22
|
Revision: 339
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=339&view=rev
Author: glslang
Date: 2007-09-30 13:21:21 -0700 (Sun, 30 Sep 2007)
Log Message:
-----------
+ build fixes
Modified Paths:
--------------
trunk/lib/openlibraries/Makefile.am
trunk/lib/openlibraries/configure.ac
trunk/lib/openlibraries/test/openobjectlib/Makefile.am
Added Paths:
-----------
trunk/lib/openlibraries/m4/Makefile.am
Modified: trunk/lib/openlibraries/Makefile.am
===================================================================
--- trunk/lib/openlibraries/Makefile.am 2007-09-30 19:57:29 UTC (rev 338)
+++ trunk/lib/openlibraries/Makefile.am 2007-09-30 20:21:21 UTC (rev 339)
@@ -10,7 +10,8 @@
am__untar=$(AMTAR) -x --posix -f -
SUBDIRS = \
- src \
+ src \
+ m4 \
media \
effects \
test
Modified: trunk/lib/openlibraries/configure.ac
===================================================================
--- trunk/lib/openlibraries/configure.ac 2007-09-30 19:57:29 UTC (rev 338)
+++ trunk/lib/openlibraries/configure.ac 2007-09-30 20:21:21 UTC (rev 339)
@@ -357,12 +357,7 @@
src/openmedialib/Makefile
src/openmedialib/ml/Makefile
src/openmedialib/plugins/Makefile
-src/openmedialib/plugins/template/Makefile
-src/openmedialib/plugins/avformat/Makefile
src/openmedialib/plugins/oil/Makefile
-src/openmedialib/plugins/glew/Makefile
-src/openmedialib/plugins/openal/Makefile
-src/openmedialib/plugins/gensys/Makefile
src/openmedialib/plugins/ofx/Makefile
src/openmedialib/py/Makefile
src/openeffectslib/Makefile
@@ -380,6 +375,7 @@
src/openassetlib/plugins/Makefile
src/openassetlib/plugins/sqlite/Makefile
src/umbrella_framework/Makefile
+m4/Makefile
media/Makefile
effects/Makefile
test/Makefile
Added: trunk/lib/openlibraries/m4/Makefile.am
===================================================================
--- trunk/lib/openlibraries/m4/Makefile.am (rev 0)
+++ trunk/lib/openlibraries/m4/Makefile.am 2007-09-30 20:21:21 UTC (rev 339)
@@ -0,0 +1,27 @@
+
+#
+#
+#
+
+EXTRA_DIST = \
+ boost.m4 \
+ bzip2.m4 \
+ cg.m4 \
+ fast_math.m4 \
+ gelato.m4 \
+ glew.m4 \
+ gpl.m4 \
+ ofx.m4 \
+ openal.m4 \
+ opengl.m4 \
+ openimagelib.m4 \
+ pkg.m4 \
+ python.m4 \
+ qt.m4 \
+ quicktime.m4 \
+ sqlite.m4 \
+ tiff.m4 \
+ umbrella_framework.m4 \
+ universal_binary.m4 \
+ zlib.m4
+
Modified: trunk/lib/openlibraries/test/openobjectlib/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openobjectlib/Makefile.am 2007-09-30 19:57:29 UTC (rev 338)
+++ trunk/lib/openlibraries/test/openobjectlib/Makefile.am 2007-09-30 20:21:21 UTC (rev 339)
@@ -4,4 +4,4 @@
#
SUBDIRS = \
- GL \
+ GL
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-09-30 19:58:19
|
Revision: 338
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=338&view=rev
Author: glslang
Date: 2007-09-30 12:57:29 -0700 (Sun, 30 Sep 2007)
Log Message:
-----------
+ build fixes
Modified Paths:
--------------
trunk/lib/openlibraries/installer/openlibraries_runtime.nsi
trunk/lib/openlibraries/installer/openlibraries_sdk.nsi
trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj
Modified: trunk/lib/openlibraries/installer/openlibraries_runtime.nsi
===================================================================
--- trunk/lib/openlibraries/installer/openlibraries_runtime.nsi 2007-09-30 19:20:13 UTC (rev 337)
+++ trunk/lib/openlibraries/installer/openlibraries_runtime.nsi 2007-09-30 19:57:29 UTC (rev 338)
@@ -3,8 +3,8 @@
;--------------------------------
!ifndef VERSION
- !define VERSION 0.4.0
- !define VERSION_DOT 0.4.0
+ !define VERSION 0_5_0
+ !define VERSION_DOT 0.5.0
!endif
;--------------------------------
Modified: trunk/lib/openlibraries/installer/openlibraries_sdk.nsi
===================================================================
--- trunk/lib/openlibraries/installer/openlibraries_sdk.nsi 2007-09-30 19:20:13 UTC (rev 337)
+++ trunk/lib/openlibraries/installer/openlibraries_sdk.nsi 2007-09-30 19:57:29 UTC (rev 338)
@@ -3,8 +3,8 @@
;--------------------------------
!ifndef VERSION
- !define VERSION 0_4_0
- !define VERSION_DOT 0.4.0
+ !define VERSION 0_5_0
+ !define VERSION_DOT 0.5.0
!endif
;--------------------------------
Modified: trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj 2007-09-30 19:20:13 UTC (rev 337)
+++ trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj 2007-09-30 19:57:29 UTC (rev 338)
@@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";;"C:\openexr-1.4.0-vs2005\include\OpenEXR""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";"C:\OpenEXR\include""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TONEMAP_EXPORTS;ML_PLUGIN_EXPORTS;OPENMEDIALIB_BUILD;HAVE_FLEX_STRING;OPENEXR_DLL;HAVE_OPENEXR"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -124,7 +124,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";;"C:\openexr-1.4.0-vs2005\include\OpenEXR""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";"C:\OpenEXR\include""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TONEMAP_EXPORTS;;ML_PLUGIN_EXPORTS;OPENMEDIALIB_BUILD;HAVE_FLEX_STRING;OPENEXR_DLL;HAVE_OPENEXR"
ExceptionHandling="2"
RuntimeLibrary="2"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
