Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 118048 Details for
Bug 91526
OSG-OpenSceneGraph (new ebuild)
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
patch makefile and openscenegraph.pc
01.dpatch (text/plain), 11.49 KB, created by
Cedric Pinson
on 2007-05-03 14:18:09 UTC
(
hide
)
Description:
patch makefile and openscenegraph.pc
Filename:
MIME Type:
Creator:
Cedric Pinson
Created:
2007-05-03 14:18:09 UTC
Size:
11.49 KB
patch
obsolete
>#! /bin/sh /usr/share/dpatch/dpatch-run > >@DPATCH@ >Index: OpenSceneGraph/Make/instexamplesrc >=================================================================== >RCS file: /cvs/underware/osg/OpenSceneGraph/Make/instexamplesrc,v >retrieving revision 1.1.1.1 >diff -b -B -u -r1.1.1.1 instexamplesrc >--- osg.orig/OpenSceneGraph/Make/instexamplesrc 4 Jan 2006 14:46:20 -0000 1.1.1.1 >+++ osg/OpenSceneGraph/Make/instexamplesrc 6 Jan 2006 13:36:16 -0000 >@@ -32,7 +32,7 @@ > cd $TOPDIR/examples/$d > [ -d $INST_EXAMPLE_SRC/$d ] || mkdir -m 0755 -p $INST_EXAMPLE_SRC/$d > echo " installing $d" >- for f in `$MAKE __instfiles | grep -v $MAKE` >+ for f in `$MAKE __instfiles | grep -v $MAKE | grep -v Entering | grep -v Leaving` > do > src=`echo $f | cut -f1 -d"="` > dst=`echo $f | cut -f2 -d"="` >Index: OpenSceneGraph/Make/makedefs >=================================================================== >RCS file: /cvs/underware/osg/OpenSceneGraph/Make/makedefs,v >retrieving revision 1.1.1.1 >diff -b -B -u -r1.1.1.1 makedefs >--- osg.orig/OpenSceneGraph/Make/makedefs 4 Jan 2006 14:46:20 -0000 1.1.1.1 >+++ osg/OpenSceneGraph/Make/makedefs 6 Jan 2006 13:36:16 -0000 >@@ -171,7 +171,7 @@ > ARCH = 32 > ifeq ($(ARCH),64) > ARCHARGS = -m64 -DARCH64 >- ARCHINST = 64 >+ ARCHINST = > else > ARCHARGS = > endif >@@ -193,7 +193,7 @@ > ARCH = 32 > ifeq ($(ARCH),64) > ARCHARGS = -xarch=v9 -DARCH64 >- ARCHINST = 64 >+ ARCHINST = > else > ARCHARGS = > ARCHINST = >@@ -255,15 +255,15 @@ > ARCH = 32 > ifeq ($(ARCH),64) > ARCHARGS = -64 -DARCH64 >- ARCHINST = 64 >- LINKARGS += -L/usr/freeware/lib64 >- PF_XTRA_LIBS = -L/usr/lib64/libpfdb -rpath /usr/lib64/libpfdb \ >+ ARCHINST = >+ LINKARGS += -L/usr/freeware/lib >+ PF_XTRA_LIBS = -L/usr/lib/libpfdb -rpath /usr/lib/libpfdb \ > $(PFLIBS) > else > ARCHARGS = -n32 > ARCHINST = 32 >- LINKARGS += -L/usr/freeware/lib32 >- PF_XTRA_LIBS = -L/usr/lib32/libpfdb -rpath /usr/lib32/libpfdb \ >+ LINKARGS += -L/usr/freeware/lib >+ PF_XTRA_LIBS = -L/usr/lib/libpfdb -rpath /usr/lib/libpfdb \ > $(PFLIBS) > endif > else >@@ -284,15 +284,15 @@ > ARCH = 32 > ifeq ($(ARCH),64) > ARCHARGS = -mabi=64 -mips4 -DARCH64 >- ARCHINST = 64 >- LINKARGS += -L/usr/freeware/lib64 >- PF_XTRA_LIBS = -L/usr/lib64/libpfdb -rpath /usr/lib64/libpfdb \ >+ ARCHINST = >+ LINKARGS += -L/usr/freeware/lib >+ PF_XTRA_LIBS = -L/usr/lib/libpfdb -rpath /usr/lib/libpfdb \ > $(PFLIBS) > else > ARCHARGS = -mabi=n32 -mips4 >- ARCHINST = 32 >- LINKARGS += -L/usr/freeware/lib32 >- PF_XTRA_LIBS = -L/usr/lib32/libpfdb -rpath /usr/lib32/libpfdb \ >+ ARCHINST = >+ LINKARGS += -L/usr/freeware/lib >+ PF_XTRA_LIBS = -L/usr/lib/libpfdb -rpath /usr/lib/libpfdb \ > $(PFLIBS) > endif > endif >@@ -354,7 +353,7 @@ > else > > ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES") >- LDFLAGS += -Wl,-soname -Wl,$@.0 >+ LDFLAGS += -Wl,-soname -Wl,$@.4 > endif > > # LDFLAGS += `getconf LFS_LDFLAGS` >@@ -368,7 +367,7 @@ > ifeq ($(SYSARCH),x86_64) > ARCHARGS = > ARCH = 64 >- ARCHINST = 64 >+ ARCHINST = > else > ARCHARGS = > ARCH = 32 >@@ -378,7 +377,7 @@ > > SHARED = -shared > ifeq ($(SYSARCH),x86_64) >- LINKARGS = -L/usr/X11R6/lib64 >+ LINKARGS = -L/usr/X11R6/lib > else > LINKARGS = -L/usr/X11R6/lib > endif >Index: OpenSceneGraph/Make/openscenegraph.pc >=================================================================== >RCS file: /cvs/underware/osg/OpenSceneGraph/Make/openscenegraph.pc,v >retrieving revision 1.1.1.1 >diff -b -B -u -r1.1.1.1 openscenegraph.pc >--- osg.orig/OpenSceneGraph/Make/openscenegraph.pc 4 Jan 2006 14:46:20 -0000 1.1.1.1 >+++ osg/OpenSceneGraph/Make/openscenegraph.pc 6 Jan 2006 13:36:17 -0000 >@@ -7,7 +7,7 @@ > > Name: openscenegraph > Description: 3D scenegraph >-Version: 1.0,0 >+Version: 1.2.0 > Requires: openthreads > Conflicts: > Libs: -L${libdir} -losg -losgDB -losgFX -losgGA -losgParticle -losgProducer -losgSim -losgText -losgUtil >Index: OpenSceneGraph/include/osg/Shader >=================================================================== >RCS file: /cvs/underware/osg/OpenSceneGraph/include/osg/Shader,v >retrieving revision 1.1.1.1 >diff -b -B -u -r1.1.1.1 Shader >--- osg.orig/OpenSceneGraph/include/osg/Shader 4 Jan 2006 14:47:51 -0000 1.1.1.1 >+++ osg/OpenSceneGraph/include/osg/Shader 6 Jan 2006 13:36:19 -0000 >@@ -39,6 +39,8 @@ > * configuration. > */ > >+class Program; >+ > class OSG_EXPORT Shader : public osg::Object > { > public: >Index: OpenThreads/Make/makedefs >=================================================================== >RCS file: /cvs/underware/osg/OpenThreads/Make/makedefs,v >retrieving revision 1.1.1.1 >diff -b -B -u -r1.1.1.1 makedefs >--- osg.orig/OpenThreads/Make/makedefs 4 Jan 2006 14:43:34 -0000 1.1.1.1 >+++ osg/OpenThreads/Make/makedefs 6 Jan 2006 13:36:21 -0000 >@@ -228,7 +228,7 @@ > endif > > ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES") >- LDFLAGS += -Wl,-soname -Wl,$@.$(LIB_EXT).0 >+ LDFLAGS += -Wl,-soname -Wl,$@.$(LIB_EXT).4 > endif > > ###DEF += -fPIC >@@ -251,7 +251,7 @@ > SHARED = -shared > ARCHARGS = > ifeq ($(SYSARCH),x86_64) >- LINKARGS = -L/usr/X11R6/lib64 >+ LINKARGS = -L/usr/X11R6/lib > else > LINKARGS = -L/usr/X11R6/lib > endif >Index: OpenThreads/Make/openthreads.pc >=================================================================== >RCS file: /cvs/underware/osg/OpenThreads/Make/openthreads.pc,v >retrieving revision 1.1.1.1 >diff -b -B -u -r1.1.1.1 openthreads.pc >--- osg.orig/OpenThreads/Make/openthreads.pc 4 Jan 2006 14:43:34 -0000 1.1.1.1 >+++ osg/OpenThreads/Make/openthreads.pc 6 Jan 2006 13:36:21 -0000 >@@ -7,7 +7,7 @@ > > Name: openthreads > Description: Object-Oriented (OO) thread interface for C++ programmers >-Version: 1.5 >+Version: 1.2.0 > Requires: > Conflicts: > Libs: -L${libdir} -lOpenThreads >Index: OpenThreads/examples_src/workcrew/GNUmakefile >=================================================================== >RCS file: /cvs/underware/osg/OpenThreads/examples_src/workcrew/GNUmakefile,v >retrieving revision 1.1.1.1 >diff -b -B -u -r1.1.1.1 GNUmakefile >--- osg.orig/OpenThreads/examples_src/workcrew/GNUmakefile 4 Jan 2006 14:43:36 -0000 1.1.1.1 >+++ osg/OpenThreads/examples_src/workcrew/GNUmakefile 6 Jan 2006 13:36:21 -0000 >@@ -1,7 +1,7 @@ > TOPDIR = ../../. > include $(TOPDIR)/Make/makedefs > >-C++FILES =\ >+C++FILES = \ > ThreadObserver.c++ \ > ThreadReporter.c++ \ > WorkCrew.c++ \ >Index: OpenThreads/pthread_src/PThread.c++ >=================================================================== >RCS file: /cvs/underware/osg/OpenThreads/pthread_src/PThread.c++,v >retrieving revision 1.1.1.1 >diff -b -B -u -r1.1.1.1 PThread.c++ >--- osg.orig/OpenThreads/pthread_src/PThread.c++ 4 Jan 2006 14:43:36 -0000 1.1.1.1 >+++ osg/OpenThreads/pthread_src/PThread.c++ 6 Jan 2006 13:36:21 -0000 >@@ -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; > >Index: OpenThreads/pthread_src/PThreadPrivateData.h >=================================================================== >RCS file: /cvs/underware/osg/OpenThreads/pthread_src/PThreadPrivateData.h,v >retrieving revision 1.1.1.1 >diff -b -B -u -r1.1.1.1 PThreadPrivateData.h >--- osg.orig/OpenThreads/pthread_src/PThreadPrivateData.h 4 Jan 2006 14:43:36 -0000 1.1.1.1 >+++ osg/OpenThreads/pthread_src/PThreadPrivateData.h 6 Jan 2006 13:36:21 -0000 >@@ -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() {}; > >Index: Producer/Make/makedefs >=================================================================== >RCS file: /cvs/underware/osg/Producer/Make/makedefs,v >retrieving revision 1.1.1.1 >diff -b -B -u -r1.1.1.1 makedefs >--- osg.orig/Producer/Make/makedefs 4 Jan 2006 14:43:47 -0000 1.1.1.1 >+++ osg/Producer/Make/makedefs 6 Jan 2006 13:36:22 -0000 >@@ -250,7 +250,7 @@ > endif > > ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES") >- LDFLAGS += -Wl,-soname -Wl,$@.$(LIB_EXT).0 >+ LDFLAGS += -Wl,-soname -Wl,$@.$(LIB_EXT).4 > endif > > DEF += -fPIC -pthread >@@ -272,7 +272,7 @@ > SHARED = -shared > ARCHARGS = > ifeq ($(SYSARCH),x86_64) >- LINKARGS = -L/usr/X11R6/lib64 >+ LINKARGS = -L/usr/X11R6/lib > else > LINKARGS = -L/usr/X11R6/lib > endif >Index: Producer/Make/producer.pc >=================================================================== >RCS file: /cvs/underware/osg/Producer/Make/producer.pc,v >retrieving revision 1.1.1.1 >diff -b -B -u -r1.1.1.1 producer.pc >--- osg.orig/Producer/Make/producer.pc 4 Jan 2006 14:43:47 -0000 1.1.1.1 >+++ osg/Producer/Make/producer.pc 6 Jan 2006 13:36:22 -0000 >@@ -7,7 +7,7 @@ > > Name: producer > Description: cross-platform C++ library for managing OpenGL rendering contexts >-Version: 0.9,8 >+Version: 1.2.0 > Requires: openscenegraph > Conflicts: > Libs: -L${libdir} -lProducer >Index: Producer/include/Producer/Keyboard >=================================================================== >RCS file: /cvs/underware/osg/Producer/include/Producer/Keyboard,v >retrieving revision 1.1.1.1 >diff -b -B -u -r1.1.1.1 Keyboard >--- osg.orig/Producer/include/Producer/Keyboard 4 Jan 2006 14:44:13 -0000 1.1.1.1 >+++ osg/Producer/include/Producer/Keyboard 6 Jan 2006 13:36:23 -0000 >@@ -539,6 +539,7 @@ > KeyboardKey _key; > }; > >+class KeyboardMouseImplementation; > > class PR_EXPORT Keyboard : public Producer::Referenced > { >Index: OpenSceneGraph/src/osgPlugins/xine/GNUmakefile >=================================================================== >RCS file: /cvs/underware/osg/OpenSceneGraph/src/osgPlugins/xine/GNUmakefile,v >retrieving revision 1.1.1.1 >diff -b -B -u -r1.1.1.1 GNUmakefile >--- osg.orig/OpenSceneGraph/src/osgPlugins/xine/GNUmakefile 4 Jan 2006 14:45:39 -0000 1.1.1.1 >+++ osg/OpenSceneGraph/src/osgPlugins/xine/GNUmakefile 24 Aug 2006 01:30:48 -0000 >@@ -11,12 +11,8 @@ > > LIBS += $(OSG_LIBS) $(XINE_LIBS) $(OTHER_LIBS) > >-ifeq ($(ARCH),64) >- CFLAGS += -fPIC >- CXXFLAGS += -fPIC >-else >- CFLAGS += -DCOMPILE_ASSEMBLY >-endif >+CFLAGS += -fPIC >+CXXFLAGS += -fPIC > > TARGET_BASENAME = xine > include $(TOPDIR)/Make/cygwin_plugin_def
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=118048">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 91526
:
58101
|
58166
|
58167
|
58168
|
77426
|
78612
|
79434
|
79731
|
80052
|
83829
|
92911
|
92912
|
99425
|
99426
|
99427
|
99428
|
99429
|
99430
| 118048 |
121337
|
123397
|
123399
|
140200
|
140201
|
140202
|
140204
|
140206
|
140703
|
140705
|
177328
