Mercurial > mxe-octave
changeset 1928:cfe3eba58dfd
update package openscenegraph
| author | Mark Brand <mabrand@mabrand.nl> |
|---|---|
| date | Sun, 10 Jul 2011 22:38:36 +0200 |
| parents | d0e321f47add |
| children | 278aa9fe8d7a |
| files | src/openscenegraph-1-mingw32.patch src/openscenegraph-1-static.patch src/openscenegraph-2-no-asprintf.patch src/openscenegraph-3-pkg-config.patch src/openscenegraph-4-curl.patch src/openscenegraph.mk |
| diffstat | 6 files changed, 24 insertions(+), 438 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/openscenegraph-1-mingw32.patch Sun Jul 10 22:38:36 2011 +0200 @@ -0,0 +1,19 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +This patch taken from: +http://lists.openscenegraph.org/pipermail/osg-submissions-openscenegraph.org/2011-July/008465.html + +diff --git a/src/osgPlugins/dicom/ReaderWriterDICOM.cpp b/src/osgPlugins/dicom/ReaderWriterDICOM.cpp +index 785ac9e..c5b4507 100644 +--- a/src/osgPlugins/dicom/ReaderWriterDICOM.cpp ++++ b/src/osgPlugins/dicom/ReaderWriterDICOM.cpp +@@ -19,7 +19,7 @@ + #include <osgVolume/RayTracedTechnique> + + #ifdef USE_DCMTK +- #ifndef _WIN32 ++ #if !defined(_WIN32) || defined(__MINGW32__) + #define HAVE_CONFIG_H + #endif +
--- a/src/openscenegraph-1-static.patch Sun Jul 10 23:33:32 2011 +1000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - ---- 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-26 21:36:31.000000000 +0100 -@@ -4,7 +4,7 @@ - #include <osg/Image> - #include <osg/GL> - --#ifdef _WIN32 -+#if defined _WIN32 && !defined OSG_LIBRARY_STATIC - //Make the half format work against openEXR libs - #define OPENEXR_DLL - #endif
--- a/src/openscenegraph-2-no-asprintf.patch Sun Jul 10 23:33:32 2011 +1000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -diff -urN a/src/osgPlugins/xine/ReaderWriterXine.cpp b/src/osgPlugins/xine/ReaderWriterXine.cpp ---- a/src/osgPlugins/xine/ReaderWriterXine.cpp 2010-03-13 11:38:10.000000000 +0100 -+++ b/src/osgPlugins/xine/ReaderWriterXine.cpp 2010-04-28 22:54:29.203481468 +0200 -@@ -326,9 +326,8 @@ - const char* user_home = xine_get_homedir(); - if(user_home) - { -- char* cfgfile = NULL; -- int result = asprintf(&(cfgfile), "%s/.xine/config", user_home); -- if (result>0) xine_config_load(_xine, cfgfile); -+ std::string configFile(std::string(user_home)+"/.xine/config"); -+ xine_config_load(_xine, configFile.c_str()); - } - - xine_init(_xine);
--- a/src/openscenegraph-3-pkg-config.patch Sun Jul 10 23:33:32 2011 +1000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,368 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -diff -uNr OpenSceneGraph-2.8.3.orig/CMakeLists.txt OpenSceneGraph-2.8.3/CMakeLists.txt ---- OpenSceneGraph-2.8.3.orig/CMakeLists.txt 2010-04-01 11:02:54.000000000 +0200 -+++ OpenSceneGraph-2.8.3/CMakeLists.txt 2010-04-20 07:41:05.000000000 +0200 -@@ -810,12 +810,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") -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} -DOSG_LIBRARY_STATIC -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_png -losgdb_pnm -losgdb_rgb -losgdb_rot -losgdb_scale -losgdb_shp -losgdb_stl -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 -lpng -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}
--- a/src/openscenegraph-4-curl.patch Sun Jul 10 23:33:32 2011 +1000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,33 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -This patch taken from: -http://lists.openscenegraph.org/pipermail/osg-submissions-openscenegraph.org/2011-June/008449.html - -From 6876c578528ecc61088940fb9358e393811e43ef Mon Sep 17 00:00:00 2001 -From: Mark Brand <mabrand@mabrand.nl> -Date: Tue, 28 Jun 2011 00:34:27 +0200 -Subject: [PATCH] remove include of obsolete curl/types.h - -Quoth curl-7.21.7/CHANGES: - - Removed types.h (it's been unused since April 2004) ---- - src/osgPlugins/curl/ReaderWriterCURL.cpp | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -diff --git a/src/osgPlugins/curl/ReaderWriterCURL.cpp b/src/osgPlugins/curl/ReaderWriterCURL.cpp -index 83aee7b..daf156f 100644 ---- a/src/osgPlugins/curl/ReaderWriterCURL.cpp -+++ b/src/osgPlugins/curl/ReaderWriterCURL.cpp -@@ -21,7 +21,6 @@ - #include <fstream> - - #include <curl/curl.h> --#include <curl/types.h> - - #include "ReaderWriterCURL.h" - --- -1.7.5.4 -
--- a/src/openscenegraph.mk Sun Jul 10 23:33:32 2011 +1000 +++ b/src/openscenegraph.mk Sun Jul 10 22:38:36 2011 +0200 @@ -4,14 +4,14 @@ # OpenSceneGraph PKG := openscenegraph $(PKG)_IGNORE := -$(PKG)_VERSION := 2.8.5 -$(PKG)_CHECKSUM := 7325504070a262aa6eb952bc36d98843a4ed4cf7 +$(PKG)_VERSION := 3.0.0 +$(PKG)_CHECKSUM := aa4982bf1502c8ad52b40508221978a2ca48e34e $(PKG)_SUBDIR := OpenSceneGraph-$($(PKG)_VERSION) $(PKG)_FILE := OpenSceneGraph-$($(PKG)_VERSION).zip $(PKG)_WEBSITE := http://www.openscenegraph.org/ -$(PKG)_URL := http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-$($(PKG)_VERSION)/source/$($(PKG)_FILE) +$(PKG)_URL := http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-3.0/source/$($(PKG)_FILE) $(PKG)_URL_2 := http://distfiles.macports.org/OpenSceneGraph/$($(PKG)_FILE) -$(PKG)_DEPS := gcc curl ffmpeg freetype gdal giflib jasper jpeg libpng openexr tiff xine-lib zlib +$(PKG)_DEPS := gcc curl ffmpeg freetype gdal giflib jasper jpeg libpng openexr tiff xine-lib zlib dcmtk define $(PKG)_UPDATE wget -q -O- 'http://www.openscenegraph.org/projects/osg/browser/OpenSceneGraph/tags?order=date&desc=1' | \ @@ -30,5 +30,5 @@ -DDYNAMIC_OPENSCENEGRAPH=OFF \ -DBUILD_OSG_APPLICATIONS=OFF \ -D_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE=1 - $(MAKE) -C '$(1)' -j '$(JOBS)' install + $(MAKE) -C '$(1)' -j '$(JOBS)' install VERBOSE=1 endef