the patch for osg 2.0

patch_2.0_debug_pkgconfig.patch (text/plain), 6.95 KB, created by Cedric Pinson on 2007-06-29 15:10:49 UTC

diff -r f3881ded613b -r 08d9d5601265 CMakeLists.txt
--- a/CMakeLists.txt	Fri Jun 22 00:11:31 2007 +0200
+++ b/CMakeLists.txt	Fri Jun 22 00:23:39 2007 +0200
@@ -17,11 +17,17 @@ SET(OPENSCENEGRAPH_MAJOR_VERSION 2)
 SET(OPENSCENEGRAPH_MAJOR_VERSION 2)
 SET(OPENSCENEGRAPH_MINOR_VERSION 0)
 SET(OPENSCENEGRAPH_PATCH_VERSION 0)
+IF(NOT DEFINED OPENSCENEGRAPH_SOVERSION)
 SET(OPENSCENEGRAPH_SOVERSION 11)
-
+ENDIF(NOT DEFINED OPENSCENEGRAPH_SOVERSION)
+
+IF(NOT DEFINED OPENSCENEGRAPH_VERSION)
 SET(OPENSCENEGRAPH_VERSION ${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION}.${OPENSCENEGRAPH_PATCH_VERSION})
-
+ENDIF(NOT DEFINED OPENSCENEGRAPH_VERSION)
+
+IF(NOT DEFINED OSG_PLUGINS)
 SET(OSG_PLUGINS osgPlugins-${OPENSCENEGRAPH_VERSION})
+ENDIF(NOT DEFINED OSG_PLUGINS)
 
 # We want to build SONAMES shared librariess
 SET(OPENSCENEGRAPH_SONAMES TRUE)
@@ -196,7 +202,7 @@ ENDIF("${CMAKE_SOURCE_DIR}" STREQUAL "${
 ################################################################################
 # Installation stuff
 
-SET(CMAKE_DEBUG_POSTFIX  "d")
+SET(CMAKE_DEBUG_POSTFIX  "")
 
 IF(UNIX AND NOT WIN32 AND NOT APPLE)
   IF(CMAKE_SIZEOF_VOID_P MATCHES "8")
diff -r f3881ded613b -r 08d9d5601265 CMakeModules/OsgMacroUtils.cmake
--- a/CMakeModules/OsgMacroUtils.cmake	Fri Jun 22 00:11:31 2007 +0200
+++ b/CMakeModules/OsgMacroUtils.cmake	Fri Jun 22 00:23:39 2007 +0200
@@ -126,7 +126,11 @@ MACRO(SETUP_PLUGIN PLUGIN_NAME)
         SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES DEBUG_POSTFIX "")
     ENDIF(NOT MSVC)
     SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PROJECT_LABEL "${TARGET_LABEL}")
- 
+
+    IF(OPENSCENEGRAPH_SONAMES)
+      SET_TARGET_PROPERTIES(${CORELIB_NAME} PROPERTIES VERSION ${OPENSCENEGRAPH_VERSION} SOVERSION ${OPENSCENEGRAPH_SOVERSION})
+    ENDIF(OPENSCENEGRAPH_SONAMES)
+
     SETUP_LINK_LIBRARIES()
 
 #the installation path are differentiated for win32 that install in bib versus other architecture that install in lib${LIB_POSTFIX}/${OSG_PLUGINS}
@@ -187,7 +191,7 @@ MACRO(SETUP_EXE IS_COMMANDLINE_APP)
         
     ENDIF(${IS_COMMANDLINE_APP})
     SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PROJECT_LABEL "${TARGET_LABEL}")
-    SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
+    SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}")
     SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES OUTPUT_NAME ${TARGET_NAME})
     
     SETUP_LINK_LIBRARIES()    
diff -r f3881ded613b -r 08d9d5601265 debian/openscenegraph.pc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/openscenegraph.pc	Fri Jun 22 00:23:39 2007 +0200
@@ -0,0 +1,14 @@
+# pkg-config source file
+
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: openscenegraph
+Description: 3D scenegraph
+Version: 2.0.0
+Requires: openthreads
+Conflicts:
+Libs: -L${libdir} -losg -losgDB -losgFX -losgGA -losgParticle -losgSim -losgText -losgUtil -losgViewer
+Cflags: -I${includedir}
diff -r f3881ded613b -r 08d9d5601265 debian/openthreads.pc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/openthreads.pc	Fri Jun 22 00:23:39 2007 +0200
@@ -0,0 +1,14 @@
+# pkg-config source file
+
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: openthreads
+Description: Object-Oriented (OO) thread interface for C++ programmers
+Version: 2.0.0
+Requires:
+Conflicts:
+Libs: -L${libdir} -lOpenThreads
+Cflags: -I${includedir}
diff -r f3881ded613b -r 08d9d5601265 src/OpenThreads/CMakeLists.txt
--- a/src/OpenThreads/CMakeLists.txt	Fri Jun 22 00:11:31 2007 +0200
+++ b/src/OpenThreads/CMakeLists.txt	Fri Jun 22 00:23:39 2007 +0200
@@ -5,9 +5,13 @@ SET(OPENTHREADS_MAJOR_VERSION 1)
 SET(OPENTHREADS_MAJOR_VERSION 1)
 SET(OPENTHREADS_MINOR_VERSION 9)
 SET(OPENTHREADS_PATCH_VERSION 5)
+IF(NOT DEFINED OPENTHREADS_SOVERSION)
 SET(OPENTHREADS_SOVERSION 7)
+ENDIF(NOT DEFINED OPENTHREADS_SOVERSION)
 
+IF(NOT DEFINED OPENTHREADS_VERSION)
 SET(OPENTHREADS_VERSION ${OPENTHREADS_MAJOR_VERSION}.${OPENTHREADS_MINOR_VERSION}.${OPENTHREADS_PATCH_VERSION})
+ENDIF(NOT DEFINED OPENTHREADS_VERSION)
 
 SET(HEADER_PATH ${OpenThreads_SOURCE_DIR}/include/OpenThreads)
 SET(OpenThreads_PUBLIC_HEADERS
diff -r f3881ded613b -r 08d9d5601265 src/OpenThreads/pthreads/CMakeLists.txt
--- a/src/OpenThreads/pthreads/CMakeLists.txt	Fri Jun 22 00:11:31 2007 +0200
+++ b/src/OpenThreads/pthreads/CMakeLists.txt	Fri Jun 22 00:23:39 2007 +0200
@@ -16,10 +16,6 @@ ADD_LIBRARY(${LIB_NAME}
 	PThreadPrivateData.h
 )
 
-IF(OPENTHREADS_SONAMES)
-  SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES VERSION ${OPENTHREADS_VERSION} SOVERSION ${OPENTHREADS_SOVERSION})
-ENDIF(OPENTHREADS_SONAMES)
-
 TARGET_LINK_LIBRARIES(${LIB_NAME}
 	${CMAKE_THREAD_LIBS_INIT}
 )
@@ -30,6 +26,10 @@ LINK_DIRECTORIES(
 LINK_DIRECTORIES(
 	${CMAKE_CURRENT_BINARY_DIR}
 )
+
+IF(OPENTHREADS_SONAMES)
+  SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES VERSION ${OPENTHREADS_VERSION} SOVERSION ${OPENTHREADS_SOVERSION})
+ENDIF(OPENTHREADS_SONAMES)
 
 INSTALL(
 	TARGETS OpenThreads
diff -r f3881ded613b -r 08d9d5601265 src/OpenThreads/pthreads/PThread.c++
--- a/src/OpenThreads/pthreads/PThread.c++	Fri Jun 22 00:11:31 2007 +0200
+++ b/src/OpenThreads/pthreads/PThread.c++	Fri Jun 22 00:23:39 2007 +0200
@@ -572,27 +572,18 @@ int Thread::start() {
 
     PThreadPrivateData *pd = static_cast<PThreadPrivateData *> (_prvData);
 
-    size_t defaultStackSize;
+    size_t defaultStackSize = 0;
     pthread_attr_getstacksize( &thread_attr, &defaultStackSize);
-    if(status != 0) {
-	return status;
-    }
 
     if(defaultStackSize < pd->stackSize) {
 
 	pthread_attr_setstacksize( &thread_attr, pd->stackSize);
-	if(status != 0) {
-	    return status;
-	}
     }
 
     //-------------------------------------------------------------------------
     // Now get what we actually have...
     //
     pthread_attr_getstacksize( &thread_attr, &defaultStackSize);
-    if(status != 0) {
-	return status;
-    }
 
     pd->stackSize = defaultStackSize;
 
diff -r f3881ded613b -r 08d9d5601265 src/OpenThreads/pthreads/PThreadPrivateData.h
--- a/src/OpenThreads/pthreads/PThreadPrivateData.h	Fri Jun 22 00:11:31 2007 +0200
+++ b/src/OpenThreads/pthreads/PThreadPrivateData.h	Fri Jun 22 00:23:39 2007 +0200
@@ -39,7 +39,7 @@ class PThreadPrivateData {
 
 private:
 
-    PThreadPrivateData() {};
+    PThreadPrivateData() : stackSize(0), stackSizeLocked(false), isRunning(false), isCanceled(false), idSet(false), tid(0), uniqueId(0), cpunum(0) {};
 
     virtual ~PThreadPrivateData() {};
 
diff -r f3881ded613b -r 08d9d5601265 src/osgGA/CMakeLists.txt
--- a/src/osgGA/CMakeLists.txt	Fri Jun 22 00:11:31 2007 +0200
+++ b/src/osgGA/CMakeLists.txt	Fri Jun 22 00:23:39 2007 +0200
@@ -57,4 +57,8 @@ LINK_INTERNAL(${LIB_NAME}
 
 LINK_CORELIB_DEFAULT(${LIB_NAME})
 
+IF(OPENSCENEGRAPH_SONAMES)
+  SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES VERSION ${OPENSCENEGRAPH_VERSION} SOVERSION ${OPENSCENEGRAPH_SOVERSION})
+ENDIF(OPENSCENEGRAPH_SONAMES)
+
 INCLUDE(ModuleInstall OPTIONAL)