diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-07-07 23:14:30 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-07-07 23:14:30 +0800 |
| commit | 77c108d771fb5f106fc51a1b179b75aaddd1329e (patch) | |
| tree | feb01d8c8c99efb652f8f26edabf419446ca51b7 /graphics/osg-devel/files | |
| parent | 90ac1ba1901df3dda37d47369cfc4ae7b592c564 (diff) | |
| download | marcuscom-ports-77c108d771fb5f106fc51a1b179b75aaddd1329e.tar marcuscom-ports-77c108d771fb5f106fc51a1b179b75aaddd1329e.tar.gz marcuscom-ports-77c108d771fb5f106fc51a1b179b75aaddd1329e.tar.bz2 marcuscom-ports-77c108d771fb5f106fc51a1b179b75aaddd1329e.tar.lz marcuscom-ports-77c108d771fb5f106fc51a1b179b75aaddd1329e.tar.xz marcuscom-ports-77c108d771fb5f106fc51a1b179b75aaddd1329e.tar.zst marcuscom-ports-77c108d771fb5f106fc51a1b179b75aaddd1329e.zip | |
Chase poppler and poppler-glib shlib dump.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14305 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'graphics/osg-devel/files')
3 files changed, 65 insertions, 0 deletions
diff --git a/graphics/osg-devel/files/patch-CMakeLists.txt b/graphics/osg-devel/files/patch-CMakeLists.txt new file mode 100644 index 000000000..d47608af1 --- /dev/null +++ b/graphics/osg-devel/files/patch-CMakeLists.txt @@ -0,0 +1,20 @@ +--- CMakeLists.txt.orig 2009-05-22 12:31:58.000000000 +0400 ++++ CMakeLists.txt 2009-06-25 17:51:06.000000000 +0400 +@@ -486,7 +486,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() + ENDIF() +@@ -822,7 +822,7 @@ + ${PROJECT_BINARY_DIR}/packaging/pkgconfig/${PKGCONFIG_FILE}.pc + @ONLY + ) +- INSTALL(FILES ${PROJECT_BINARY_DIR}/packaging/pkgconfig/${PKGCONFIG_FILE}.pc DESTINATION lib${LIB_POSTFIX}/pkgconfig COMPONENT libopenscenegraph-dev) ++ INSTALL(FILES ${PROJECT_BINARY_DIR}/packaging/pkgconfig/${PKGCONFIG_FILE}.pc DESTINATION libdata/pkgconfig COMPONENT libopenscenegraph-dev) + ENDFOREACH(PKGCONFIG_FILE) + + diff --git a/graphics/osg-devel/files/patch-src-OpenThreads-CMakeLists.txt b/graphics/osg-devel/files/patch-src-OpenThreads-CMakeLists.txt new file mode 100644 index 000000000..675ef5a72 --- /dev/null +++ b/graphics/osg-devel/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-devel/files/patch-src-OpenThreads-pthreads-PThread.c++ b/graphics/osg-devel/files/patch-src-OpenThreads-pthreads-PThread.c++ new file mode 100644 index 000000000..1991714a0 --- /dev/null +++ b/graphics/osg-devel/files/patch-src-OpenThreads-pthreads-PThread.c++ @@ -0,0 +1,37 @@ +--- src/OpenThreads/pthreads/PThread.c++.orig 2009-11-20 13:27:43.000000000 +0300 ++++ src/OpenThreads/pthreads/PThread.c++ 2009-12-15 20:26:51.000000000 +0300 +@@ -21,6 +21,7 @@ + #include <sys/types.h> + #include <unistd.h> + #include <pthread.h> ++#include <pthread_np.h> + #include <limits.h> + + #if defined __linux || defined __sun || defined __APPLE__ +@@ -123,7 +124,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 ); + +@@ -539,7 +540,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) +@@ -969,7 +970,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 ); + |