From f2ab7b67755dc91c50c835102c2d6df99541ca16 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sun, 24 Apr 2011 22:46:26 +0200 Subject: update package openscenegraph Patch disposition: openscenegraph-1-pkg-config.patch Removed. Seems to be included in 2.8.4, although differently. There is now one openscenegraph .pc file instead of the many created by the patch. openscenegraph-2-static.patch Retained. Apparently needed for static linking. openscenegraph-3-no-asprintf.patch Changed line endings to unix style, matching patched file. openscenegraph-4-changeset-12154.patch Removed since patch is already in 2.8.4. --- src/openscenegraph-1-pkg-config.patch | 368 ----------------------------- src/openscenegraph-3-no-asprintf.patch | 22 +- src/openscenegraph-4-changeset-12154.patch | 16 -- src/openscenegraph.mk | 4 +- 4 files changed, 13 insertions(+), 397 deletions(-) delete mode 100644 src/openscenegraph-1-pkg-config.patch delete mode 100644 src/openscenegraph-4-changeset-12154.patch diff --git a/src/openscenegraph-1-pkg-config.patch b/src/openscenegraph-1-pkg-config.patch deleted file mode 100644 index ed1f987..0000000 --- a/src/openscenegraph-1-pkg-config.patch +++ /dev/null @@ -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 -@@ -779,12 +779,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} diff --git a/src/openscenegraph-3-no-asprintf.patch b/src/openscenegraph-3-no-asprintf.patch index 715b0a6..c246402 100644 --- a/src/openscenegraph-3-no-asprintf.patch +++ b/src/openscenegraph-3-no-asprintf.patch @@ -5,14 +5,14 @@ diff -urN a/src/osgPlugins/xine/ReaderWriterXine.cpp b/src/osgPlugins/xine/Reade --- 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); + 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); diff --git a/src/openscenegraph-4-changeset-12154.patch b/src/openscenegraph-4-changeset-12154.patch deleted file mode 100644 index f666c71..0000000 --- a/src/openscenegraph-4-changeset-12154.patch +++ /dev/null @@ -1,16 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -This patch has been taken from: -http://www.openscenegraph.org/projects/osg/changeset/12154/ - -Index: trunk/src/osgPlugins/ffmpeg/FFmpegHeaders.hpp -=================================================================== ---- trunk/src/osgPlugins/ffmpeg/FFmpegHeaders.hpp (revision 10053) -+++ trunk/src/osgPlugins/ffmpeg/FFmpegHeaders.hpp (revision 12154) -@@ -7,4 +7,5 @@ - { - #define __STDC_CONSTANT_MACROS -+#define FF_API_OLD_SAMPLE_FMT 0 - #include // for error codes defined in avformat.h - #include diff --git a/src/openscenegraph.mk b/src/openscenegraph.mk index 79dd394..6e69af2 100644 --- a/src/openscenegraph.mk +++ b/src/openscenegraph.mk @@ -4,8 +4,8 @@ # OpenSceneGraph PKG := openscenegraph $(PKG)_IGNORE := -$(PKG)_VERSION := 2.8.3 -$(PKG)_CHECKSUM := 90502e4cbd47aac1689cc39d25ab62bbe0bba9fc +$(PKG)_VERSION := 2.8.4 +$(PKG)_CHECKSUM := 356ecd39f7e714dabb6776e23303fe3f1798a7cf $(PKG)_SUBDIR := OpenSceneGraph-$($(PKG)_VERSION) $(PKG)_FILE := OpenSceneGraph-$($(PKG)_VERSION).zip $(PKG)_WEBSITE := http://www.openscenegraph.org/ -- cgit v0.12