# HG changeset patch # User Volker Grabsch # Date 1263944652 -3600 # Node ID e62e7f0d2650db3741b08c91479f57f0b25d3a5d # Parent 43205e8dd3e10ed31f6d86cd197399a7f8599446 new package: openscenegraph (by Martin Lambers) diff -r 43205e8dd3e1 -r e62e7f0d2650 doc/index.html --- a/doc/index.html Wed Jan 20 00:17:10 2010 +0100 +++ b/doc/index.html Wed Jan 20 00:44:12 2010 +0100 @@ -361,6 +361,36 @@ That's it!

+

Step 5d: Cross compile your Project (OSG)

+ +

+ Using static OpenSceneGraph libraries requires a few changes to your source: +

+ +

+ Look at examples/osgstaticviewer/osgstaticviewer.cpp in the + OpenSceneGraph source distribution for an example. This example can be + compiled with +

+ 
i686-pc-mingw32-g++ -DOSG_LIBRARY_STATIC \
+    -o osgstaticviewer.exe examples/osgstaticviewer/osgstaticviewer.cpp \
+    `i686-pc-mingw32-pkg-config --cflags openscenegraph-osgViewer openscenegraph-osgPlugins` \
+    `i686-pc-mingw32-pkg-config --static --libs openscenegraph-osgViewer openscenegraph-osgPlugins`
+

Further Steps

diff -r 43205e8dd3e1 -r e62e7f0d2650 src/openscenegraph-1-pkg-config.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/openscenegraph-1-pkg-config.patch Wed Jan 20 00:44:12 2010 +0100 @@ -0,0 +1,369 @@ +This file is part of mingw-cross-env. +See doc/index.html or doc/README for further information. + +diff -uNr OpenSceneGraph-2.8.2.orig/CMakeLists.txt OpenSceneGraph-2.8.2/CMakeLists.txt +--- OpenSceneGraph-2.8.2.orig/CMakeLists.txt 2009-07-28 08:02:27.000000000 +0200 ++++ OpenSceneGraph-2.8.2/CMakeLists.txt 2010-01-17 16:58:31.000000000 +0100 +@@ -774,12 +774,34 @@ + + # Generate pkg-config configuration file + +-CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/packaging/pkgconfig/openscenegraph.pc.in +- ${PROJECT_BINARY_DIR}/packaging/pkgconfig/openscenegraph.pc ++SET(PKGCONFIG_FILES ++ openscenegraph ++ openscenegraph-osg ++ openscenegraph-osgDB ++ openscenegraph-osgFX ++ openscenegraph-osgGA ++ openscenegraph-osgParticle ++ openscenegraph-osgSim ++ openscenegraph-osgText ++ openscenegraph-osgUtil ++ openscenegraph-osgTerrain ++ openscenegraph-osgManipulator ++ openscenegraph-osgViewer ++ openscenegraph-osgWidget ++ openscenegraph-osgShadow ++ openscenegraph-osgAnimation ++ openscenegraph-osgVolume ++ openscenegraph-osgIntrospection ++ openscenegraph-osgPlugins ++) ++ ++FOREACH(PKGCONFIG_FILE ${PKGCONFIG_FILES}) ++ CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/packaging/pkgconfig/${PKGCONFIG_FILE}.pc.in ++ ${PROJECT_BINARY_DIR}/packaging/pkgconfig/${PKGCONFIG_FILE}.pc + @ONLY + ) +- +-INSTALL(FILES ${PROJECT_BINARY_DIR}/packaging/pkgconfig/openscenegraph.pc DESTINATION lib${LIB_POSTFIX}/pkgconfig COMPONENT libopenscenegraph-dev) ++ INSTALL(FILES ${PROJECT_BINARY_DIR}/packaging/pkgconfig/${PKGCONFIG_FILE}.pc DESTINATION lib${LIB_POSTFIX}/pkgconfig COMPONENT libopenscenegraph-dev) ++ENDFOREACH(PKGCONFIG_FILE) + + # Run this as late as possible so users can easier spot the message + IF (${CMAKE_INSTALL_PREFIX} STREQUAL "/usr/local") +Binary files OpenSceneGraph-2.8.2.orig/osgstaticviewer.exe and OpenSceneGraph-2.8.2/osgstaticviewer.exe differ +diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgAnimation.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgAnimation.pc.in +--- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgAnimation.pc.in 1970-01-01 01:00:00.000000000 +0100 ++++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgAnimation.pc.in 2010-01-17 16:58:31.000000000 +0100 +@@ -0,0 +1,15 @@ ++# pkg-config source file ++ ++prefix=@CMAKE_INSTALL_PREFIX@ ++exec_prefix=${prefix} ++libdir=${exec_prefix}/lib@LIB_POSTFIX@ ++includedir=${prefix}/include ++ ++Name: openscenegraph-osgAnimation ++Description: Skinning and morphing library for Openscenegraph ++Version: @OPENSCENEGRAPH_VERSION@ ++Requires: openscenegraph-osg openscenegraph-osgText openscenegraph-osgGA openscenegraph-osgViewer openthreads ++Conflicts: ++Libs: -L${libdir} -losgAnimation ++Libs.private: ++Cflags: -I${includedir} +diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgDB.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgDB.pc.in +--- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgDB.pc.in 1970-01-01 01:00:00.000000000 +0100 ++++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgDB.pc.in 2010-01-17 16:58:31.000000000 +0100 +@@ -0,0 +1,15 @@ ++# pkg-config source file ++ ++prefix=@CMAKE_INSTALL_PREFIX@ ++exec_prefix=${prefix} ++libdir=${exec_prefix}/lib@LIB_POSTFIX@ ++includedir=${prefix}/include ++ ++Name: openscenegraph-osgDB ++Description: File format reading library for Openscenegraph ++Version: @OPENSCENEGRAPH_VERSION@ ++Requires: openscenegraph-osg openthreads ++Conflicts: ++Libs: -L${libdir} -losgDB ++Libs.private: ++Cflags: -I${includedir} +diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgFX.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgFX.pc.in +--- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgFX.pc.in 1970-01-01 01:00:00.000000000 +0100 ++++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgFX.pc.in 2010-01-17 16:58:31.000000000 +0100 +@@ -0,0 +1,15 @@ ++# pkg-config source file ++ ++prefix=@CMAKE_INSTALL_PREFIX@ ++exec_prefix=${prefix} ++libdir=${exec_prefix}/lib@LIB_POSTFIX@ ++includedir=${prefix}/include ++ ++Name: openscenegraph-osgFX ++Description: Special effects library for Openscenegraph ++Version: @OPENSCENEGRAPH_VERSION@ ++Requires: openscenegraph-osgDB openscenegraph-osgUtil openscenegraph-osg openthreads ++Conflicts: ++Libs: -L${libdir} -losgFX ++Libs.private: ++Cflags: -I${includedir} +diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgGA.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgGA.pc.in +--- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgGA.pc.in 1970-01-01 01:00:00.000000000 +0100 ++++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgGA.pc.in 2010-01-17 16:58:31.000000000 +0100 +@@ -0,0 +1,15 @@ ++# pkg-config source file ++ ++prefix=@CMAKE_INSTALL_PREFIX@ ++exec_prefix=${prefix} ++libdir=${exec_prefix}/lib@LIB_POSTFIX@ ++includedir=${prefix}/include ++ ++Name: openscenegraph-osgGA ++Description: GUI event library for Openscenegraph ++Version: @OPENSCENEGRAPH_VERSION@ ++Requires: openscenegraph-osgDB openscenegraph-osgUtil openscenegraph-osg openthreads ++Conflicts: ++Libs: -L${libdir} -losgGA ++Libs.private: ++Cflags: -I${includedir} +diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgIntrospection.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgIntrospection.pc.in +--- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgIntrospection.pc.in 1970-01-01 01:00:00.000000000 +0100 ++++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgIntrospection.pc.in 2010-01-17 16:58:31.000000000 +0100 +@@ -0,0 +1,15 @@ ++# pkg-config source file ++ ++prefix=@CMAKE_INSTALL_PREFIX@ ++exec_prefix=${prefix} ++libdir=${exec_prefix}/lib@LIB_POSTFIX@ ++includedir=${prefix}/include ++ ++Name: openscenegraph-osgIntrospection ++Description: Introspection library for Openscenegraph ++Version: @OPENSCENEGRAPH_VERSION@ ++Requires: openscenegraph-osg openthreads ++Conflicts: ++Libs: -L${libdir} -losgIntrospection ++Libs.private: ++Cflags: -I${includedir} +diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgManipulator.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgManipulator.pc.in +--- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgManipulator.pc.in 1970-01-01 01:00:00.000000000 +0100 ++++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgManipulator.pc.in 2010-01-17 16:58:31.000000000 +0100 +@@ -0,0 +1,15 @@ ++# pkg-config source file ++ ++prefix=@CMAKE_INSTALL_PREFIX@ ++exec_prefix=${prefix} ++libdir=${exec_prefix}/lib@LIB_POSTFIX@ ++includedir=${prefix}/include ++ ++Name: openscenegraph-osgManipulator ++Description: Manipulator library for Openscenegraph ++Version: @OPENSCENEGRAPH_VERSION@ ++Requires: openscenegraph-osgUtil openscenegraph-osgGA openscenegraph-osg openthreads ++Conflicts: ++Libs: -L${libdir} -losgManipulator ++Libs.private: ++Cflags: -I${includedir} +diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgParticle.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgParticle.pc.in +--- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgParticle.pc.in 1970-01-01 01:00:00.000000000 +0100 ++++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgParticle.pc.in 2010-01-17 16:58:31.000000000 +0100 +@@ -0,0 +1,15 @@ ++# pkg-config source file ++ ++prefix=@CMAKE_INSTALL_PREFIX@ ++exec_prefix=${prefix} ++libdir=${exec_prefix}/lib@LIB_POSTFIX@ ++includedir=${prefix}/include ++ ++Name: openscenegraph-osgParticle ++Description: Particle system library for Openscenegraph ++Version: @OPENSCENEGRAPH_VERSION@ ++Requires: openscenegraph-osgDB openscenegraph-osgUtil openscenegraph-osg openthreads ++Conflicts: ++Libs: -L${libdir} -losgParticle ++Libs.private: ++Cflags: -I${includedir} +diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osg.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osg.pc.in +--- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osg.pc.in 1970-01-01 01:00:00.000000000 +0100 ++++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osg.pc.in 2010-01-17 16:58:31.000000000 +0100 +@@ -0,0 +1,15 @@ ++# pkg-config source file ++ ++prefix=@CMAKE_INSTALL_PREFIX@ ++exec_prefix=${prefix} ++libdir=${exec_prefix}/lib@LIB_POSTFIX@ ++includedir=${prefix}/include ++ ++Name: openscenegraph-osg ++Description: 3D scenegraph ++Version: @OPENSCENEGRAPH_VERSION@ ++Requires: openthreads ++Conflicts: ++Libs: -L${libdir} -losg ++Libs.private: -lglu32 -lopengl32 ++Cflags: -I${includedir} +diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgPlugins.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgPlugins.pc.in +--- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgPlugins.pc.in 1970-01-01 01:00:00.000000000 +0100 ++++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgPlugins.pc.in 2010-01-17 18:59:13.000000000 +0100 +@@ -0,0 +1,15 @@ ++# pkg-config source file ++ ++prefix=@CMAKE_INSTALL_PREFIX@ ++exec_prefix=${prefix} ++libdir=${exec_prefix}/lib@LIB_POSTFIX@ ++includedir=${prefix}/include ++ ++Name: openscenegraph-osgPlugins ++Description: Plugins for Openscenegraph ++Version: @OPENSCENEGRAPH_VERSION@ ++Requires: openscenegraph-osgParticle openscenegraph-osgWidget openscenegraph-osgVolume openscenegraph-osgShadow openscenegraph-osgTerrain openscenegraph-osgFX openscenegraph-osgSim openscenegraph-osgText openscenegraph-osgAnimation openscenegraph-osgViewer openscenegraph-osgDB openscenegraph-osgUtil openscenegraph-osg openthreads ++Conflicts: ++Libs: ++Libs.private: -L${libdir}/osgPlugins-@OPENSCENEGRAPH_VERSION@ -losgdb_3dc -losgdb_3ds -losgdb_ac -losgdb_bmp -losgdb_bsp -losgdb_bvh -losgdb_cfg -losgdb_curl -losgdb_dds -losgdb_dot -losgdb_dw -losgdb_dxf -losgdb_exr -losgdb_freetype -losgdb_gdal -losgdb_geo -losgdb_gif -losgdb_glsl -losgdb_gz -losgdb_hdr -losgdb_ive -losgdb_jp2 -losgdb_jpeg -losgdb_logo -losgdb_lwo -losgdb_lws -losgdb_md2 -losgdb_mdl -losgdb_normals -losgdb_obj -losgdb_ogr -losgdb_openflight -losgdb_osg -losgdb_osga -losgdb_osganimation -losgdb_osgfx -losgdb_osgparticle -losgdb_osgshadow -losgdb_osgsim -losgdb_osgterrain -losgdb_osgtext -losgdb_osgtgz -losgdb_osgviewer -losgdb_osgvolume -losgdb_osgwidget -losgdb_pic -losgdb_pnm -losgdb_rgb -losgdb_rot -losgdb_scale -losgdb_shp -losgdb_stl -losgdb_svg -losgdb_tga -losgdb_tgz -losgdb_tiff -losgdb_trans -losgdb_txf -losgdb_txp -losgdb_vtf -losgdb_x -losgdb_zip -lcurl -lgnutls -lgcrypt -lgpg-error -lidn -lIlmImf -lHalf -lImath -lIlmThread -lIex -lfreetype -lgdal -ltiff -lgif -ljasper -ljpeg -liconv -lz -lws2_32 -lwinmm -lwldap32 ++Cflags: -I${includedir} +diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgShadow.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgShadow.pc.in +--- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgShadow.pc.in 1970-01-01 01:00:00.000000000 +0100 ++++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgShadow.pc.in 2010-01-17 16:58:31.000000000 +0100 +@@ -0,0 +1,15 @@ ++# pkg-config source file ++ ++prefix=@CMAKE_INSTALL_PREFIX@ ++exec_prefix=${prefix} ++libdir=${exec_prefix}/lib@LIB_POSTFIX@ ++includedir=${prefix}/include ++ ++Name: openscenegraph-osgShadow ++Description: Shadow techniques library for Openscenegraph ++Version: @OPENSCENEGRAPH_VERSION@ ++Requires: openscenegraph-osgUtil openscenegraph-osgDB openscenegraph-osg openthreads ++Conflicts: ++Libs: -L${libdir} -losgShadow ++Libs.private: ++Cflags: -I${includedir} +diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgSim.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgSim.pc.in +--- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgSim.pc.in 1970-01-01 01:00:00.000000000 +0100 ++++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgSim.pc.in 2010-01-17 16:58:31.000000000 +0100 +@@ -0,0 +1,15 @@ ++# pkg-config source file ++ ++prefix=@CMAKE_INSTALL_PREFIX@ ++exec_prefix=${prefix} ++libdir=${exec_prefix}/lib@LIB_POSTFIX@ ++includedir=${prefix}/include ++ ++Name: openscenegraph-osgSim ++Description: Simulator utility library for Openscenegraph ++Version: @OPENSCENEGRAPH_VERSION@ ++Requires: openscenegraph-osgText openscenegraph-osgDB openscenegraph-osgUtil openscenegraph-osg openthreads ++Conflicts: ++Libs: -L${libdir} -losgSim ++Libs.private: ++Cflags: -I${includedir} +diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgTerrain.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgTerrain.pc.in +--- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgTerrain.pc.in 1970-01-01 01:00:00.000000000 +0100 ++++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgTerrain.pc.in 2010-01-17 16:58:31.000000000 +0100 +@@ -0,0 +1,15 @@ ++# pkg-config source file ++ ++prefix=@CMAKE_INSTALL_PREFIX@ ++exec_prefix=${prefix} ++libdir=${exec_prefix}/lib@LIB_POSTFIX@ ++includedir=${prefix}/include ++ ++Name: openscenegraph-osgTerrain ++Description: Terrain library for Openscenegraph ++Version: @OPENSCENEGRAPH_VERSION@ ++Requires: openscenegraph-osgUtil openscenegraph-osgDB openscenegraph-osg openthreads ++Conflicts: ++Libs: -L${libdir} -losgTerrain ++Libs.private: ++Cflags: -I${includedir} +diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgText.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgText.pc.in +--- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgText.pc.in 1970-01-01 01:00:00.000000000 +0100 ++++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgText.pc.in 2010-01-17 16:58:31.000000000 +0100 +@@ -0,0 +1,15 @@ ++# pkg-config source file ++ ++prefix=@CMAKE_INSTALL_PREFIX@ ++exec_prefix=${prefix} ++libdir=${exec_prefix}/lib@LIB_POSTFIX@ ++includedir=${prefix}/include ++ ++Name: openscenegraph-osgText ++Description: Text rendering library for Openscenegraph ++Version: @OPENSCENEGRAPH_VERSION@ ++Requires: openscenegraph-osgDB openscenegraph-osg openthreads ++Conflicts: ++Libs: -L${libdir} -losgText ++Libs.private: ++Cflags: -I${includedir} +diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgUtil.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgUtil.pc.in +--- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgUtil.pc.in 1970-01-01 01:00:00.000000000 +0100 ++++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgUtil.pc.in 2010-01-17 16:58:31.000000000 +0100 +@@ -0,0 +1,15 @@ ++# pkg-config source file ++ ++prefix=@CMAKE_INSTALL_PREFIX@ ++exec_prefix=${prefix} ++libdir=${exec_prefix}/lib@LIB_POSTFIX@ ++includedir=${prefix}/include ++ ++Name: openscenegraph-osgUtil ++Description: Utility library for Openscenegraph ++Version: @OPENSCENEGRAPH_VERSION@ ++Requires: openscenegraph-osg openthreads ++Conflicts: ++Libs: -L${libdir} -losgUtil ++Libs.private: ++Cflags: -I${includedir} +diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgViewer.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgViewer.pc.in +--- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgViewer.pc.in 1970-01-01 01:00:00.000000000 +0100 ++++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgViewer.pc.in 2010-01-17 16:58:31.000000000 +0100 +@@ -0,0 +1,15 @@ ++# pkg-config source file ++ ++prefix=@CMAKE_INSTALL_PREFIX@ ++exec_prefix=${prefix} ++libdir=${exec_prefix}/lib@LIB_POSTFIX@ ++includedir=${prefix}/include ++ ++Name: openscenegraph-osgViewer ++Description: Windowing system setup, thread scene manager library for Openscenegraph ++Version: @OPENSCENEGRAPH_VERSION@ ++Requires: openscenegraph-osgText openscenegraph-osgDB openscenegraph-osgUtil openscenegraph-osgGA openscenegraph-osg openthreads ++Conflicts: ++Libs: -L${libdir} -losgViewer ++Libs.private: -lgdi32 ++Cflags: -I${includedir} +diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgVolume.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgVolume.pc.in +--- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgVolume.pc.in 1970-01-01 01:00:00.000000000 +0100 ++++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgVolume.pc.in 2010-01-17 16:58:31.000000000 +0100 +@@ -0,0 +1,15 @@ ++# pkg-config source file ++ ++prefix=@CMAKE_INSTALL_PREFIX@ ++exec_prefix=${prefix} ++libdir=${exec_prefix}/lib@LIB_POSTFIX@ ++includedir=${prefix}/include ++ ++Name: openscenegraph-osgVolume ++Description: Volume library for Openscenegraph ++Version: @OPENSCENEGRAPH_VERSION@ ++Requires: openscenegraph-osgUtil openscenegraph-osgDB openscenegraph-osgGA openscenegraph-osg openthreads ++Conflicts: ++Libs: -L${libdir} -losgVolume ++Libs.private: ++Cflags: -I${includedir} +diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgWidget.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgWidget.pc.in +--- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgWidget.pc.in 1970-01-01 01:00:00.000000000 +0100 ++++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgWidget.pc.in 2010-01-17 16:58:31.000000000 +0100 +@@ -0,0 +1,15 @@ ++# pkg-config source file ++ ++prefix=@CMAKE_INSTALL_PREFIX@ ++exec_prefix=${prefix} ++libdir=${exec_prefix}/lib@LIB_POSTFIX@ ++includedir=${prefix}/include ++ ++Name: openscenegraph-osgWidget ++Description: Windowing toolkit library for Openscenegraph ++Version: @OPENSCENEGRAPH_VERSION@ ++Requires: openscenegraph-osgText openscenegraph-osgViewer openscenegraph-osgDB openscenegraph-osgGA openscenegraph-osg openthreads ++Conflicts: ++Libs: -L${libdir} -losgWidget ++Libs.private: ++Cflags: -I${includedir} diff -r 43205e8dd3e1 -r e62e7f0d2650 src/openscenegraph-2-static.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/openscenegraph-2-static.patch Wed Jan 20 00:44:12 2010 +0100 @@ -0,0 +1,18 @@ +This file is part of mingw-cross-env. +See doc/index.html or doc/README for further information. + +diff -uNr OpenSceneGraph-2.8.2.orig/src/osgPlugins/exr/ReaderWriterEXR.cpp OpenSceneGraph-2.8.2/src/osgPlugins/exr/ReaderWriterEXR.cpp +--- OpenSceneGraph-2.8.2.orig/src/osgPlugins/exr/ReaderWriterEXR.cpp 2008-11-27 10:36:18.000000000 +0100 ++++ OpenSceneGraph-2.8.2/src/osgPlugins/exr/ReaderWriterEXR.cpp 2010-01-14 17:55:32.000000000 +0100 +@@ -4,11 +4,6 @@ + #include + #include + +-#ifdef _WIN32 +-//Make the half format work against openEXR libs +-#define OPENEXR_DLL +-#endif +- + #include + #include + #include diff -r 43205e8dd3e1 -r e62e7f0d2650 src/openscenegraph-3-header.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/openscenegraph-3-header.patch Wed Jan 20 00:44:12 2010 +0100 @@ -0,0 +1,14 @@ +This file is part of mingw-cross-env. +See doc/index.html or doc/README for further information. + +diff -uNr OpenSceneGraph-2.8.2.orig/src/osgPlugins/txp/TXPNode.cpp OpenSceneGraph-2.8.2/src/osgPlugins/txp/TXPNode.cpp +--- OpenSceneGraph-2.8.2.orig/src/osgPlugins/txp/TXPNode.cpp 2008-06-16 15:20:51.000000000 +0200 ++++ OpenSceneGraph-2.8.2/src/osgPlugins/txp/TXPNode.cpp 2010-01-12 09:00:56.000000000 +0100 +@@ -8,6 +8,7 @@ + #include + #include + #include ++#include + + #include "TileMapper.h" + #include "TXPNode.h" diff -r 43205e8dd3e1 -r e62e7f0d2650 src/openscenegraph-4-disable-png.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/openscenegraph-4-disable-png.patch Wed Jan 20 00:44:12 2010 +0100 @@ -0,0 +1,16 @@ +This file is part of mingw-cross-env. +See doc/index.html or doc/README for further information. + +diff -uNr OpenSceneGraph-2.8.2.orig/src/osgPlugins/CMakeLists.txt OpenSceneGraph-2.8.2/src/osgPlugins/CMakeLists.txt +--- OpenSceneGraph-2.8.2.orig/src/osgPlugins/CMakeLists.txt 2009-01-14 21:32:06.000000000 +0100 ++++ OpenSceneGraph-2.8.2/src/osgPlugins/CMakeLists.txt 2010-01-15 06:54:16.000000000 +0100 +@@ -96,9 +96,6 @@ + IF(GIFLIB_FOUND) + ADD_SUBDIRECTORY(gif) + ENDIF(GIFLIB_FOUND) +-IF(PNG_FOUND) +- ADD_SUBDIRECTORY(png) +-ENDIF(PNG_FOUND) + IF(TIFF_FOUND) + ADD_SUBDIRECTORY(tiff) + ENDIF(TIFF_FOUND) diff -r 43205e8dd3e1 -r e62e7f0d2650 src/openscenegraph.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/openscenegraph.mk Wed Jan 20 00:44:12 2010 +0100 @@ -0,0 +1,39 @@ +# This file is part of mingw-cross-env. +# See doc/index.html or doc/README for further information. + +# OpenSceneGraph +PKG := openscenegraph +$(PKG)_IGNORE := +$(PKG)_VERSION := 2.8.2 +$(PKG)_CHECKSUM := f2f0a3285a022640345a81f536459f37f3f38d01 +$(PKG)_SUBDIR := OpenSceneGraph-$($(PKG)_VERSION) +$(PKG)_FILE := $($(PKG)_SUBDIR).zip +$(PKG)_WEBSITE := http://www.openscenegraph.org/ +$(PKG)_URL := http://www.openscenegraph.org/downloads/stable_releases/$($(PKG)_SUBDIR)/source/$($(PKG)_FILE) +$(PKG)_DEPS := gcc curl giflib jpeg tiff libpng jasper openexr gdal freetype zlib + +define $(PKG)_UPDATE + wget -q -O- 'http://www.openscenegraph.org/projects/osg/browser/OpenSceneGraph/tags?order=date&desc=1' | \ + grep 'OpenSceneGraph-\([0-9][^<]*\)<.*,\1,p' | \ + grep -v '2\.8\.' | \ + head -1 +endef + +define $(PKG)_BUILD + cd '$(1)' && cmake . \ + -DCMAKE_SYSTEM_NAME=Windows \ + -DCMAKE_FIND_ROOT_PATH='$(PREFIX)/$(TARGET)' \ + -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER \ + -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \ + -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \ + -DCMAKE_C_COMPILER='$(PREFIX)/bin/$(TARGET)-gcc' \ + -DCMAKE_INCLUDE_PATH='$(PREFIX)/$(TARGET)/include' \ + -DCMAKE_LIB_PATH='$(PREFIX)/$(TARGET)/lib' \ + -DCMAKE_INSTALL_PREFIX='$(PREFIX)/$(TARGET)' \ + -DCMAKE_BUILD_TYPE=Release \ + -DDYNAMIC_OPENTHREADS=OFF \ + -DDYNAMIC_OPENSCENEGRAPH=OFF \ + -DBUILD_OSG_APPLICATIONS=OFF + $(MAKE) -C '$(1)' -j '$(JOBS)' install +endef