HaikuPorts
  • Login
  • Preferences
  • Help/Guide
  • Wiki
  • Timeline
  • Roadmap
  • View Tickets
  • Search
  • Port Log
  • Blog

Context Navigation

  • Back to Ticket #386

Ticket #386: openscenegraph-2.8.3.patch

File openscenegraph-2.8.3.patch, 3.2 KB (added by michaelvoliveira, 5 years ago)

.bep file for delete any references to X11 libs.

  • OpenSceneGraph-2.8.

    diff -Nbaur OpenSceneGraph-2.8.3/CMakeLists.txt OpenSceneGraph-2.8.3-haiku/CMakeLists.txt
    old new  
    152152    # Also, remember OS X X11 is a user installed option so it may not exist. 
    153153    FIND_PACKAGE(X11) 
    154154    # Some Unicies need explicit linkage to the Math library or the build fails. 
    155     FIND_LIBRARY(MATH_LIBRARY m) 
     155    FIND_LIBRARY(MATH_LIBRARY root) 
    156156ENDIF(UNIX) 
    157157 
    158158# Make the headers visible to everything 
    … …  
    163163INCLUDE_DIRECTORIES( 
    164164    ${OpenSceneGraph_SOURCE_DIR}/include 
    165165    ${OPENGL_INCLUDE_DIR} 
     166    /boot/develop/headers/os/opengl/GL 
    166167) 
    167168 
    168169# Common global definitions 
  • include/osgDB/ConvertUTF

    diff -Nbaur OpenSceneGraph-2.8.3/include/osgDB/ConvertUTF OpenSceneGraph-2.8.3-haiku/include/osgDB/ConvertUTF
    old new  
    1919 
    2020#include <string> 
    2121 
    22 #ifdef __CYGWIN__ 
     22#if defined(__CYGWIN__) || defined(__HAIKU__) 
    2323namespace std 
    2424{ 
    2525typedef basic_string<wchar_t> wstring; 
  • src/osgDB/FileUtils.cpp

    diff -Nbaur OpenSceneGraph-2.8.3/src/osgDB/FileUtils.cpp OpenSceneGraph-2.8.3-haiku/src/osgDB/FileUtils.cpp
    old new  
    5757    #if (MAC_OS_X_VERSION_MAX_ALLOWED <= 1040) 
    5858        #define stat64 stat 
    5959    #endif 
    60 #elif defined(__CYGWIN__) || defined(__FreeBSD__) || (defined(__hpux) && !defined(_LARGEFILE64_SOURCE)) 
     60#elif defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__HAIKU__) || (defined(__hpux) && !defined(_LARGEFILE64_SOURCE)) 
    6161    #define stat64 stat 
    6262#endif 
    6363 
  • src/osgViewer/GraphicsWindowX11.cpp

    diff -Nbaur OpenSceneGraph-2.8.3/src/osgViewer/GraphicsWindowX11.cpp OpenSceneGraph-2.8.3-haiku/src/osgViewer/GraphicsWindowX11.cpp
    old new  
    1616 * These elements are licensed under OSGPL as above, with Copyright (C) 2001-2004  Don Burns. 
    1717 */ 
    1818 
     19#if !defined(__HAIKU__) 
     20 
    1921#include <osgViewer/api/X11/GraphicsWindowX11> 
    2022#include <osgViewer/api/X11/PixelBufferX11> 
    2123 
    … …  
    18951897    XFlush(display);  
    18961898    XSync(display,0); 
    18971899} 
     1900 
     1901#endif 
  • src/osgViewer/PixelBufferX11.cpp

    diff -Nbaur OpenSceneGraph-2.8.3/src/osgViewer/PixelBufferX11.cpp OpenSceneGraph-2.8.3-haiku/src/osgViewer/PixelBufferX11.cpp
    old new  
    1616 * These elements are license under OSGPL as above, with Copyright (C) 2001-2004  Don Burns. 
    1717 */ 
    1818 
     19#if !defined(__HAIKU__) 
     20 
    1921#include <osgViewer/api/X11/PixelBufferX11> 
    2022#include <osgViewer/api/X11/GraphicsWindowX11> 
    2123#include <osg/GLExtensions> 
    … …  
    448450 
    449451    glXSwapBuffers(_display, _pbuffer); 
    450452} 
     453 
     454#endif 

Download in other formats:

  • Original Format

Trac Powered

Powered by Trac 0.13dev-r10686
By Edgewall Software.

Visit the Trac open source project at
http://trac.edgewall.org/