4 files changed, 57 insertions, 22 deletions

diff --git a/graphics/osg/files/patch-CMakeLists.txt b/graphics/osg/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..e7dc6a6dce0d
--- /dev/null
+++ b/graphics/osg/files/patch-CMakeLists.txt
@@ -0,0 +1,20 @@
+--- CMakeLists.txt.orig	2009-01-29 16:29:08.000000000 +0300
++++ CMakeLists.txt	2009-02-05 17:45:24.000000000 +0300
+@@ -459,7 +459,7 @@
+ 
+ IF(UNIX AND NOT WIN32 AND NOT APPLE)
+   IF(CMAKE_SIZEOF_VOID_P MATCHES "8")
+-      SET(LIB_POSTFIX "64" CACHE STRING "suffix for 32/64 dir placement")
++      SET(LIB_POSTFIX "" CACHE STRING "suffix for 32/64 dir placement")
+       MARK_AS_ADVANCED(LIB_POSTFIX)
+   ENDIF(CMAKE_SIZEOF_VOID_P MATCHES "8")
+ ENDIF(UNIX AND NOT WIN32 AND NOT APPLE)
+@@ -766,7 +766,7 @@
+     @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/openscenegraph.pc DESTINATION libdata/pkgconfig COMPONENT libopenscenegraph-dev)
+ 
+ # Run this as late as possible so users can easier spot the message
+ IF (${CMAKE_INSTALL_PREFIX} STREQUAL "/usr/local")
diff --git a/graphics/osg/files/patch-src-OpenThreads-CMakeLists.txt b/graphics/osg/files/patch-src-OpenThreads-CMakeLists.txt
new file mode 100644
index 000000000000..675ef5a726a0
--- /dev/null
+++ b/graphics/osg/files/patch-src-OpenThreads-CMakeLists.txt
@@ -0,0 +1,8 @@
+--- src/OpenThreads/CMakeLists.txt.orig	2009-01-27 18:34:57.000000000 +0300
++++ src/OpenThreads/CMakeLists.txt	2009-02-05 17:54:57.000000000 +0300
+@@ -94,4 +94,4 @@
+     @ONLY
+     )
+ 
+-INSTALL(FILES ${PROJECT_BINARY_DIR}/packaging/pkgconfig/openthreads.pc DESTINATION lib${LIB_POSTFIX}/pkgconfig)
++INSTALL(FILES ${PROJECT_BINARY_DIR}/packaging/pkgconfig/openthreads.pc DESTINATION libdata/pkgconfig)
diff --git a/graphics/osg/files/patch-src-OpenThreads-pthreads-PThread.c++ b/graphics/osg/files/patch-src-OpenThreads-pthreads-PThread.c++
index 351452e25e7c..d1997c322f3f 100644
--- a/graphics/osg/files/patch-src-OpenThreads-pthreads-PThread.c++
+++ b/graphics/osg/files/patch-src-OpenThreads-pthreads-PThread.c++
@@ -1,5 +1,5 @@
---- src/OpenThreads/pthreads/PThread.c++.orig	2008-09-25 18:28:42.000000000 +0400
-+++ src/OpenThreads/pthreads/PThread.c++	2008-09-25 18:52:13.000000000 +0400
+--- src/OpenThreads/pthreads/PThread.c++.orig	2008-11-05 13:27:49.000000000 +0300
++++ src/OpenThreads/pthreads/PThread.c++	2009-02-04 18:06:28.000000000 +0300
 @@ -21,6 +21,7 @@
  #include <sys/types.h>
  #include <unistd.h>
@@ -8,3 +8,30 @@
  
  #if defined __linux || defined __sun || defined __APPLE__
  #include <string.h>
+@@ -125,7 +126,7 @@
+ #if defined(__sgi)
+             pthread_setrunon_np( pd->cpunum );
+ #elif defined(HAVE_PTHREAD_SETAFFINITY_NP) || defined(HAVE_THREE_PARAM_SCHED_SETAFFINITY) || defined(HAVE_TWO_PARAM_SCHED_SETAFFINITY)
+-            cpu_set_t cpumask;
++            cpuset_t cpumask;
+             CPU_ZERO( &cpumask );
+             CPU_SET( pd->cpunum, &cpumask );
+ 
+@@ -541,7 +542,7 @@
+ 
+     if (pd->isRunning && Thread::CurrentThread()==this)
+     {
+-        cpu_set_t cpumask;
++        cpuset_t cpumask;
+         CPU_ZERO( &cpumask );
+         CPU_SET( pd->cpunum, &cpumask );
+ #if defined(HAVE_PTHREAD_SETAFFINITY_NP)
+@@ -975,7 +976,7 @@
+     else
+     {
+ #if defined(HAVE_PTHREAD_SETAFFINITY_NP) || defined(HAVE_THREE_PARAM_SCHED_SETAFFINITY) || defined(HAVE_TWO_PARAM_SCHED_SETAFFINITY)
+-        cpu_set_t cpumask;
++        cpuset_t cpumask;
+         CPU_ZERO( &cpumask );
+         CPU_SET( cpunum, &cpumask );
+ 
diff --git a/graphics/osg/files/patch-src-osgViewer-CMakeLists.txt b/graphics/osg/files/patch-src-osgViewer-CMakeLists.txt
deleted file mode 100644
index d42acffd81c7..000000000000
--- a/graphics/osg/files/patch-src-osgViewer-CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/osgViewer/CMakeLists.txt.orig	2008-08-05 19:32:03.000000000 +0400
-+++ src/osgViewer/CMakeLists.txt	2009-02-09 23:35:48.000000000 +0300
-@@ -78,7 +78,6 @@
-         SET(LIB_PUBLIC_HEADERS ${LIB_PUBLIC_HEADERS}
-             ${HEADER_PATH}/api/X11/GraphicsWindowX11
-             ${HEADER_PATH}/api/X11/PixelBufferX11
--            ${XRANDR_INCLUDE_DIRS}
-         )
-         SET(LIB_COMMON_FILES ${LIB_COMMON_FILES} 
-             GraphicsWindowX11.cpp 
-@@ -89,8 +88,7 @@
-             INCLUDE(FindPkgConfig)
-             PKG_CHECK_MODULES(XRANDR REQUIRED xrandr)
-             ADD_DEFINITIONS(-DOSGVIEWER_USE_XRANDR)
--            SET(LIB_PUBLIC_HEADERS ${LIB_PUBLIC_HEADERS} ${XRANDR_INCLUDE_DIRS})
--            LINK_LIBRARIES(Xrandr)
-+            LINK_LIBRARIES(${XRANDR_LDFLAGS})
-         ENDIF(OSGVIEWER_USE_XRANDR)
- 
-         # X11 on Apple requires X11 library plus OpenGL linking hack on Leopard