<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1c0dc01f8f6d4f28073a6026d8672a4f4cb5c7d6">https://github.com/macports/macports-ports/commit/1c0dc01f8f6d4f28073a6026d8672a4f4cb5c7d6</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 1c0dc01f8f6d4f28073a6026d8672a4f4cb5c7d6
</span>Author: jjandersson <44439490+jjandersson@users.noreply.github.com>
AuthorDate: Fri Nov 2 16:31:53 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> h3dapi: Fix PythonLibs linking
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * update cmake to enforce usage of Python 2.x
</span><span style='display:block; white-space:pre;color:#404040;'> * add macro so that correct include path is used
</span><span style='display:block; white-space:pre;color:#404040;'> * update to resolve correct glut display mode
</span>---
graphics/h3dapi/Portfile | 10 +++-
graphics/h3dapi/files/patch-CMakeListsPython.diff | 70 ++++++++++++++++++++++
graphics/h3dapi/files/patch-glutwindow.diff | 29 +++++++++
graphics/h3dapi/files/patch-h3dapicmake.diff | 10 ++++
graphics/h3dapi/files/patch-pythonmethods.diff | 15 +++++
graphics/h3dapi/files/patch-pythonscript.diff | 11 ++++
graphics/h3dapi/files/patch-pythontypes.diff | 11 ++++
graphics/h3dapi/files/patch-pythontypesheader.diff | 11 ++++
graphics/h3dapi/files/patch-pytypewrapper.diff | 11 ++++
9 files changed, 177 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/h3dapi/Portfile b/graphics/h3dapi/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 94fb499..a216af9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/h3dapi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/h3dapi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +35,15 @@ checksums rmd160 ca60af0fcd89c309cd030ab509a640b28fd6b470 \
</span> cmake.out_of_source yes
patchfiles patch-CMakeLists.txt.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-include-H3D-X3DParticleEmitterNode.h.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-include-H3D-X3DParticleEmitterNode.h.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-CMakeListsPython.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-glutwindow.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-h3dapicmake.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-pythonmethods.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-pythonscript.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-pythontypes.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-pytypewrapper.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-pythontypesheader.diff
</span>
if {${subport} eq ${name}} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/h3dapi/files/patch-CMakeListsPython.diff b/graphics/h3dapi/files/patch-CMakeListsPython.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..35e7ba6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/h3dapi/files/patch-CMakeListsPython.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,70 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- build/CMakeLists.txt.org 2014-04-16 14:14:26.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ build/CMakeLists.txt 2018-10-23 13:33:45.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -265,37 +265,37 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF(ZLIB_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Optional extra library. Add python bindings to H3D API, allow for extended prototyping without using C++.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-FIND_PACKAGE(PythonLibs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-IF( PYTHON_INCLUDE_PATH AND PYTHON_LIBRARIES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(PYTHON_FOUND 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ELSE(PYTHON_INCLUDE_PATH AND PYTHON_LIBRARIES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(PYTHON_FOUND 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ENDIF(PYTHON_INCLUDE_PATH AND PYTHON_LIBRARIES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Report the results.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-IF(NOT PYTHON_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(PYTHON_DIR_MESSAGE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "PYTHON was not found. Make sure PYTHON_LIBRARY and PYTHON_INCLUDE_PATH are set.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- IF(NOT PYTHON_FIND_QUIETLY)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MESSAGE(STATUS "${PYTHON_DIR_MESSAGE}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ELSE(NOT PYTHON_FIND_QUIETLY)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- IF(PYTHON_FIND_REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MESSAGE(FATAL_ERROR "${PYTHON_DIR_MESSAGE}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ENDIF(PYTHON_FIND_REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ENDIF(NOT PYTHON_FIND_QUIETLY)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ENDIF(NOT PYTHON_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-IF(PYTHON_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(HAVE_PYTHON 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- INCLUDE_DIRECTORIES( ${PYTHON_INCLUDE_PATH} )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # pyconfig.h is put in different directory from Ubuntu 13.04 (raring)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # and CMake FindPythonLibs module is not updated for this yet.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Adding it explicitly here in the mean time.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- INCLUDE_DIRECTORIES( /usr/include/${CMAKE_LIBRARY_ARCHITECTURE}/python2.7 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++IF ( APPLE )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET( CMAKE_FIND_FRAMEWORK_FIRST )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++FIND_PACKAGE( PythonLibs 2 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++IF( PYTHONLIBS_FOUND )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET( HAVE_PYTHON 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET( HAVE_PYTHON_OSX_FRAMEWORK )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ include_directories( ${PYTHON_INCLUDE_DIRS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ IF(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ FOREACH( dir ${PYTHON_INCLUDE_DIRS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ IF( dir MATCHES "/System/Library/Frameworks/Python[.]framework")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET( HAVE_PYTHON_OSX_FRAMEWORK 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BREAK()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ENDFOREACH()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # pyconfig.h is put in different directory from Ubuntu 13.04 (raring)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # and CMake FindPythonLibs module is not updated for this yet.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # Adding it explicitly here in the mean time.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ INCLUDE_DIRECTORIES( /usr/include/${CMAKE_LIBRARY_ARCHITECTURE}/python2.7 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(optionalLibs ${optionalLibs} ${PYTHON_LIBRARIES} )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ENDIF(PYTHON_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ IF( PYTHONLIBS_VERSION_STRING VERSION_LESS "3.0.0" AND CMAKE_COMPILER_IS_GNUCXX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ add_definitions(-fno-strict-aliasing)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Optional extra library. Used for sound in H3D API.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FIND_PACKAGE(H3DOpenAL)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/h3dapi/files/patch-glutwindow.diff b/graphics/h3dapi/files/patch-glutwindow.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..3bbcf84
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/h3dapi/files/patch-glutwindow.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/GLUTWindow.cpp.org 2014-04-04 11:37:10.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/GLUTWindow.cpp 2018-10-23 14:01:56.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -174,10 +174,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mode |= GLUT_STEREO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const string& game_mode = gameMode->getValue();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef GLUT_MACOSX_IMPLEMENTATION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if GLUT_MACOSX_IMPLEMENTATION > 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if( game_mode == ""){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mode |= GLUT_3_2_CORE_PROFILE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glutInitDisplayMode( mode );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if( gameMode->getValue() == "" ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if( game_mode == "" ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glutInitWindowSize( width->getValue(), height->getValue() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glutInitWindowPosition( posX->getValue(), posY->getValue() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef FREEGLUT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ glutInitContextVersion(3,1); // There is no pure GLUT replacement for this since GLUT is too old
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ glutInitContextFlags(GLUT_CORE_PROFILE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ window_id = glutCreateWindow( "H3D" );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ setFullscreen( fullscreen->getValue() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // This code is here to check if we got a stereo window using stereo mode.
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/h3dapi/files/patch-h3dapicmake.diff b/graphics/h3dapi/files/patch-h3dapicmake.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..2f0351b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/h3dapi/files/patch-h3dapicmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/H3D/H3DApi.cmake.org 2014-05-13 15:10:41.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/H3D/H3DApi.cmake 2018-10-23 13:38:00.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -117,6 +117,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /// Undef if you do not have Python(www.python.org) installed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /// PythonScript node will then not be supported.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #cmakedefine HAVE_PYTHON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#cmakedefine HAVE_PYTHON_OSX_FRAMEWORK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /// Undef if you do not have libcurl(http://sourceforge.net/projects/curl/)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /// installed. URLs using protocols like http and ftp will then not be
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/h3dapi/files/patch-pythonmethods.diff b/graphics/h3dapi/files/patch-pythonmethods.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..3b08ac4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/h3dapi/files/patch-pythonmethods.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/H3D/PythonMethods.h.org 2014-04-16 13:27:11.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/H3D/PythonMethods.h 2018-10-23 13:48:22.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -45,8 +45,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define _DEBUG_UNDEFED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef _DEBUG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <pyconfig.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(__APPLE__) && defined(__MACH__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__APPLE__) && defined(__MACH__) && defined(HAVE_PYTHON_OSX_FRAMEWORK)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <Python/Python.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <Python.h>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/h3dapi/files/patch-pythonscript.diff b/graphics/h3dapi/files/patch-pythonscript.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..01f0c88
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/h3dapi/files/patch-pythonscript.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/PythonScript.cpp.org 2014-04-10 11:17:09.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/PythonScript.cpp 2018-10-23 17:04:36.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -57,7 +57,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef _DEBUG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(__APPLE__) && defined(__MACH__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__APPLE__) && defined(__MACH__) && defined(HAVE_PYTHON_OSX_FRAMEWORK)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <Python/Python.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <Python/pythonrun.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <Python/ceval.h>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/h3dapi/files/patch-pythontypes.diff b/graphics/h3dapi/files/patch-pythontypes.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..1a00154
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/h3dapi/files/patch-pythontypes.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/PythonTypes.cpp.org 2014-05-05 18:52:04.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/PythonTypes.cpp 2018-10-23 14:04:48.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -49,7 +49,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define DONT_HAVE_SYS_STAT_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef HAVE_STAT_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(__APPLE__) && defined(__MACH__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__APPLE__) && defined(__MACH__) && defined(HAVE_PYTHON_OSX_FRAMEWORK)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <Python/Python.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <Python/pythonrun.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <Python/ceval.h>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/h3dapi/files/patch-pythontypesheader.diff b/graphics/h3dapi/files/patch-pythontypesheader.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..885a765
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/h3dapi/files/patch-pythontypesheader.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/H3D/PythonTypes.h.org 2014-01-16 15:02:37.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/H3D/PythonTypes.h 2018-10-23 16:52:30.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -79,7 +79,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef _DEBUG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(__APPLE__) && defined(__MACH__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__APPLE__) && defined(__MACH__) && defined(HAVE_PYTHON_OSX_FRAMEWORK)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <Python/Python.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <Python.h>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/h3dapi/files/patch-pytypewrapper.diff b/graphics/h3dapi/files/patch-pytypewrapper.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..cf4dda1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/h3dapi/files/patch-pytypewrapper.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/H3D/PyTypeWrapperOrg.h 2014-01-16 15:02:36.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/H3D/PyTypeWrapper.h 2018-11-01 16:00:03.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -40,7 +40,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef _DEBUG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(__APPLE__) && defined(__MACH__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__APPLE__) && defined(__MACH__) && defined(HAVE_PYTHON_OSX_FRAMEWORK)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <Python/Python.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <Python.h>
</span></pre><pre style='margin:0'>
</pre>