Mercurial > mxe-octave
changeset 1787:af06345ac591
fixed naming of patch files of package openscenegraph
| author | Volker Grabsch <vog@notjusthosting.com> |
|---|---|
| date | Mon, 25 Apr 2011 00:37:14 +0200 |
| parents | d3947a67058b |
| children | 2559d63f2082 |
| files | src/openscenegraph-1-static.patch src/openscenegraph-2-no-asprintf.patch src/openscenegraph-2-static.patch src/openscenegraph-3-no-asprintf.patch |
| diffstat | 4 files changed, 32 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/openscenegraph-1-static.patch Mon Apr 25 00:37:14 2011 +0200 @@ -0,0 +1,14 @@ +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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/openscenegraph-2-no-asprintf.patch Mon Apr 25 00:37:14 2011 +0200 @@ -0,0 +1,18 @@ +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-2-static.patch Sun Apr 24 23:04:06 2011 +0200 +++ /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-3-no-asprintf.patch Sun Apr 24 23:04:06 2011 +0200 +++ /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);