Attachment #118048 for bug #91526

Lines 32-38 Link Here

(-)osg.orig/OpenSceneGraph/Make/instexamplesrc (-1 / +1 lines)
32	cd $TOPDIR/examples/$d	32	cd $TOPDIR/examples/$d
33	[ -d $INST_EXAMPLE_SRC/$d ] \|\| mkdir -m 0755 -p $INST_EXAMPLE_SRC/$d	33	[ -d $INST_EXAMPLE_SRC/$d ] \|\| mkdir -m 0755 -p $INST_EXAMPLE_SRC/$d
34	echo " installing $d"	34	echo " installing $d"
35	for f in `$MAKE __instfiles \| grep -v $MAKE`	35	for f in `$MAKE __instfiles \| grep -v $MAKE \| grep -v Entering \| grep -v Leaving`
36	do	36	do
37	src=`echo $f \| cut -f1 -d"="`	37	src=`echo $f \| cut -f1 -d"="`
38	dst=`echo $f \| cut -f2 -d"="`	38	dst=`echo $f \| cut -f2 -d"="`




    ARCH              = 32
  ifeq ($(ARCH),64)
      ARCHARGS        = -m64 -DARCH64
      ARCHINST        =  
  else
      ARCHARGS        = 
  endif

    ARCH              = 32
  ifeq ($(ARCH),64)
      ARCHARGS        = -xarch=v9 -DARCH64
      ARCHINST        = 
  else
      ARCHARGS        = 
      ARCHINST        = 

      ARCH              = 32
      ifeq ($(ARCH),64)
          ARCHARGS          = -64 -DARCH64
		  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/lib
		  PF_XTRA_LIBS      = -L/usr/lib/libpfdb -rpath /usr/lib/libpfdb \
                           $(PFLIBS)
      endif
  else      

      ARCH              = 32
      ifeq ($(ARCH),64)
          ARCHARGS          = -mabi=64 -mips4 -DARCH64
		  ARCHINST          = 
		  LINKARGS          += -L/usr/freeware/lib
		  PF_XTRA_LIBS      = -L/usr/lib/libpfdb -rpath /usr/lib/libpfdb \
                           $(PFLIBS)
      else 
          ARCHARGS          = -mabi=n32 -mips4
		  ARCHINST          = 
		  LINKARGS          += -L/usr/freeware/lib
		  PF_XTRA_LIBS      = -L/usr/lib/libpfdb -rpath /usr/lib/libpfdb \
                           $(PFLIBS)
      endif 
  endif

  else

ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
    LDFLAGS         += -Wl,-soname -Wl,$@.4
endif

#    LDFLAGS         += `getconf LFS_LDFLAGS`

    ifeq ($(SYSARCH),x86_64)
      ARCHARGS        =
      ARCH            = 64
      ARCHINST        = 
    else
      ARCHARGS        = 
      ARCH            = 32


  SHARED            = -shared
  ifeq ($(SYSARCH),x86_64)
    LINKARGS          = -L/usr/X11R6/lib
  else
    LINKARGS          = -L/usr/X11R6/lib
  endif

Lines 7-13 Link Here

(-)osg.orig/OpenSceneGraph/Make/openscenegraph.pc (-1 / +1 lines)
7		7
8	Name: openscenegraph	8	Name: openscenegraph
9	Description: 3D scenegraph	9	Description: 3D scenegraph
10	Version: 1.0,0	10	Version: 1.2.0
11	Requires: openthreads	11	Requires: openthreads
12	Conflicts:	12	Conflicts:
13	Libs: -L${libdir} -losg -losgDB -losgFX -losgGA -losgParticle -losgProducer -losgSim -losgText -losgUtil	13	Libs: -L${libdir} -losg -losgDB -losgFX -losgGA -losgParticle -losgProducer -losgSim -losgText -losgUtil

Lines 39-44 Link Here

(-)osg.orig/OpenSceneGraph/include/osg/Shader (+2 lines)
39	* configuration.	39	* configuration.
40	*/	40	*/
41		41
		42	class Program;
		43
42	class OSG_EXPORT Shader : public osg::Object	44	class OSG_EXPORT Shader : public osg::Object
43	{	45	{
44	public:	46	public:

Lines 228-234 Link Here

(-)osg.orig/OpenThreads/Make/makedefs (-2 / +2 lines)
228	endif	228	endif
229		229
230	ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")	230	ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
231	LDFLAGS += -Wl,-soname -Wl,$@.$(LIB_EXT).0	231	LDFLAGS += -Wl,-soname -Wl,$@.$(LIB_EXT).4
232	endif	232	endif
233		233
234	###DEF += -fPIC	234	###DEF += -fPIC
Lines 251-257 Link Here
251	SHARED = -shared	251	SHARED = -shared
252	ARCHARGS =	252	ARCHARGS =
253	ifeq ($(SYSARCH),x86_64)	253	ifeq ($(SYSARCH),x86_64)
254	LINKARGS = -L/usr/X11R6/lib64	254	LINKARGS = -L/usr/X11R6/lib
255	else	255	else
256	LINKARGS = -L/usr/X11R6/lib	256	LINKARGS = -L/usr/X11R6/lib
257	endif	257	endif

Lines 7-13 Link Here

(-)osg.orig/OpenThreads/Make/openthreads.pc (-1 / +1 lines)
7		7
8	Name: openthreads	8	Name: openthreads
9	Description: Object-Oriented (OO) thread interface for C++ programmers	9	Description: Object-Oriented (OO) thread interface for C++ programmers
10	Version: 1.5	10	Version: 1.2.0
11	Requires:	11	Requires:
12	Conflicts:	12	Conflicts:
13	Libs: -L${libdir} -lOpenThreads	13	Libs: -L${libdir} -lOpenThreads

Lines 1-7 Link Here

(-)osg.orig/OpenThreads/examples_src/workcrew/GNUmakefile (-1 / +1 lines)
1	TOPDIR = ../../.	1	TOPDIR = ../../.
2	include $(TOPDIR)/Make/makedefs	2	include $(TOPDIR)/Make/makedefs
3		3
4	C++FILES =\	4	C++FILES = \
5	ThreadObserver.c++ \	5	ThreadObserver.c++ \
6	ThreadReporter.c++ \	6	ThreadReporter.c++ \
7	WorkCrew.c++ \	7	WorkCrew.c++ \





    PThreadPrivateData *pd = static_cast<PThreadPrivateData *> (_prvData);

    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;


Lines 43-49 Link Here

(-)osg.orig/OpenThreads/pthread_src/PThreadPrivateData.h (-1 / +1 lines)
43		43
44	private:	44	private:
45		45
46	PThreadPrivateData() {};	46	PThreadPrivateData() : stackSize(0), stackSizeLocked(false), isRunning(false), isCanceled(false), idSet(false), tid(0), uniqueId(0), cpunum(0) {};
47		47
48	virtual ~PThreadPrivateData() {};	48	virtual ~PThreadPrivateData() {};
49		49

Lines 250-256 Link Here

(-)osg.orig/Producer/Make/makedefs (-2 / +2 lines)
250	endif	250	endif
251		251
252	ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")	252	ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
253	LDFLAGS += -Wl,-soname -Wl,$@.$(LIB_EXT).0	253	LDFLAGS += -Wl,-soname -Wl,$@.$(LIB_EXT).4
254	endif	254	endif
255		255
256	DEF += -fPIC -pthread	256	DEF += -fPIC -pthread
Lines 272-278 Link Here
272	SHARED = -shared	272	SHARED = -shared
273	ARCHARGS =	273	ARCHARGS =
274	ifeq ($(SYSARCH),x86_64)	274	ifeq ($(SYSARCH),x86_64)
275	LINKARGS = -L/usr/X11R6/lib64	275	LINKARGS = -L/usr/X11R6/lib
276	else	276	else
277	LINKARGS = -L/usr/X11R6/lib	277	LINKARGS = -L/usr/X11R6/lib
278	endif	278	endif

Lines 7-13 Link Here

(-)osg.orig/Producer/Make/producer.pc (-1 / +1 lines)
7		7
8	Name: producer	8	Name: producer
9	Description: cross-platform C++ library for managing OpenGL rendering contexts	9	Description: cross-platform C++ library for managing OpenGL rendering contexts
10	Version: 0.9,8	10	Version: 1.2.0
11	Requires: openscenegraph	11	Requires: openscenegraph
12	Conflicts:	12	Conflicts:
13	Libs: -L${libdir} -lProducer	13	Libs: -L${libdir} -lProducer

Lines 539-544 Link Here

(-)osg.orig/Producer/include/Producer/Keyboard (+1 lines)
539	KeyboardKey _key;	539	KeyboardKey _key;
540	};	540	};
541		541
		542	class KeyboardMouseImplementation;
542		543
543	class PR_EXPORT Keyboard : public Producer::Referenced	544	class PR_EXPORT Keyboard : public Producer::Referenced
544	{	545	{





LIBS  += $(OSG_LIBS) $(XINE_LIBS) $(OTHER_LIBS)

CFLAGS += -fPIC
CXXFLAGS += -fPIC
   CXXFLAGS += -fPIC
else
   CFLAGS += -DCOMPILE_ASSEMBLY
endif

TARGET_BASENAME = xine
include $(TOPDIR)/Make/cygwin_plugin_def

Return to bug 91526

Lines 171-177 Link Here

(-)osg.orig/OpenSceneGraph/Make/makedefs (-16 / +16 lines)
171	ARCH = 32	171	ARCH = 32
172	ifeq ($(ARCH),64)	172	ifeq ($(ARCH),64)
173	ARCHARGS = -m64 -DARCH64	173	ARCHARGS = -m64 -DARCH64
174	ARCHINST = 64	174	ARCHINST =
175	else	175	else
176	ARCHARGS =	176	ARCHARGS =
177	endif	177	endif
Lines 193-199 Link Here
193	ARCH = 32	193	ARCH = 32
194	ifeq ($(ARCH),64)	194	ifeq ($(ARCH),64)
195	ARCHARGS = -xarch=v9 -DARCH64	195	ARCHARGS = -xarch=v9 -DARCH64
196	ARCHINST = 64	196	ARCHINST =
197	else	197	else
198	ARCHARGS =	198	ARCHARGS =
199	ARCHINST =	199	ARCHINST =
Lines 255-269 Link Here
255	ARCH = 32	255	ARCH = 32
256	ifeq ($(ARCH),64)	256	ifeq ($(ARCH),64)
257	ARCHARGS = -64 -DARCH64	257	ARCHARGS = -64 -DARCH64
258	ARCHINST = 64	258	ARCHINST =
259	LINKARGS += -L/usr/freeware/lib64	259	LINKARGS += -L/usr/freeware/lib
260	PF_XTRA_LIBS = -L/usr/lib64/libpfdb -rpath /usr/lib64/libpfdb \	260	PF_XTRA_LIBS = -L/usr/lib/libpfdb -rpath /usr/lib/libpfdb \
261	$(PFLIBS)	261	$(PFLIBS)
262	else	262	else
263	ARCHARGS = -n32	263	ARCHARGS = -n32
264	ARCHINST = 32	264	ARCHINST = 32
265	LINKARGS += -L/usr/freeware/lib32	265	LINKARGS += -L/usr/freeware/lib
266	PF_XTRA_LIBS = -L/usr/lib32/libpfdb -rpath /usr/lib32/libpfdb \	266	PF_XTRA_LIBS = -L/usr/lib/libpfdb -rpath /usr/lib/libpfdb \
267	$(PFLIBS)	267	$(PFLIBS)
268	endif	268	endif
269	else	269	else
Lines 284-298 Link Here
284	ARCH = 32	284	ARCH = 32
285	ifeq ($(ARCH),64)	285	ifeq ($(ARCH),64)
286	ARCHARGS = -mabi=64 -mips4 -DARCH64	286	ARCHARGS = -mabi=64 -mips4 -DARCH64
287	ARCHINST = 64	287	ARCHINST =
288	LINKARGS += -L/usr/freeware/lib64	288	LINKARGS += -L/usr/freeware/lib
289	PF_XTRA_LIBS = -L/usr/lib64/libpfdb -rpath /usr/lib64/libpfdb \	289	PF_XTRA_LIBS = -L/usr/lib/libpfdb -rpath /usr/lib/libpfdb \
290	$(PFLIBS)	290	$(PFLIBS)
291	else	291	else
292	ARCHARGS = -mabi=n32 -mips4	292	ARCHARGS = -mabi=n32 -mips4
293	ARCHINST = 32	293	ARCHINST =
294	LINKARGS += -L/usr/freeware/lib32	294	LINKARGS += -L/usr/freeware/lib
295	PF_XTRA_LIBS = -L/usr/lib32/libpfdb -rpath /usr/lib32/libpfdb \	295	PF_XTRA_LIBS = -L/usr/lib/libpfdb -rpath /usr/lib/libpfdb \
296	$(PFLIBS)	296	$(PFLIBS)
297	endif	297	endif
298	endif	298	endif
Lines 354-360 Link Here
354	else	353	else
355		354
356	ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")	355	ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
357	LDFLAGS += -Wl,-soname -Wl,$@.0	356	LDFLAGS += -Wl,-soname -Wl,$@.4
358	endif	357	endif
359		358
360	# LDFLAGS += `getconf LFS_LDFLAGS`	359	# LDFLAGS += `getconf LFS_LDFLAGS`
Lines 368-374 Link Here
368	ifeq ($(SYSARCH),x86_64)	367	ifeq ($(SYSARCH),x86_64)
369	ARCHARGS =	368	ARCHARGS =
370	ARCH = 64	369	ARCH = 64
371	ARCHINST = 64	370	ARCHINST =
372	else	371	else
373	ARCHARGS =	372	ARCHARGS =
374	ARCH = 32	373	ARCH = 32
Lines 378-384 Link Here
378		377
379	SHARED = -shared	378	SHARED = -shared
380	ifeq ($(SYSARCH),x86_64)	379	ifeq ($(SYSARCH),x86_64)
381	LINKARGS = -L/usr/X11R6/lib64	380	LINKARGS = -L/usr/X11R6/lib
382	else	381	else
383	LINKARGS = -L/usr/X11R6/lib	382	LINKARGS = -L/usr/X11R6/lib
384	endif	383	endif

Lines 529-555 Link Here

(-)osg.orig/OpenThreads/pthread_src/PThread.c++ (-10 / +1 lines)
529		529
530	PThreadPrivateData pd = static_cast<PThreadPrivateData > (_prvData);	530	PThreadPrivateData pd = static_cast<PThreadPrivateData > (_prvData);
531		531
532	size_t defaultStackSize;	532	size_t defaultStackSize = 0;
533	pthread_attr_getstacksize( &thread_attr, &defaultStackSize);	533	pthread_attr_getstacksize( &thread_attr, &defaultStackSize);
534	if(status != 0) {
535	return status;
536	}
537		534
538	if(defaultStackSize < pd->stackSize) {	535	if(defaultStackSize < pd->stackSize) {
539		536
540	pthread_attr_setstacksize( &thread_attr, pd->stackSize);	537	pthread_attr_setstacksize( &thread_attr, pd->stackSize);
541	if(status != 0) {
542	return status;
543	}
544	}	538	}
545		539
546	//-------------------------------------------------------------------------	540	//-------------------------------------------------------------------------
547	// Now get what we actually have...	541	// Now get what we actually have...
548	//	542	//
549	pthread_attr_getstacksize( &thread_attr, &defaultStackSize);	543	pthread_attr_getstacksize( &thread_attr, &defaultStackSize);
550	if(status != 0) {
551	return status;
552	}
553		544
554	pd->stackSize = defaultStackSize;	545	pd->stackSize = defaultStackSize;
555		546

Lines 11-22 Link Here

(-)osg.orig/OpenSceneGraph/src/osgPlugins/xine/GNUmakefile (-6 / +2 lines)
11		11
12	LIBS += $(OSG_LIBS) $(XINE_LIBS) $(OTHER_LIBS)	12	LIBS += $(OSG_LIBS) $(XINE_LIBS) $(OTHER_LIBS)
13		13
14	ifeq ($(ARCH),64)	14	CFLAGS += -fPIC
15	CFLAGS += -fPIC	15	CXXFLAGS += -fPIC
16	CXXFLAGS += -fPIC
17	else
18	CFLAGS += -DCOMPILE_ASSEMBLY
19	endif
20		16
21	TARGET_BASENAME = xine	17	TARGET_BASENAME = xine
22	include $(TOPDIR)/Make/cygwin_plugin_def	18	include $(TOPDIR)/Make/cygwin_plugin_def