rpms/OpenSceneGraph/devel Makefile, NONE, 1.1 OpenSceneGraph-0.9.9-osgPlugins.diff, NONE, 1.1 OpenSceneGraph-0.9.9-osgTerrain.diff, NONE, 1.1 OpenSceneGraph-0.9.9-revdeb.diff, NONE, 1.1 sources, NONE, 1.1

Ralf Corsépius (corsepiu) fedora-extras-commits at redhat.com
Sun Aug 28 04:38:20 UTC 2005


Author: corsepiu

Update of /cvs/extras/rpms/OpenSceneGraph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5883/devel

Added Files:
	Makefile OpenSceneGraph-0.9.9-osgPlugins.diff 
	OpenSceneGraph-0.9.9-osgTerrain.diff 
	OpenSceneGraph-0.9.9-revdeb.diff sources 
Log Message:
Manual commit, due to cvs-import having failed.


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'
OpenSceneGraph-0.9.9-osgPlugins.diff:

--- NEW FILE OpenSceneGraph-0.9.9-osgPlugins.diff ---
--- OSG_OP_OT-0.9.9.orig/OpenSceneGraph/src/osgPlugins/tiff/GNUmakefile	2005-07-21 16:55:39.000000000 +0200
+++ OSG_OP_OT-0.9.9/OpenSceneGraph/src/osgPlugins/tiff/GNUmakefile	2005-07-21 16:55:39.000000000 +0200
@@ -6,12 +6,7 @@
 
 LIBS  += $(OSG_LIBS) $(TIFF_LIB) $(OTHER_LIBS)
 
-ifeq ($(OS),HP-UX)
 INC     += $(TIFF_INCLUDE)
-else
-INC     += -I/usr/local/include
-LDFLAGS += -L/usr/local/lib
-endif
 
 TARGET_BASENAME = tiff
 include $(TOPDIR)/Make/cygwin_plugin_def
--- OSG_OP_OT-0.9.9.orig/OpenSceneGraph/src/osgPlugins/gif/GNUmakefile	2005-07-21 16:55:22.000000000 +0200
+++ OSG_OP_OT-0.9.9/OpenSceneGraph/src/osgPlugins/gif/GNUmakefile	2005-07-21 16:55:22.000000000 +0200
@@ -5,15 +5,7 @@
 	ReaderWriterGIF.cpp\
 
 
-ifeq ($(OS),HP-UX)
 INC   += $(GIF_INCLUDE)
-else
-INC   += -I/usr/local/include\
-	 -I/usr/freeware/include\
-
-LINKARGS += -L/usr/freeware/lib$(ARCH)
-endif
-
 
 LIBS  += $(OSG_LIBS) $(GIF_LIBS) $(OTHER_LIBS)
 
--- OSG_OP_OT-0.9.9.orig/OpenSceneGraph/src/osgPlugins/png/GNUmakefile	2005-07-21 16:55:02.000000000 +0200
+++ OSG_OP_OT-0.9.9/OpenSceneGraph/src/osgPlugins/png/GNUmakefile	2005-07-21 16:55:02.000000000 +0200
@@ -5,14 +5,7 @@
         ReaderWriterPNG.cpp\
 
 LIBS  += $(OSG_LIBS) $(PNG_LIBS) $(OTHER_LIBS)
-ifneq ($(OS),HP-UX)
-INC  += -I/usr/local/include\
-	-I/usr/freeware/include\
-
-LINKARGS += -L/usr/freeware/lib$(ARCH)
-else
 INC += $(PNG_INCLUDE)
-endif
 
 TARGET_BASENAME = png
 include $(TOPDIR)/Make/cygwin_plugin_def

OpenSceneGraph-0.9.9-osgTerrain.diff:

--- NEW FILE OpenSceneGraph-0.9.9-osgTerrain.diff ---
--- OSG_OP_OT-0.9.9.orig/OpenSceneGraph/Make/makedirdefs	2005-07-21 14:58:49.000000000 +0200
+++ OSG_OP_OT-0.9.9/OpenSceneGraph/Make/makedirdefs	2005-07-21 14:58:49.000000000 +0200
@@ -44,8 +44,11 @@
 	osgUtil\
 	osgDB\
 	osgFX\
-	osgText\
-	osgTerrain\
+	osgText
+ifeq ($(GDAL_INSTALLED),yes)
+WRAPPERS_DIRS += osgTerrain
+endif
+WRAPPERS_DIRS += \
 	osgGA\
 	osgProducer\
 	

OpenSceneGraph-0.9.9-revdeb.diff:

--- NEW FILE OpenSceneGraph-0.9.9-revdeb.diff ---
diff -ur debian.orig/Doxyfile-openscenegraph debian/Doxyfile-openscenegraph
--- openscenegraph-0.9.9.orig/debian/Doxyfile-openscenegraph	2005-07-21 10:26:14.000000000 +0200
+++ openscenegraph-0.9.9/debian/Doxyfile-openscenegraph	2005-07-22 00:48:33.000000000 +0200
@@ -3,7 +3,7 @@
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
-PROJECT_NAME           = openscenegraph
+PROJECT_NAME           = OpenSceneGraph
 PROJECT_NUMBER         = 
 OUTPUT_DIRECTORY       = .
 OUTPUT_LANGUAGE        = English
@@ -92,7 +92,7 @@
 # configuration options related to the HTML output
 #---------------------------------------------------------------------------
 GENERATE_HTML          = YES
-HTML_OUTPUT            = html/openscenegraph
+HTML_OUTPUT            = OpenSceneGraph/html
 HTML_FILE_EXTENSION    = .html
 HTML_HEADER            = 
 HTML_FOOTER            = 
diff -ur debian.orig/Doxyfile-openthreads debian/Doxyfile-openthreads
--- openscenegraph-0.9.9.orig/debian/Doxyfile-openthreads	2005-07-21 10:26:14.000000000 +0200
+++ openscenegraph-0.9.9/debian/Doxyfile-openthreads	2005-07-22 00:49:14.000000000 +0200
@@ -3,7 +3,7 @@
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
-PROJECT_NAME           = openthreads
+PROJECT_NAME           = OpenThreads
 PROJECT_NUMBER         = 
 OUTPUT_DIRECTORY       = .
 OUTPUT_LANGUAGE        = English
@@ -92,7 +92,7 @@
 # configuration options related to the HTML output
 #---------------------------------------------------------------------------
 GENERATE_HTML          = YES
-HTML_OUTPUT            = html/openthreads
+HTML_OUTPUT            = OpenThreads/html
 HTML_FILE_EXTENSION    = .html
 HTML_HEADER            = 
 HTML_FOOTER            = 
diff -ur debian.orig/Doxyfile-producer debian/Doxyfile-producer
--- openscenegraph-0.9.9.orig/debian/Doxyfile-producer	2005-07-21 10:26:14.000000000 +0200
+++ openscenegraph-0.9.9/debian/Doxyfile-producer	2005-07-22 00:48:51.000000000 +0200
@@ -3,7 +3,7 @@
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
-PROJECT_NAME           = producer
+PROJECT_NAME           = Producer
 PROJECT_NUMBER         = 
 OUTPUT_DIRECTORY       = .
 OUTPUT_LANGUAGE        = English
@@ -92,7 +92,7 @@
 # configuration options related to the HTML output
 #---------------------------------------------------------------------------
 GENERATE_HTML          = YES
-HTML_OUTPUT            = html/producer
+HTML_OUTPUT            = Producer/html
 HTML_FILE_EXTENSION    = .html
 HTML_HEADER            = 
 HTML_FOOTER            = 
--- OSG_OP_OT-0.9.9.orig/OpenThreads/Make/makedefs
+++ OSG_OP_OT-0.9.9/OpenThreads/Make/makedefs
@@ -226,7 +226,7 @@
     endif
 
 ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
-    LDFLAGS         += -Wl,-soname -Wl,$@.$(LIB_EXT).1
+    LDFLAGS         += -Wl,-soname -Wl,$@.$(LIB_EXT).$(VERSION_MAJOR)
 endif
 
     ###DEF               += -fPIC
--- OSG_OP_OT-0.9.9.orig/Producer/Make/makedefs
+++ OSG_OP_OT-0.9.9/Producer/Make/makedefs
@@ -249,7 +249,7 @@
     endif
 
 ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
-    LDFLAGS         += -Wl,-soname -Wl,$@.$(LIB_EXT).1
+    LDFLAGS         += -Wl,-soname -Wl,$@.$(LIB_EXT).$(VERSION_MAJOR)
 endif
 
     DEF               += -fPIC -pthread
--- OSG_OP_OT-0.9.9.orig/OpenSceneGraph/Make/makedefs
+++ OSG_OP_OT-0.9.9/OpenSceneGraph/Make/makedefs
@@ -350,7 +350,7 @@
   else
 
 ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
-    LDFLAGS         += -Wl,-soname -Wl,$@.1
+    LDFLAGS         += -Wl,-soname -Wl,$@.$(VERSION_MAJOR)
 endif
 
 #    LDFLAGS         += `getconf LFS_LDFLAGS`


--- NEW FILE sources ---
4aed300dd024609687e8f2e8348409e7  openscenegraph_0.9.9-5.diff.gz
711773db3874320967091327473dbc31  OSG_OP_OT-0.9.9.zip




More information about the fedora-extras-commits mailing list