rpms/OpenSceneGraph/devel OpenSceneGraph-1.1.diff,NONE,1.1
Ralf Corsépius (corsepiu)
fedora-extras-commits at redhat.com
Thu Aug 24 13:09:55 UTC 2006
Author: corsepiu
Update of /cvs/extras/rpms/OpenSceneGraph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25075
Added Files:
OpenSceneGraph-1.1.diff
Log Message:
New.
OpenSceneGraph-1.1.diff:
--- NEW FILE OpenSceneGraph-1.1.diff ---
diff -uNr OSG_OP_OT-1.1.orig/debian/Doxyfile-openscenegraph OSG_OP_OT-1.1/debian/Doxyfile-openscenegraph
--- OSG_OP_OT-1.1.orig/debian/Doxyfile-openscenegraph 1970-01-01 01:00:00.000000000 +0100
+++ OSG_OP_OT-1.1/debian/Doxyfile-openscenegraph 2006-08-24 04:55:38.000000000 +0200
@@ -0,0 +1,205 @@
+# Doxyfile 1.3.4
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+PROJECT_NAME = OpenSceneGraph
+PROJECT_NUMBER =
+OUTPUT_DIRECTORY = .
+OUTPUT_LANGUAGE = English
+USE_WINDOWS_ENCODING = NO
+BRIEF_MEMBER_DESC = YES
+REPEAT_BRIEF = YES
+ALWAYS_DETAILED_SEC = NO
+INLINE_INHERITED_MEMB = NO
+FULL_PATH_NAMES = NO
+STRIP_FROM_PATH =
+SHORT_NAMES = NO
+JAVADOC_AUTOBRIEF = NO
+MULTILINE_CPP_IS_BRIEF = NO
+DETAILS_AT_TOP = NO
+INHERIT_DOCS = YES
+DISTRIBUTE_GROUP_DOC = NO
+TAB_SIZE = 8
+ALIASES =
+OPTIMIZE_OUTPUT_FOR_C = NO
+OPTIMIZE_OUTPUT_JAVA = NO
+SUBGROUPING = YES
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+EXTRACT_ALL = YES
+EXTRACT_PRIVATE = NO
+EXTRACT_STATIC = NO
+EXTRACT_LOCAL_CLASSES = YES
+HIDE_UNDOC_MEMBERS = NO
+HIDE_UNDOC_CLASSES = NO
+HIDE_FRIEND_COMPOUNDS = NO
+HIDE_IN_BODY_DOCS = NO
+INTERNAL_DOCS = NO
+CASE_SENSE_NAMES = YES
+HIDE_SCOPE_NAMES = NO
+SHOW_INCLUDE_FILES = YES
+INLINE_INFO = YES
+SORT_MEMBER_DOCS = YES
+GENERATE_TODOLIST = YES
+GENERATE_TESTLIST = YES
+GENERATE_BUGLIST = YES
+GENERATE_DEPRECATEDLIST= YES
+ENABLED_SECTIONS =
+MAX_INITIALIZER_LINES = 30
+SHOW_USED_FILES = YES
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+QUIET = YES
+WARNINGS = NO
+WARN_IF_UNDOCUMENTED = NO
+WARN_IF_DOC_ERROR = NO
+WARN_FORMAT = "$file:$line: $text"
+WARN_LOGFILE =
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+INPUT = OpenSceneGraph/include
+FILE_PATTERNS = *
+RECURSIVE = YES
+EXCLUDE =
+EXCLUDE_SYMLINKS = NO
+EXCLUDE_PATTERNS =
+EXAMPLE_PATH =
+EXAMPLE_PATTERNS =
+EXAMPLE_RECURSIVE = NO
+IMAGE_PATH =
+INPUT_FILTER =
+FILTER_SOURCE_FILES = NO
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+SOURCE_BROWSER = NO
+INLINE_SOURCES = NO
+STRIP_CODE_COMMENTS = YES
+REFERENCED_BY_RELATION = YES
+REFERENCES_RELATION = YES
+VERBATIM_HEADERS = YES
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+ALPHABETICAL_INDEX = NO
+COLS_IN_ALPHA_INDEX = 5
+IGNORE_PREFIX =
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+GENERATE_HTML = YES
+HTML_OUTPUT = OpenSceneGraph/html
+HTML_FILE_EXTENSION = .html
+HTML_HEADER =
+HTML_FOOTER =
+HTML_STYLESHEET =
+HTML_ALIGN_MEMBERS = YES
+GENERATE_HTMLHELP = NO
+CHM_FILE =
+HHC_LOCATION =
+GENERATE_CHI = NO
+BINARY_TOC = NO
+TOC_EXPAND = NO
+DISABLE_INDEX = NO
+ENUM_VALUES_PER_LINE = 4
+GENERATE_TREEVIEW = NO
+TREEVIEW_WIDTH = 250
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+GENERATE_LATEX = NO
+LATEX_OUTPUT = latex
+LATEX_CMD_NAME = latex
+MAKEINDEX_CMD_NAME = makeindex
+COMPACT_LATEX = NO
+PAPER_TYPE = a4wide
+EXTRA_PACKAGES =
+LATEX_HEADER =
+PDF_HYPERLINKS = NO
+USE_PDFLATEX = NO
+LATEX_BATCHMODE = NO
+LATEX_HIDE_INDICES = NO
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+GENERATE_RTF = NO
+RTF_OUTPUT = rtf
+COMPACT_RTF = NO
+RTF_HYPERLINKS = NO
+RTF_STYLESHEET_FILE =
+RTF_EXTENSIONS_FILE =
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+GENERATE_MAN = NO
+MAN_OUTPUT = man
+MAN_EXTENSION = .3
+MAN_LINKS = NO
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+GENERATE_XML = NO
+XML_OUTPUT = xml
+XML_SCHEMA =
+XML_DTD =
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+GENERATE_AUTOGEN_DEF = NO
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+GENERATE_PERLMOD = NO
+PERLMOD_LATEX = NO
+PERLMOD_PRETTY = YES
+PERLMOD_MAKEVAR_PREFIX =
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+ENABLE_PREPROCESSING = YES
+MACRO_EXPANSION = NO
+EXPAND_ONLY_PREDEF = NO
+SEARCH_INCLUDES = YES
+INCLUDE_PATH =
+INCLUDE_FILE_PATTERNS =
+PREDEFINED =
+EXPAND_AS_DEFINED =
+SKIP_FUNCTION_MACROS = YES
+#---------------------------------------------------------------------------
+# Configuration::addtions related to external references
+#---------------------------------------------------------------------------
+TAGFILES =
+GENERATE_TAGFILE =
+ALLEXTERNALS = NO
+EXTERNAL_GROUPS = YES
+PERL_PATH = /usr/bin/perl
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+CLASS_DIAGRAMS = YES
+HIDE_UNDOC_RELATIONS = YES
+HAVE_DOT = NO
+CLASS_GRAPH = YES
+COLLABORATION_GRAPH = YES
+UML_LOOK = NO
+TEMPLATE_RELATIONS = NO
+INCLUDE_GRAPH = YES
+INCLUDED_BY_GRAPH = YES
+CALL_GRAPH = NO
+GRAPHICAL_HIERARCHY = YES
+DOT_IMAGE_FORMAT = png
+DOT_PATH =
[...1627 lines suppressed...]
+ ARCH = 32
+ ARCHARGS =
+ LINKARGS = -L/usr/X11R6/lib -framework Carbon
+ LIB_EXT = dylib
+endif
+
+#### Cygwin/Mingw specific definitions
+ifeq ($(OS),CYGWIN)
+ CXX = c++
+ DEPARG = -M
+ INC += -DWIN32
+ DEF += -DWIN32 -Wall -DOPENTHREADS_EXPORTS
+ OPTF = -O2
+ DBGF = -g
+ SHARED = -shared \
+ -Wl,--out-implib,lib$(TARGET_BASENAME).dll.a \
+ -Wl,--export-all-symbols
+
+ EXE_EXT =.exe
+ ARCH = 32
+ ARCHARGS =
+ LINKARGS = -W -Wall
+ DYNAMICLIBRARYLIB =
+
+ GL_LIBS = -lglu32 -lopengl32
+ X_LIBS = -lgdi32 -luser32
+ SOCKET_LIBS =
+ OTHER_LIBS = $(GL_LIBS)
+
+ PTHREAD_LIB = -lpthread
+
+ LIBINST = bin/$(OS)$(ARCH)
+ IMP_LIBINST = lib/$(OS)$(ARCH)
+
+ LIB_PREFIX = cyg
+ LIB_EXT = dll
+ IMP_LIB_EXT = dll.a
+ LINK = cp -f
+
+ INST_LOCATION = /usr/local/OpenThreads
+ INST_INCLUDE = $(INST_LOCATION)/include
+ INST_SHARE_PREFIX = $(INST_LOCATION)
+ INST_SRC = $(INST_SHARE_PREFIX)/src
+ INST_EXAMPLES = $(INST_SHARE_PREFIX)/bin
+ INST_EXAMPLE_SRC = $(INST_SHARE_PREFIX)/src/demos
+ INST_DOC = $(INST_SHARE_PREFIX)/doc
+ INST_DATA = $(INST_SHARE_PREFIX)/data
+ MAKEDIST = $(TOPDIR)/Make/makeinnosetup
+
+endif
+
+#### Cygwin/Mingw specific definitions
+ifeq ($(OS),MINGW)
+ CXX = c++ -mthreads
+
+ DEPARG = -M
+ INC +=
+ DEF += -DWIN32 -Wall -DOPENTHREADS_EXPORTS
+ OPTF = -O2
+ DBGF = -g
+ SHARED = -shared -mthreads \
+ -Wl,--export-all-symbols \
+ -Wl,--output-def,lib$(TARGET_BASENAME).def \
+ -Wl,--out-implib,lib$(TARGET_BASENAME).dll.a \
+
+ EXE_EXT =.exe
+ ARCH = 32
+ ARCHARGS =
+ LINKARGS = -W -Wall
+ DYNAMICLIBRARYLIB =
+
+ GL_LIBS = -lglu32 -lopengl32
+ X_LIBS = -lgdi32 -luser32
+ SOCKET_LIBS =
+ OTHER_LIBS = $(GL_LIBS) -lwinmm
+ PTHREAD_LIB =
+ OPEN_THREAD_LIB = -lOpenThreadsWin32
+
+ LIBINST = bin/$(OS)$(ARCH)
+ IMP_LIBINST = lib/$(OS)$(ARCH)
+
+ LIB_PREFIX = lib
+ LIB_EXT = dll
+ IMP_LIB_EXT = dll.a
+ PLUGIN_EXT = dll
+
+ LINK = cp -f
+
+ INST_LOCATION = /usr/local/OpenThreads
+ INST_LIBS = $(INST_LOCATION)/bin
+ INST_IMP_LIBS = $(INST_LOCATION)/lib
+ INST_INCLUDE = $(INST_LOCATION)/include
+ INST_SHARE = $(INST_LOCATION)
+ INST_DEMOS = $(INST_SHARE)/bin
+ INST_DEMO_SRC = $(INST_SHARE)/src/demos
+ INST_DOC = $(INST_SHARE)/doc
+ INST_DATA = $(INST_SHARE)/data
+ MAKEDIST = $(TOPDIR)/Make/makeinnosetup
+endif
+
+#### HP-UX Specific definitions
+
+ifeq ($(OS),HP-UX)
+ CXX = aCC -AA -mt
+ DEPARG = -w +make -E
+ INC +=
+ DEF += +Z -z
+ OPTF = +O2
+ DBGF = -g
+ SHARED = +Z -b -z -Wl,+s
+ ARCH = 32
+ LDFLAGS =
+ LINKARGS = -lpthread
+ LIB_EXT = sl
+ PLUGIN_EXT = sl
+ DYNAMICLIBRARYLIB = -ldld
+ OTHER_LIBS = -lm
+endif
+
+
+VPATH=..
+
diff -uNr OSG_OP_OT-1.1.orig/OpenThreads/pthread_src/PThread.c++ OSG_OP_OT-1.1/OpenThreads/pthread_src/PThread.c++
--- OSG_OP_OT-1.1.orig/OpenThreads/pthread_src/PThread.c++ 2005-05-20 23:11:42.000000000 +0200
+++ OSG_OP_OT-1.1/OpenThreads/pthread_src/PThread.c++ 2006-08-24 04:55:38.000000000 +0200
@@ -529,27 +529,18 @@
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 -uNr OSG_OP_OT-1.1.orig/OpenThreads/pthread_src/PThreadPrivateData.h OSG_OP_OT-1.1/OpenThreads/pthread_src/PThreadPrivateData.h
--- OSG_OP_OT-1.1.orig/OpenThreads/pthread_src/PThreadPrivateData.h 2004-08-27 18:45:14.000000000 +0200
+++ OSG_OP_OT-1.1/OpenThreads/pthread_src/PThreadPrivateData.h 2006-08-24 04:55:38.000000000 +0200
@@ -43,7 +43,7 @@
private:
- PThreadPrivateData() {};
+ PThreadPrivateData() : stackSize(0), stackSizeLocked(false), isRunning(false), isCanceled(false), idSet(false), tid(0), uniqueId(0), cpunum(0) {};
virtual ~PThreadPrivateData() {};
diff -uNr OSG_OP_OT-1.1.orig/Producer/include/Producer/Keyboard OSG_OP_OT-1.1/Producer/include/Producer/Keyboard
--- OSG_OP_OT-1.1.orig/Producer/include/Producer/Keyboard 2005-10-28 22:53:43.000000000 +0200
+++ OSG_OP_OT-1.1/Producer/include/Producer/Keyboard 2006-08-24 04:55:38.000000000 +0200
@@ -539,6 +539,7 @@
KeyboardKey _key;
};
+class KeyboardMouseImplementation;
class PR_EXPORT Keyboard : public Producer::Referenced
{
diff -uNr OSG_OP_OT-1.1.orig/Producer/Make/libdefs OSG_OP_OT-1.1/Producer/Make/libdefs
--- OSG_OP_OT-1.1.orig/Producer/Make/libdefs 1970-01-01 01:00:00.000000000 +0100
+++ OSG_OP_OT-1.1/Producer/Make/libdefs 2006-08-24 04:55:38.000000000 +0200
@@ -0,0 +1,4 @@
+ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
+ LDFLAGS += -Wl,-soname -Wl,$@.$(LIB_EXT).$(VERSION_MAJOR)
+endif
+
diff -uNr OSG_OP_OT-1.1.orig/Producer/Make/makedefs OSG_OP_OT-1.1/Producer/Make/makedefs
--- OSG_OP_OT-1.1.orig/Producer/Make/makedefs 2006-07-18 15:26:22.000000000 +0200
+++ OSG_OP_OT-1.1/Producer/Make/makedefs 2006-08-24 04:55:38.000000000 +0200
@@ -248,11 +248,6 @@
ifeq (x$(CXX),x)
CXX = g++
endif
-
-ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
- LDFLAGS += -Wl,-soname -Wl,$@.$(LIB_EXT).0
-endif
-
DEF += -fPIC -pthread
OPTF = -O2
DBGF = -ggdb -gstabs
More information about the fedora-extras-commits
mailing list