diff -Nru inventor-2.1.5-10/apps/demos/drop/drop.c++ inventor-2.1.5-10/apps/demos/drop/drop.c++ --- inventor-2.1.5-10/apps/demos/drop/drop.c++ 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/apps/demos/drop/drop.c++ 2002-06-01 02:22:20.000000000 +0000 @@ -93,7 +93,6 @@ // Enter the Xt event loop SoXt::show( appWindow ); SoXt::mainLoop(); - return 0; } diff -Nru inventor-2.1.5-10/apps/demos/drop/GNUmakefile inventor-2.1.5-10/apps/demos/drop/GNUmakefile --- inventor-2.1.5-10/apps/demos/drop/GNUmakefile 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/apps/demos/drop/GNUmakefile 2000-09-18 09:40:59.000000000 +0000 @@ -8,7 +8,7 @@ TsBlock.c++ TsPiece.c++ TsPieces.c++ TsField.c++ \ TsTrickle.c++ TsEvents.c++ TsRemoval.c++ TsViewer.c++ drop.c++ -LLDLIBS = -lInventor -lInventorXt -lXm +LLDLIBS = -lInventor -lInventorXt all: all_ivbin diff -Nru inventor-2.1.5-10/apps/demos/gview/DisplayGraph.c++ inventor-2.1.5-10/apps/demos/gview/DisplayGraph.c++ --- inventor-2.1.5-10/apps/demos/gview/DisplayGraph.c++ 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/apps/demos/gview/DisplayGraph.c++ 2002-06-01 02:22:20.000000000 +0000 @@ -67,7 +67,7 @@ SbDict *DisplayGraph::iconDict; #define ICON_FILE "gviewIcons.iv" -#define ICON_INST_DIR IVDEMODATADIR +#define ICON_INST_DIR IVPREFIX "/demos/data/Inventor" #define ICON_ENV_VAR "IV_GRAPH_DIR" //////////////////////////////////////////////////////////////////////// diff -Nru inventor-2.1.5-10/apps/demos/gview/GNUmakefile inventor-2.1.5-10/apps/demos/gview/GNUmakefile --- inventor-2.1.5-10/apps/demos/gview/GNUmakefile 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/apps/demos/gview/GNUmakefile 2002-06-01 02:22:20.000000000 +0000 @@ -8,7 +8,7 @@ gview.c++ DisplayGraph.c++ Error.c++ FieldEditor.c++ \ GraphIcon.c++ GraphViewer.c++ NodeCreator.c++ -LLDLIBS = -lInventor -lInventorXt -lXm +LLDLIBS = -lInventor -lInventorXt all: all_ivbin diff -Nru inventor-2.1.5-10/apps/demos/gview/gview.RUNME inventor-2.1.5-10/apps/demos/gview/gview.RUNME --- inventor-2.1.5-10/apps/demos/gview/gview.RUNME 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/apps/demos/gview/gview.RUNME 2000-11-14 02:49:51.000000000 +0000 @@ -1,3 +1,3 @@ #!/bin/sh #Tag 0x00010510 -/usr/lib/inventor/gview /usr/share/inventor/data/demos/windmill.iv +/usr/demos/Inventor/gview /usr/demos/data/Inventor/windmill.iv diff -Nru inventor-2.1.5-10/apps/demos/maze/maze.c++ inventor-2.1.5-10/apps/demos/maze/maze.c++ --- inventor-2.1.5-10/apps/demos/maze/maze.c++ 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/apps/demos/maze/maze.c++ 2002-06-01 02:22:20.000000000 +0000 @@ -1332,6 +1332,5 @@ SoXt::show(mainWindow); SoXt::mainLoop(); - return 0; } diff -Nru inventor-2.1.5-10/apps/demos/noodle/GNUmakefile inventor-2.1.5-10/apps/demos/noodle/GNUmakefile --- inventor-2.1.5-10/apps/demos/noodle/GNUmakefile 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/apps/demos/noodle/GNUmakefile 2002-06-01 02:22:20.000000000 +0000 @@ -16,7 +16,7 @@ ../../nodes/GeneralizedCylinder/NurbMaker.o \ ../../nodes/GeneralizedCylinder/Triangulator.o \ ../../nodes/GeneralizedCylinder/GeneralizedCylinder.o \ - -lInventor -lInventorXt -lXm + -lInventor -lInventorXt all: all_ivbin diff -Nru inventor-2.1.5-10/apps/demos/noodle/Interface.c++ inventor-2.1.5-10/apps/demos/noodle/Interface.c++ --- inventor-2.1.5-10/apps/demos/noodle/Interface.c++ 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/apps/demos/noodle/Interface.c++ 2002-06-01 02:22:20.000000000 +0000 @@ -399,23 +399,23 @@ void Interface::showAboutDialog() { - if (access(IVDEMOBINDIR"/noodle.about", R_OK) != 0) { + if (access(IVPREFIX "/demos/Inventor/noodle.about", R_OK) != 0) { system("xmessage 'Sorry, could not find " - IVDEMOBINDIR"/noodle.about' > /dev/null"); + IVPREFIX "/demos/Inventor/noodle.about' > /dev/null"); return; } char command[100]; - sprintf(command, "which " PDFVIEWER " > /dev/null"); + sprintf(command, "which acroread > /dev/null"); int err = system(command); if (err) { - system("xmessage 'You must install " PDFVIEWER + system("xmessage 'You must install acroread" " for this function to work' > /dev/null"); return; } - sprintf(command, PDFVIEWER " " IVDEMOBINDIR"/noodle.about &"); + sprintf(command, "acroread " IVPREFIX "/demos/Inventor/noodle.about &"); system(command); } diff -Nru inventor-2.1.5-10/apps/demos/noodle/noodle.c++ inventor-2.1.5-10/apps/demos/noodle/noodle.c++ --- inventor-2.1.5-10/apps/demos/noodle/noodle.c++ 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/apps/demos/noodle/noodle.c++ 2002-06-01 02:22:20.000000000 +0000 @@ -679,6 +679,5 @@ SoXt::show(mainWindow); SoXt::mainLoop(); - return 0; } diff -Nru inventor-2.1.5-10/apps/demos/noodle/noodle.RUNME inventor-2.1.5-10/apps/demos/noodle/noodle.RUNME --- inventor-2.1.5-10/apps/demos/noodle/noodle.RUNME 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/apps/demos/noodle/noodle.RUNME 2000-11-14 02:49:52.000000000 +0000 @@ -1,3 +1,3 @@ #!/bin/sh #Tag 0x00010510 -cd /usr/share/inventor/data/demos; /usr/lib/inventor/noodle +cd /usr/demos/data/Inventor; /usr/demos/Inventor/noodle diff -Nru inventor-2.1.5-10/apps/demos/qmorf/GNUmakefile inventor-2.1.5-10/apps/demos/qmorf/GNUmakefile --- inventor-2.1.5-10/apps/demos/qmorf/GNUmakefile 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/apps/demos/qmorf/GNUmakefile 2002-06-01 02:22:20.000000000 +0000 @@ -6,7 +6,7 @@ CXXFILES = QuadThing.c++ Background.c++ FlashBackground.c++ -LLDLIBS = -lInventor -lInventorXt -lXm +LLDLIBS = -lInventor -lInventorXt all: all_ivbin diff -Nru inventor-2.1.5-10/apps/demos/qmorf/qmorf.c++ inventor-2.1.5-10/apps/demos/qmorf/qmorf.c++ --- inventor-2.1.5-10/apps/demos/qmorf/qmorf.c++ 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/apps/demos/qmorf/qmorf.c++ 2002-06-01 02:22:20.000000000 +0000 @@ -413,7 +413,8 @@ fprintf(stderr, "At least two files must be given, and " "they must contain QuadMeshes (qmorf can\n"); fprintf(stderr, "only morph QuadMesh nodes).\n"); - fprintf(stderr, "The directory " IVDATADIR "/CyberHeads " + fprintf(stderr, "The directory " + IVPREFIX "/share/data/models/CyberHeads " "contains good data to morph.\n"); exit(7); @@ -435,24 +436,24 @@ void showAboutDialog(Widget, XtPointer, XtPointer) { - if (access(IVDEMOBINDIR"/qmorf.about", R_OK) != 0) + if (access(IVPREFIX "/demos/Inventor/qmorf.about", R_OK) != 0) { system("xmessage 'Sorry, could not find " - IVDEMOBINDIR"/qmorf.about' > /dev/null"); + IVPREFIX "/demos/Inventor/qmorf.about' > /dev/null"); return; } char command[100]; - sprintf(command, "which " PDFVIEWER " > /dev/null"); + sprintf(command, "which acroread > /dev/null"); int err = system(command); if (err) { - system("xmessage 'You must install " PDFVIEWER + system("xmessage 'You must install acroread" " for this function to work' > /dev/null"); return; } - sprintf(command, PDFVIEWER " " IVDEMOBINDIR "/qmorf.about &"); + sprintf(command, "acroread " IVPREFIX "/demos/Inventor/qmorf.about &"); system(command); } diff -Nru inventor-2.1.5-10/apps/demos/qmorf/qmorf.RUNME inventor-2.1.5-10/apps/demos/qmorf/qmorf.RUNME --- inventor-2.1.5-10/apps/demos/qmorf/qmorf.RUNME 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/apps/demos/qmorf/qmorf.RUNME 2000-11-14 02:49:52.000000000 +0000 @@ -1,3 +1,3 @@ #!/bin/sh #Tag 0x00010510 -/usr/lib/inventor/qmorf /usr/share/inventor/data/models/CyberHeads/*.iv +/usr/demos/Inventor/qmorf /usr/share/data/models/CyberHeads/*.iv diff -Nru inventor-2.1.5-10/apps/demos/revo/GNUmakefile inventor-2.1.5-10/apps/demos/revo/GNUmakefile --- inventor-2.1.5-10/apps/demos/revo/GNUmakefile 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/apps/demos/revo/GNUmakefile 2002-06-01 02:22:20.000000000 +0000 @@ -10,7 +10,7 @@ LLDOPTS += -L../../samples/common -LLDLIBS = -lcommon -lInventor -lInventorXt -lXm +LLDLIBS = -lcommon -lInventor -lInventorXt all: all_ivbin diff -Nru inventor-2.1.5-10/apps/demos/revo/revo.c++ inventor-2.1.5-10/apps/demos/revo/revo.c++ --- inventor-2.1.5-10/apps/demos/revo/revo.c++ 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/apps/demos/revo/revo.c++ 2002-06-01 02:22:21.000000000 +0000 @@ -78,25 +78,25 @@ void showAboutDialog(Widget, XtPointer, XtPointer) { - if (access(IVDEMOBINDIR "/revo.about", R_OK) != 0) + if (access(IVPREFIX "/demos/Inventor/revo.about", R_OK) != 0) { system("xmessage 'Sorry, could not find " - IVDEMOBINDIR "/revo.about' > /dev/null"); + IVPREFIX "/demos/Inventor/revo.about' > /dev/null"); return; } char command[100]; - sprintf(command, "which " PDFVIEWER " >& /dev/null"); + sprintf(command, "which acroread >& /dev/null"); int err = system(command); if (err) { - system("xmessage 'You must install " PDFVIEWER + system("xmessage 'You must install acroread" " for this function to work' > /dev/null"); return; } - sprintf(command, PDFVIEWER " " IVDEMOBINDIR "/revo.about &"); + sprintf(command, "acroread " IVPREFIX "/demos/Inventor/revo.about &"); system(command); } diff -Nru inventor-2.1.5-10/apps/demos/SceneViewer/GNUmakefile inventor-2.1.5-10/apps/demos/SceneViewer/GNUmakefile --- inventor-2.1.5-10/apps/demos/SceneViewer/GNUmakefile 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/apps/demos/SceneViewer/GNUmakefile 2002-06-01 02:22:20.000000000 +0000 @@ -8,7 +8,7 @@ LLDOPTS += -L../../samples/widgets -LLDLIBS = -lInventorWidget -lInventor -lInventorXt -lXm +LLDLIBS = -lInventorWidget -lInventor -lInventorXt all: all_ivbin diff -Nru inventor-2.1.5-10/apps/demos/SceneViewer/SceneViewer.c++ inventor-2.1.5-10/apps/demos/SceneViewer/SceneViewer.c++ --- inventor-2.1.5-10/apps/demos/SceneViewer/SceneViewer.c++ 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/apps/demos/SceneViewer/SceneViewer.c++ 2002-06-01 02:22:20.000000000 +0000 @@ -230,5 +230,4 @@ // Loop forever // SoXt::mainLoop(); - return 0; } diff -Nru inventor-2.1.5-10/apps/demos/SceneViewer/SceneViewer.RUNME inventor-2.1.5-10/apps/demos/SceneViewer/SceneViewer.RUNME --- inventor-2.1.5-10/apps/demos/SceneViewer/SceneViewer.RUNME 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/apps/demos/SceneViewer/SceneViewer.RUNME 2000-11-14 02:49:51.000000000 +0000 @@ -1,4 +1,4 @@ #!/bin/sh #Tag 0x00010510 -cd /usr/share/inventor/data/models -/usr/lib/inventor/SceneViewer /usr/share/inventor/data/demos/jackInTheBox.iv +cd /usr/share/data/models +/usr/demos/Inventor/SceneViewer /usr/demos/data/Inventor/jackInTheBox.iv diff -Nru inventor-2.1.5-10/apps/demos/SceneViewer/SoSceneViewer.c++ inventor-2.1.5-10/apps/demos/SceneViewer/SoSceneViewer.c++ --- inventor-2.1.5-10/apps/demos/SceneViewer/SoSceneViewer.c++ 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/apps/demos/SceneViewer/SoSceneViewer.c++ 2003-06-11 01:20:09.000000000 +0000 @@ -4734,26 +4734,26 @@ // //////////////////////////////////////////////////////////////////////// { - if (access(IVDEMOBINDIR "/SceneViewer.about", R_OK) != 0) + if (access(IVPREFIX "/demos/Inventor/SceneViewer.about", R_OK) != 0) { system("xmessage 'Sorry, could not find " - IVDEMOBINDIR "/SceneViewer.about' > /dev/null"); + IVPREFIX "/demos/Inventor/SceneViewer.about' > /dev/null"); return; } char command[100]; - sprintf(command, "which " PDFVIEWER " > /dev/null"); + sprintf(command, "which acroread > /dev/null"); int err = system(command); if (err) { - system("xmessage 'You must install " PDFVIEWER + system("xmessage 'You must install acroread" " for this function to work' > /dev/null"); return; } - sprintf(command, PDFVIEWER " " - IVDEMOBINDIR "/SceneViewer.about &"); + sprintf(command, "acroread " + IVPREFIX "/demos/Inventor/SceneViewer.about &"); system(command); } diff -Nru inventor-2.1.5-10/apps/demos/textomatic/GNUmakefile inventor-2.1.5-10/apps/demos/textomatic/GNUmakefile --- inventor-2.1.5-10/apps/demos/textomatic/GNUmakefile 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/apps/demos/textomatic/GNUmakefile 2002-06-01 02:22:21.000000000 +0000 @@ -8,7 +8,7 @@ LLDOPTS += -L../../samples/common -LLDLIBS = -lcommon -lInventor -lInventorXt -lXm +LLDLIBS = -lcommon -lInventor -lInventorXt all: all_ivbin diff -Nru inventor-2.1.5-10/apps/demos/textomatic/textomatic.c++ inventor-2.1.5-10/apps/demos/textomatic/textomatic.c++ --- inventor-2.1.5-10/apps/demos/textomatic/textomatic.c++ 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/apps/demos/textomatic/textomatic.c++ 2003-07-11 22:40:53.000000000 +0000 @@ -160,24 +160,24 @@ void showAboutDialog(Widget, XtPointer, XtPointer) { - if (access(IVDEMOBINDIR"/textomatic.about", R_OK) != 0) + if (access(IVPREFIX "/demos/Inventor/textomatic.about", R_OK) != 0) { system("xmessage 'Sorry, could not find " - IVDEMOBINDIR"/textomatic.about' > /dev/null"); + IVPREFIX "/demos/Inventor/textomatic.about' > /dev/null"); return; } char command[100]; - sprintf(command, "which " PDFVIEWER " > /dev/null"); + sprintf(command, "which acroread > /dev/null"); int err = system(command); if (err) { - system("xmessage 'You must install " PDFVIEWER + system("xmessage 'You must install acroread" " for this function to work' > /dev/null"); return; } - sprintf(command, PDFVIEWER " " IVDEMOBINDIR"/textomatic.about &"); + sprintf(command, "acroread " IVPREFIX "/demos/Inventor/textomatic.about &"); system(command); } @@ -548,5 +548,4 @@ SoXt::show(w); SoXt::mainLoop(); - return 0; } diff -Nru inventor-2.1.5-10/apps/nodes/Decal/GNUmakefile inventor-2.1.5-10/apps/nodes/Decal/GNUmakefile --- inventor-2.1.5-10/apps/nodes/Decal/GNUmakefile 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/apps/nodes/Decal/GNUmakefile 2000-09-18 09:41:01.000000000 +0000 @@ -5,7 +5,7 @@ CXXFILES = Decal.c++ -LLDLIBS = -lGL -lInventor -lInventorXt +LLDLIBS = -lInventor -lInventorXt all install: all_ivbin diff -Nru inventor-2.1.5-10/apps/samples/widgets/componentTest.c++ inventor-2.1.5-10/apps/samples/widgets/componentTest.c++ --- inventor-2.1.5-10/apps/samples/widgets/componentTest.c++ 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/apps/samples/widgets/componentTest.c++ 2002-06-01 02:22:21.000000000 +0000 @@ -60,7 +60,7 @@ } int -main(int argc, char *argv[]) +main(unsigned int argc, char *argv[]) { if (argc != 2) usage(argv[0]); @@ -85,5 +85,4 @@ XtRealizeWidget(mainWindow); SoXt::mainLoop(); - return 0; } diff -Nru inventor-2.1.5-10/apps/samples/widgets/GNUmakefile inventor-2.1.5-10/apps/samples/widgets/GNUmakefile --- inventor-2.1.5-10/apps/samples/widgets/GNUmakefile 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/apps/samples/widgets/GNUmakefile 2000-09-18 07:51:58.000000000 +0000 @@ -1,7 +1,7 @@ IVDEPTH = ../../.. include $(IVDEPTH)/make/ivcommondefs -PROGRAMS_EXT = libInventorWidget.a +PROGRAMS_EXT = libInventorWidget.a componentTest all install $(COMMONTARGS): for i in $(PROGRAMS_EXT); do $(MAKE) -f GNUmakefile.$$i $@; done diff -Nru inventor-2.1.5-10/apps/samples/widgets/GNUmakefile.libInventorWidget.a inventor-2.1.5-10/apps/samples/widgets/GNUmakefile.libInventorWidget.a --- inventor-2.1.5-10/apps/samples/widgets/GNUmakefile.libInventorWidget.a 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/apps/samples/widgets/GNUmakefile.libInventorWidget.a 2001-09-25 00:45:26.000000000 +0000 @@ -15,7 +15,8 @@ MyThumbWhl.c++ \ MyFloatCBList.c++ \ MySimpleMtlEditor.c++ \ - MyMtlPal.c++ + MyMtlPal.c++ \ + MyTextureEd.c++ all install: all_ivbin diff -Nru inventor-2.1.5-10/apps/samples/widgets/MyMtlPal.c++ inventor-2.1.5-10/apps/samples/widgets/MyMtlPal.c++ --- inventor-2.1.5-10/apps/samples/widgets/MyMtlPal.c++ 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/apps/samples/widgets/MyMtlPal.c++ 2002-06-01 02:22:21.000000000 +0000 @@ -193,7 +193,7 @@ }; static char *editorTitle = "Material Palette"; -static char *defaultDir = IVMATERIALSDIR; +static char *defaultDir = IVPREFIX "/share/data/materials"; static char *geometryBuffer = "\ diff -Nru inventor-2.1.5-10/apps/samples/widgets/MyTextureEd.c++ inventor-2.1.5-10/apps/samples/widgets/MyTextureEd.c++ --- inventor-2.1.5-10/apps/samples/widgets/MyTextureEd.c++ 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/apps/samples/widgets/MyTextureEd.c++ 2002-06-01 02:22:21.000000000 +0000 @@ -228,7 +228,7 @@ static char *customTextureDir = ".textures"; -static char *defaultDir = IVTEXTURESDIR; +static char *defaultDir = IVPREFIX "/share/data/textures"; static char *editorTitle = "Texture Editor"; static char *noFileNameStr = ""; diff -Nru inventor-2.1.5-10/apps/tools/ivview/GNUmakefile inventor-2.1.5-10/apps/tools/ivview/GNUmakefile --- inventor-2.1.5-10/apps/tools/ivview/GNUmakefile 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/apps/tools/ivview/GNUmakefile 2000-11-14 02:49:52.000000000 +0000 @@ -7,7 +7,7 @@ LLDOPTS += -L../../samples/widgets -LLDLIBS = -lInventorWidget -lInventorXt -lInventor -lXm +LLDLIBS = -lInventorWidget -lInventorXt -lInventor all: all_ivbin diff -Nru inventor-2.1.5-10/apps/tools/ivview/ivview.c++ inventor-2.1.5-10/apps/tools/ivview/ivview.c++ --- inventor-2.1.5-10/apps/tools/ivview/ivview.c++ 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/apps/tools/ivview/ivview.c++ 2002-06-01 02:22:21.000000000 +0000 @@ -715,23 +715,23 @@ static void showAboutDialog() { - if (access(IVHELPDIR"/ivview/ivview.about", R_OK) != 0) { + if (access(IVPREFIX "/share/help/ivview/ivview.about", R_OK) != 0) { system("xmessage 'Sorry, could not find " - IVHELPDIR"/ivview/ivview.about' > /dev/null"); + IVPREFIX "/share/help/ivview/ivview.about' > /dev/null"); return; } char command[100]; - sprintf(command, "which " PDFVIEWER " > /dev/null"); + sprintf(command, "which acroread > /dev/null"); int err = system(command); if (err) { - system("xmessage 'You must install " PDFVIEWER + system("xmessage 'You must install acroread" " for this function to work' > /dev/null"); return; } - sprintf(command, PDFVIEWER " "IVHELPDIR"/ivview/ivview.about &"); + sprintf(command, "acroread " IVPREFIX "/share/help/ivview/ivview.about &"); system(command); } @@ -1170,5 +1170,4 @@ setBusyCursor(FALSE); SoXt::mainLoop(); - return 0; } diff -Nru inventor-2.1.5-10/debian/changelog inventor-2.1.5-10/debian/changelog --- inventor-2.1.5-10/debian/changelog 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/debian/changelog 2011-11-18 14:41:05.000000000 +0000 @@ -1,3 +1,53 @@ +inventor (2.1.5-10-16ubuntu1) precise; urgency=low + + * Merge with Debian; remaining changes: + - Add alternative recommendation on pdf-viewer. + - Stop building componentTest, since it links against GLw. + - Hack libInventorWidget.a to not build MyColorEditor, as it also uses GLw + now. + + -- Matthias Klose Fri, 18 Nov 2011 15:20:48 +0200 + +inventor (2.1.5-10-16) unstable; urgency=low + + * patches/add-required-libs.patch: Do not hard-code libGLw path. Bug + fix for #624156 restores ability to use shared libGLw. + Closes: #634559. + + * control: change recommends from xpdf-reader to xpdf. + + -- Steve M. Robbins Sat, 24 Sep 2011 15:50:51 -0500 + +inventor (2.1.5-10-15) unstable; urgency=low + + * control: Move to Debian-science repository, set Maintainer, + Uploaders, and Vcs fields. Set Standards-Version to 3.9.2. Fix -doc + description. Closes: #575557. + + * compat: + * control: Require use of debhelper v8. Add ${misc:Depends} to all + packages. + + * source/format: Switch to source format 3.0. Closes: #620531. + - patches/add-required-libs.patch: + - patches/bison-workaround.patch: + - patches/buildman.patch: + - patches/buildsystem.patch: + - patches/configurability.patch: + - patches/const-correctness.patch: + - patches/endianness.patch: + - patches/forward-declare.patch: + - patches/freetype.patch: + - patches/ivman.patch: + - patches/main-correctness.patch: + - patches/socalcparse.patch: + - patches/use-tcsh.patch: New. Patch set created from previous debian + diff, augmented to link all required lib. Closes: #554921. + + * Build on i386 to ensure docs are built. Closes: #595405. + + -- Steve M. Robbins Tue, 26 Apr 2011 00:46:51 -0500 + inventor (2.1.5-10-14ubuntu3) oneiric; urgency=low * Add alternative recommendation on pdf-viewer. @@ -378,4 +428,3 @@ scoping rules. -- Steve M. Robbins Mon, 30 Jul 2001 19:14:48 -0400 - diff -Nru inventor-2.1.5-10/debian/compat inventor-2.1.5-10/debian/compat --- inventor-2.1.5-10/debian/compat 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/debian/compat 2011-09-25 03:15:32.000000000 +0000 @@ -1 +1 @@ -5 +8 diff -Nru inventor-2.1.5-10/debian/control inventor-2.1.5-10/debian/control --- inventor-2.1.5-10/debian/control 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/debian/control 2011-11-18 14:26:25.000000000 +0000 @@ -3,9 +3,14 @@ Section: devel Priority: optional Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Steve M. Robbins -Standards-Version: 3.8.2.0 -Build-Depends: debhelper (>= 5), libx11-dev, libxi-dev, libxt-dev, x11proto-core-dev, lesstif2-dev, libglw1-mesa-dev, libglu1-mesa-dev, libfreetype6-dev, libjpeg-dev, tcsh, bison +XSBC-Original-Maintainer: Debian Science Team +Uploaders: Steve M. Robbins +Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/inventor/ +Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/inventor/ +Standards-Version: 3.9.2 +Build-Depends: debhelper (>= 8), + libx11-dev, libxi-dev, libxt-dev, x11proto-core-dev, + lesstif2-dev, libglw1-mesa-dev, libglu1-mesa-dev, libfreetype6-dev, libjpeg-dev, tcsh, bison Package: libinventor0 Conflicts: libinventor0c102 @@ -13,8 +18,8 @@ Architecture: any Section: libs Priority: optional -Depends: ${shlibs:Depends}, xfonts-scalable, gsfonts-x11 -Recommends: xpdf-reader | pdf-viewer +Depends: ${misc:Depends}, ${shlibs:Depends}, xfonts-scalable, gsfonts-x11 +Recommends: xpdf | pdf-viewer Description: Open Inventor runtime environment This package contains the required files to run Open Inventor applications. . @@ -26,13 +31,13 @@ editors can speed up your programming and extend your 3D program's capabilities. . - Recommended package xpdf-reader is needed only to view help files. + Recommended package xpdf is needed only to view help files. Package: inventor-dev Architecture: any Section: devel Priority: optional -Depends: libinventor0 (= ${binary:Version}), libc6-dev, xlibmesa-dev | libgl-dev, lesstif2-dev +Depends: ${misc:Depends}, libinventor0 (= ${binary:Version}), libc6-dev, xlibmesa-dev | libgl-dev, lesstif2-dev Conflicts: libcoin20-dev, libcoin20-doc Description: Open Inventor development files This package contains the files required to develop Open Inventor @@ -50,10 +55,10 @@ Architecture: all Section: doc Priority: optional +Depends: ${misc:Depends} Conflicts: libcoin20-doc, libcoin40-doc, inventor-dev (<= 2.1.5-10-1) Description: Open Inventor documentation - This package contains the files required to develop Open Inventor - applications. + This package contains the Open Inventor documentation files. . Open Inventor is an object-oriented 3D toolkit offering a comprehensive solution to interactive graphics programming problems. It presents a @@ -67,7 +72,7 @@ Architecture: any Section: graphics Priority: optional -Depends: ${shlibs:Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} Description: Open Inventor client programs This package contains Open Inventor file viewers and converters. . @@ -83,6 +88,7 @@ Architecture: all Section: graphics Priority: optional +Depends: ${misc:Depends} Description: Open Inventor sample data files This package contains sample 3D model and scene files in inventor format. . @@ -98,7 +104,7 @@ Architecture: any Section: graphics Priority: optional -Depends: ${shlibs:Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} Description: Open Inventor demonstration programs and example code This package includes several Open Inventor demos: a scene viewer (SceneViewer), a scene graph viewer and editor (gview), a maze game (maze), diff -Nru inventor-2.1.5-10/debian/link-fonts.sh inventor-2.1.5-10/debian/link-fonts.sh --- inventor-2.1.5-10/debian/link-fonts.sh 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/debian/link-fonts.sh 2011-09-25 03:15:32.000000000 +0000 @@ -1,7 +1,7 @@ #! /bin/sh -e fontpath=/usr/share/inventor/fonts -type1=/usr/share/X11/fonts/Type1 +type1=/usr/share/fonts/X11/Type1 mkdir -p $fontpath cd $fontpath diff -Nru inventor-2.1.5-10/debian/patches/add-required-libs.patch inventor-2.1.5-10/debian/patches/add-required-libs.patch --- inventor-2.1.5-10/debian/patches/add-required-libs.patch 1970-01-01 00:00:00.000000000 +0000 +++ inventor-2.1.5-10/debian/patches/add-required-libs.patch 2011-09-25 03:15:31.000000000 +0000 @@ -0,0 +1,149 @@ +Description: Add required libraries + Add common libraries required now that ld is + "improved" and no longer finds symbols in + shared libs linked to shared libs. +Author: Steve M. Robbins + +--- inventor-2.1.5-10.orig/make/ivcommondefs ++++ inventor-2.1.5-10/make/ivcommondefs +@@ -92,6 +92,7 @@ + LDDSOOPTS += -L$(X11LIBDIR) + LDOPTS += -L$(X11LIBDIR) + ++LLDLIBSCOMMON = -lXt -lGLw -lGL -lXm -lX11 + endif + + +--- inventor-2.1.5-10.orig/apps/nodes/Decal/GNUmakefile ++++ inventor-2.1.5-10/apps/nodes/Decal/GNUmakefile +@@ -5,7 +5,7 @@ DSO = Decal.so + + CXXFILES = Decal.c++ + +-LLDLIBS = -lInventor -lInventorXt ++LLDLIBS = -lGL -lInventor -lInventorXt + + all install: all_ivbin + +--- inventor-2.1.5-10.orig/lib/GNUmakefile ++++ inventor-2.1.5-10/lib/GNUmakefile +@@ -1,8 +1,7 @@ + + LLDLIBS = \ + -ljpeg -limage $(FLLIB) \ +- -lX11 -lm \ +- -lGLU -lGL ++ -lGLU -lGL -lX11 -ldl -lm + + OBJECTS = \ + ./database/src/sb/projectors/SbProjectors.o \ +--- inventor-2.1.5-10.orig/apps/samples/widgets/GNUmakefile.componentTest ++++ inventor-2.1.5-10/apps/samples/widgets/GNUmakefile.componentTest +@@ -5,7 +5,7 @@ + + CXXFILES = componentTest.c++ + +-LLDLIBS = libInventorWidget.a -lInventor -lInventorXt -lGLw ++LLDLIBS = libInventorWidget.a -lInventor -lInventorXt $(LLDLIBSCOMMON) + + all install: all_ivbin + +--- inventor-2.1.5-10.orig/apps/tools/ivview/GNUmakefile ++++ inventor-2.1.5-10/apps/tools/ivview/GNUmakefile +@@ -7,7 +7,7 @@ + + LLDOPTS += -L../../samples/widgets + +-LLDLIBS = -lInventorWidget -lInventorXt -lInventor ++LLDLIBS = -lInventorWidget -lInventorXt -lInventor $(LLDLIBSCOMMON) + + all: all_ivbin + +--- inventor-2.1.5-10.orig/apps/demos/SceneViewer/GNUmakefile ++++ inventor-2.1.5-10/apps/demos/SceneViewer/GNUmakefile +@@ -8,7 +8,7 @@ + + LLDOPTS += -L../../samples/widgets + +-LLDLIBS = -lInventorWidget -lInventor -lInventorXt ++LLDLIBS = -lInventorWidget -lInventor -lInventorXt $(LLDLIBSCOMMON) + + all: all_ivbin + +--- inventor-2.1.5-10.orig/apps/demos/drop/GNUmakefile ++++ inventor-2.1.5-10/apps/demos/drop/GNUmakefile +@@ -8,7 +8,7 @@ + TsBlock.c++ TsPiece.c++ TsPieces.c++ TsField.c++ \ + TsTrickle.c++ TsEvents.c++ TsRemoval.c++ TsViewer.c++ drop.c++ + +-LLDLIBS = -lInventor -lInventorXt ++LLDLIBS = -lInventor -lInventorXt $(LLDLIBSCOMMON) + + all: all_ivbin + +--- inventor-2.1.5-10.orig/apps/demos/gview/GNUmakefile ++++ inventor-2.1.5-10/apps/demos/gview/GNUmakefile +@@ -8,7 +8,7 @@ + gview.c++ DisplayGraph.c++ Error.c++ FieldEditor.c++ \ + GraphIcon.c++ GraphViewer.c++ NodeCreator.c++ + +-LLDLIBS = -lInventor -lInventorXt ++LLDLIBS = -lInventor -lInventorXt $(LLDLIBSCOMMON) + + all: all_ivbin + +--- inventor-2.1.5-10.orig/apps/demos/maze/GNUmakefile ++++ inventor-2.1.5-10/apps/demos/maze/GNUmakefile +@@ -8,7 +8,7 @@ + + CXXFILES = maze.c++ + +-LLDLIBS = -lInventor -lInventorXt ++LLDLIBS = -lInventor -lInventorXt $(LLDLIBSCOMMON) + + all: all_ivbin + +--- inventor-2.1.5-10.orig/apps/demos/noodle/GNUmakefile ++++ inventor-2.1.5-10/apps/demos/noodle/GNUmakefile +@@ -16,7 +16,7 @@ + ../../nodes/GeneralizedCylinder/NurbMaker.o \ + ../../nodes/GeneralizedCylinder/Triangulator.o \ + ../../nodes/GeneralizedCylinder/GeneralizedCylinder.o \ +- -lInventor -lInventorXt ++ -lInventor -lInventorXt $(LLDLIBSCOMMON) + + all: all_ivbin + +--- inventor-2.1.5-10.orig/apps/demos/qmorf/GNUmakefile ++++ inventor-2.1.5-10/apps/demos/qmorf/GNUmakefile +@@ -6,7 +6,7 @@ + + CXXFILES = QuadThing.c++ Background.c++ FlashBackground.c++ + +-LLDLIBS = -lInventor -lInventorXt ++LLDLIBS = -lInventor -lInventorXt $(LLDLIBSCOMMON) + + all: all_ivbin + +--- inventor-2.1.5-10.orig/apps/demos/revo/GNUmakefile ++++ inventor-2.1.5-10/apps/demos/revo/GNUmakefile +@@ -10,7 +10,7 @@ + + LLDOPTS += -L../../samples/common + +-LLDLIBS = -lcommon -lInventor -lInventorXt ++LLDLIBS = -lcommon -lInventor -lInventorXt $(LLDLIBSCOMMON) + + all: all_ivbin + +--- inventor-2.1.5-10.orig/apps/demos/textomatic/GNUmakefile ++++ inventor-2.1.5-10/apps/demos/textomatic/GNUmakefile +@@ -8,7 +8,7 @@ + + LLDOPTS += -L../../samples/common + +-LLDLIBS = -lcommon -lInventor -lInventorXt ++LLDLIBS = -lcommon -lInventor -lInventorXt $(LLDLIBSCOMMON) + + all: all_ivbin + diff -Nru inventor-2.1.5-10/debian/patches/bison-workaround.patch inventor-2.1.5-10/debian/patches/bison-workaround.patch --- inventor-2.1.5-10/debian/patches/bison-workaround.patch 1970-01-01 00:00:00.000000000 +0000 +++ inventor-2.1.5-10/debian/patches/bison-workaround.patch 2011-09-25 03:15:31.000000000 +0000 @@ -0,0 +1,18 @@ +Description: Workaround bison bug + Change 2093 => 12093 in y.tab.c. + Workaround for bison bug (#176535,#177041,#177640). +Author: Steve M. Robbins +Bug-Debian: http://bugs.debian.org/178704 + + +--- inventor-2.1.5-10.orig/lib/database/src/so/engines/GNUmakefile ++++ inventor-2.1.5-10/lib/database/src/so/engines/GNUmakefile +@@ -15,7 +15,7 @@ SoEngines.c++: SoCalcParse.c++ + + SoCalcParse.c++: SoCalcParse.y + $(YACC) SoCalcParse.y +- sed -e 's/yy/SoCalc_yy/g' < y.tab.c > SoCalcParse.c++ ++ sed -e 's/yy/SoCalc_yy/g' -e 's/2093/12093/' < y.tab.c > SoCalcParse.c++ + + LDIRT += y.tab.c SoCalcParse.c++ + diff -Nru inventor-2.1.5-10/debian/patches/buildman.patch inventor-2.1.5-10/debian/patches/buildman.patch --- inventor-2.1.5-10/debian/patches/buildman.patch 1970-01-01 00:00:00.000000000 +0000 +++ inventor-2.1.5-10/debian/patches/buildman.patch 2011-09-25 03:15:31.000000000 +0000 @@ -0,0 +1,19 @@ +Description: Fix manpage build + Manpage building is enabled in debian/rules by setting + BUILDMAN. +Author: Steve M. Robbins + +--- inventor-2.1.5-10.orig/doc/GNUmakefile ++++ inventor-2.1.5-10/doc/GNUmakefile +@@ -1,7 +1,11 @@ + IVDEPTH = .. + include $(IVDEPTH)/make/ivcommondefs + ++ifdef BUILDMAN + SUBDIRS = help man ++else ++SUBDIRS = help ++endif + + all install: + $(SUBDIRS_MAKERULE) diff -Nru inventor-2.1.5-10/debian/patches/buildsystem.patch inventor-2.1.5-10/debian/patches/buildsystem.patch --- inventor-2.1.5-10/debian/patches/buildsystem.patch 1970-01-01 00:00:00.000000000 +0000 +++ inventor-2.1.5-10/debian/patches/buildsystem.patch 2011-09-25 03:15:31.000000000 +0000 @@ -0,0 +1,177 @@ +Description: Build library with complete SOVERSION +Author: Steve M. Robbins + +--- inventor-2.1.5-10.orig/lib/GNUmakefile ++++ inventor-2.1.5-10/lib/GNUmakefile +@@ -1,7 +1,12 @@ + IVDEPTH = .. +-include $(IVDEPTH)/make/ivcommondefs + +-LIBDSO = libInventor.so ++LIBMAJOR = 0 ++LIBMINOR = 0.0 ++LIBNAME = libInventor.so ++DSONAME = $(LIBNAME).$(LIBMAJOR) ++LIBDSO = $(LIBNAME).$(LIBMAJOR).$(LIBMINOR) ++ ++include $(IVDEPTH)/make/ivcommondefs + + LLDDSOOPTS += -L$(IVDEPTH)/libimage -L$(FLDIR) + +--- inventor-2.1.5-10.orig/libSoXt/GNUmakefile ++++ inventor-2.1.5-10/libSoXt/GNUmakefile +@@ -1,7 +1,12 @@ + IVDEPTH = .. +-include $(IVDEPTH)/make/ivcommondefs + +-LIBDSO = libInventorXt.so ++LIBMAJOR = 0 ++LIBMINOR = 0.0 ++LIBNAME = libInventorXt.so ++DSONAME = $(LIBNAME).$(LIBMAJOR) ++LIBDSO = $(LIBNAME).$(LIBMAJOR).$(LIBMINOR) ++ ++include $(IVDEPTH)/make/ivcommondefs + + LLDLIBS = \ + -lXm -lXt -lXext -lXi -lX11 -lm \ +--- inventor-2.1.5-10.orig/make/ivcommonrules ++++ inventor-2.1.5-10/make/ivcommonrules +@@ -23,6 +23,12 @@ LDIRT += $(SHAPEFILES) + + $(LIBDSO): $(LARCHIVE) + $(LD) $(LDDSOOPTS) $^ $(LDLIBS) $(POST_LDDSOOPTS) -o $@ ++ifneq ($(LIBNAME),) ++ $(LN_S) $@ $(LIBNAME) ++endif ++ifneq ($(DSONAME),) ++ $(LN_S) $@ $(DSONAME) ++endif + + $(LARCHIVE): + for i in $(SUBDIRS); do $(MAKE) -C$$i all || exit 1; done +@@ -32,6 +38,12 @@ $(LARCHIVE): + install_ivlibdso: $(LIBDSO) + mkdir -p $(IVLIBDIR) + $(INSTALL) -m 755 $< $(IVLIBDIR) ++ifneq ($(LIBNAME),) ++ $(LN_S) $< $(IVLIBDIR)/$(LIBNAME) ++endif ++ifneq ($(DSONAME),) ++ $(LN_S) $< $(IVLIBDIR)/$(DSONAME) ++endif + + if [ "$(LIBTYPE)" = "debug" ]; then \ + mkdir -p $(IVDLIBDIR); \ +@@ -101,22 +113,12 @@ install_ivbin: $(PROGRAM) + install_ivscript: + mkdir -p $(IVBINDIR) + $(INSTALL) -m 755 $(SCRIPT) $(IVBINDIR) +- if [ "$(IVPREFIX)" != "/usr" ]; then \ +- (cd $(IVBINDIR) && \ +- sed -e 's#/usr#'"$(IVPREFIX)"'#g' $(SCRIPT) > tmp && \ +- mv tmp $(SCRIPT)); \ +- fi + + install_ivdemo: $(DEMO) + mkdir -p $(IVDEMOBINDIR) $(IVDEMODATADIR) + $(INSTALL) -m 755 $(DEMO) $(IVDEMOBINDIR) + if [ -e $(DEMO).RUNME ]; then \ + $(INSTALL) -m 755 $(DEMO).RUNME $(IVDEMOBINDIR); \ +- if [ "$(IVPREFIX)" != "/usr" ]; then \ +- (cd $(IVDEMOBINDIR) && \ +- sed -e 's#/usr#'"$(IVPREFIX)"'#g' $(DEMO).RUNME > tmp && \ +- mv tmp $(DEMO).RUNME); \ +- fi; \ + fi + if [ -e $(DEMO).about ]; then \ + $(INSTALL) -m 644 $(DEMO).about $(IVDEMOBINDIR); \ +@@ -132,4 +134,4 @@ all_ivbin: $(LIBDSO) $(PROGRAM) $(PROGRA + $(BUNDLE) + + TARGETS += $(LIBDSO) $(PROGRAM) $(PROGRAMS_1) $(PROGRAMS_2) $(PROGRAMS_EXT) \ +- $(ARCHIVE) $(DSO) $(BUNDLE) ++ $(ARCHIVE) $(DSO) $(BUNDLE) $(LIBNAME) +--- inventor-2.1.5-10.orig/make/ivcommondefs ++++ inventor-2.1.5-10/make/ivcommondefs +@@ -54,10 +54,18 @@ C++ = /usr/bin/g++ + LD = /usr/bin/g++ + + INSTALL = /usr/bin/install ++LN_S = ln -sf + + # MKDEPOPT = -MD + +-GLDDSOOPTS = -shared -Wl,--whole-archive ++# The linker flag '-z defs' enforces symbol resolution at build time, ++# with the goal of catching any missing library reference [Policy 10.2]. ++# ++ ++GLDDSOOPTS = -shared -Wl,--whole-archive -Wl,-z,defs ++ifneq ($(DSONAME),) ++GLDDSOOPTS += -Wl,-soname=$(DSONAME) ++endif + POST_LDDSOOPTS = -Wl,--no-whole-archive + + endif +@@ -184,23 +192,46 @@ MAKEMANDIRS = $(IVMANDIR)/makeManDirs + # + + IVPREFIX = /usr +-LCXXOPTS += -DIVPREFIX=\"$(IVPREFIX)\" +-LCOPTS += -DIVPREFIX=\"$(IVPREFIX)\" ++_BINDIR = $(IVPREFIX)/bin ++_LIBDIR = $(IVPREFIX)/lib ++_HDRTOP = $(IVPREFIX)/include/Inventor ++_MAN1DIR = $(IVPREFIX)/share/man/man1 ++_MAN3DIR = $(IVPREFIX)/share/man/man3 ++_FONTPATH = $(IVPREFIX)/share/inventor/fonts ++_HELPDIR = $(IVPREFIX)/share/inventor/help ++_DATADIR = $(IVPREFIX)/share/inventor/data/models ++_MATERIALSDIR = $(IVPREFIX)/share/inventor/data/materials ++_TEXTURESDIR = $(IVPREFIX)/share/inventor/data/textures ++_DEMOBINDIR = $(IVPREFIX)/lib/inventor ++_DEMODATADIR = $(IVPREFIX)/share/inventor/data/demos + +-IVBINDIR = $(IVROOT)/$(IVPREFIX)/bin +-IVLIBDIR = $(IVROOT)/$(IVPREFIX)/lib ++IVBINDIR = $(IVROOT)$(_BINDIR) ++IVLIBDIR = $(IVROOT)$(_LIBDIR) + IVDLIBDIR = $(IVLIBDIR)/InventorDebug +-IVHDRTOP = $(IVROOT)/$(IVPREFIX)/include/Inventor ++IVHDRTOP = $(IVROOT)$(_HDRTOP) + IVHDRDIR = $(IVHDRTOP)/$(HDRSUBDIR) +-IVMAN1DIR = $(IVROOT)/$(IVPREFIX)/man/man1 +-IVMAN3DIR = $(IVROOT)/$(IVPREFIX)/man/man3 +-IVHELPDIR = $(IVROOT)/$(IVPREFIX)/share/help +-IVDATADIR = $(IVROOT)/$(IVPREFIX)/share/data/models +-IVDEMODIR = $(IVROOT)/$(IVPREFIX)/demos +-IVDEMOBINDIR = $(IVDEMODIR)/Inventor +-IVDEMODATADIR = $(IVDEMODIR)/data/Inventor +- +- ++IVMAN1DIR = $(IVROOT)$(_MAN1DIR) ++IVMAN3DIR = $(IVROOT)$(_MAN3DIR) ++IVHELPDIR = $(IVROOT)$(_HELPDIR) ++IVDATADIR = $(IVROOT)$(_DATADIR) ++IVMATERIALSDIR = $(IVROOT)$(_MATERIALSDIR) ++IVTEXTURESDIR = $(IVROOT)$(_TEXTURESDIR) ++IVDEMOBINDIR = $(IVROOT)$(_DEMOBINDIR) ++IVDEMODATADIR = $(IVROOT)$(_DEMODATADIR) ++ ++# Set "local" C++ defines to specify pathnames. ++# ++LCXXDEFS = -DIVBINDIR=\"$(_BINDIR)\" \ ++ -DIVLIBDIR=\"$(_LIBDIR)\" \ ++ -DIVHDRTOP=\"$(_HDRTOP)\" \ ++ -DIVFONTPATH=\"$(_FONTPATH)\" \ ++ -DIVHELPDIR=\"$(_HELPDIR)\" \ ++ -DIVDATADIR=\"$(_DATADIR)\" \ ++ -DIVMATERIALSDIR=\"$(_MATERIALSDIR)\" \ ++ -DIVTEXTURESDIR=\"$(_TEXTURESDIR)\" \ ++ -DIVDEMOBINDIR=\"$(_DEMOBINDIR)\" \ ++ -DIVDEMODATADIR=\"$(_DEMODATADIR)\" \ ++ -DPDFVIEWER=\"xpdf\" + + # + # Locate installed Inventor libraries when linking applications. diff -Nru inventor-2.1.5-10/debian/patches/configurability.patch inventor-2.1.5-10/debian/patches/configurability.patch --- inventor-2.1.5-10/debian/patches/configurability.patch 1970-01-01 00:00:00.000000000 +0000 +++ inventor-2.1.5-10/debian/patches/configurability.patch 2011-09-25 03:15:31.000000000 +0000 @@ -0,0 +1,364 @@ +Description: Configuration changes to fit in Debian system + This patch mainly contains changes that + 1. adapt directory structure; or + 2. allow configuring external program, e.g. PDF reader +Author: Steve M. Robbins + +--- inventor-2.1.5-10.orig/apps/samples/widgets/MyTextureEd.c++ ++++ inventor-2.1.5-10/apps/samples/widgets/MyTextureEd.c++ +@@ -228,7 +228,7 @@ struct PaletteStruct { + + + static char *customTextureDir = ".textures"; +-static char *defaultDir = IVPREFIX "/share/data/textures"; ++static char *defaultDir = IVTEXTURESDIR; + static char *editorTitle = "Texture Editor"; + static char *noFileNameStr = ""; + +--- inventor-2.1.5-10.orig/apps/samples/widgets/MyMtlPal.c++ ++++ inventor-2.1.5-10/apps/samples/widgets/MyMtlPal.c++ +@@ -193,7 +193,7 @@ static MenuStruct pulldownData[] = { + }; + + static char *editorTitle = "Material Palette"; +-static char *defaultDir = IVPREFIX "/share/data/materials"; ++static char *defaultDir = IVMATERIALSDIR; + + + static char *geometryBuffer = "\ +--- inventor-2.1.5-10.orig/apps/demos/qmorf/qmorf.RUNME ++++ inventor-2.1.5-10/apps/demos/qmorf/qmorf.RUNME +@@ -1,3 +1,3 @@ + #!/bin/sh + #Tag 0x00010510 +-/usr/demos/Inventor/qmorf /usr/share/data/models/CyberHeads/*.iv ++/usr/lib/inventor/qmorf /usr/share/inventor/data/models/CyberHeads/*.iv +--- inventor-2.1.5-10.orig/apps/demos/qmorf/qmorf.c++ ++++ inventor-2.1.5-10/apps/demos/qmorf/qmorf.c++ +@@ -413,8 +413,7 @@ parse_args(int argc, char **argv) + fprintf(stderr, "At least two files must be given, and " + "they must contain QuadMeshes (qmorf can\n"); + fprintf(stderr, "only morph QuadMesh nodes).\n"); +- fprintf(stderr, "The directory " +- IVPREFIX "/share/data/models/CyberHeads " ++ fprintf(stderr, "The directory " IVDATADIR "/CyberHeads " + "contains good data to morph.\n"); + + exit(7); +@@ -436,24 +435,24 @@ quitCallback(Widget, XtPointer, XtPointe + void + showAboutDialog(Widget, XtPointer, XtPointer) + { +- if (access(IVPREFIX "/demos/Inventor/qmorf.about", R_OK) != 0) ++ if (access(IVDEMOBINDIR"/qmorf.about", R_OK) != 0) + { + system("xmessage 'Sorry, could not find " +- IVPREFIX "/demos/Inventor/qmorf.about' > /dev/null"); ++ IVDEMOBINDIR"/qmorf.about' > /dev/null"); + return; + } + char command[100]; +- sprintf(command, "which acroread > /dev/null"); ++ sprintf(command, "which " PDFVIEWER " > /dev/null"); + + int err = system(command); + if (err) + { +- system("xmessage 'You must install acroread" ++ system("xmessage 'You must install " PDFVIEWER + " for this function to work' > /dev/null"); + return; + } + +- sprintf(command, "acroread " IVPREFIX "/demos/Inventor/qmorf.about &"); ++ sprintf(command, PDFVIEWER " " IVDEMOBINDIR "/qmorf.about &"); + system(command); + } + +--- inventor-2.1.5-10.orig/apps/demos/gview/gview.RUNME ++++ inventor-2.1.5-10/apps/demos/gview/gview.RUNME +@@ -1,3 +1,3 @@ + #!/bin/sh + #Tag 0x00010510 +-/usr/demos/Inventor/gview /usr/demos/data/Inventor/windmill.iv ++/usr/lib/inventor/gview /usr/share/inventor/data/demos/windmill.iv +--- inventor-2.1.5-10.orig/apps/demos/gview/DisplayGraph.c++ ++++ inventor-2.1.5-10/apps/demos/gview/DisplayGraph.c++ +@@ -67,7 +67,7 @@ SoNode *DisplayGraph::otherIcon; + SbDict *DisplayGraph::iconDict; + + #define ICON_FILE "gviewIcons.iv" +-#define ICON_INST_DIR IVPREFIX "/demos/data/Inventor" ++#define ICON_INST_DIR IVDEMODATADIR + #define ICON_ENV_VAR "IV_GRAPH_DIR" + + //////////////////////////////////////////////////////////////////////// +--- inventor-2.1.5-10.orig/apps/demos/textomatic/textomatic.c++ ++++ inventor-2.1.5-10/apps/demos/textomatic/textomatic.c++ +@@ -160,24 +160,24 @@ profileCallback(void *data, SoSensor *) + void + showAboutDialog(Widget, XtPointer, XtPointer) + { +- if (access(IVPREFIX "/demos/Inventor/textomatic.about", R_OK) != 0) ++ if (access(IVDEMOBINDIR"/textomatic.about", R_OK) != 0) + { + system("xmessage 'Sorry, could not find " +- IVPREFIX "/demos/Inventor/textomatic.about' > /dev/null"); ++ IVDEMOBINDIR"/textomatic.about' > /dev/null"); + return; + } + + char command[100]; +- sprintf(command, "which acroread > /dev/null"); ++ sprintf(command, "which " PDFVIEWER " > /dev/null"); + + int err = system(command); + if (err) { +- system("xmessage 'You must install acroread" ++ system("xmessage 'You must install " PDFVIEWER + " for this function to work' > /dev/null"); + return; + } + +- sprintf(command, "acroread " IVPREFIX "/demos/Inventor/textomatic.about &"); ++ sprintf(command, PDFVIEWER " " IVDEMOBINDIR"/textomatic.about &"); + system(command); + } + +--- inventor-2.1.5-10.orig/apps/demos/SceneViewer/SoSceneViewer.c++ ++++ inventor-2.1.5-10/apps/demos/SceneViewer/SoSceneViewer.c++ +@@ -4734,26 +4734,26 @@ SoSceneViewer::showAboutDialog() + // + //////////////////////////////////////////////////////////////////////// + { +- if (access(IVPREFIX "/demos/Inventor/SceneViewer.about", R_OK) != 0) ++ if (access(IVDEMOBINDIR "/SceneViewer.about", R_OK) != 0) + { + system("xmessage 'Sorry, could not find " +- IVPREFIX "/demos/Inventor/SceneViewer.about' > /dev/null"); ++ IVDEMOBINDIR "/SceneViewer.about' > /dev/null"); + return; + } + + char command[100]; +- sprintf(command, "which acroread > /dev/null"); ++ sprintf(command, "which " PDFVIEWER " > /dev/null"); + + int err = system(command); + if (err) + { +- system("xmessage 'You must install acroread" ++ system("xmessage 'You must install " PDFVIEWER + " for this function to work' > /dev/null"); + return; + } + +- sprintf(command, "acroread " +- IVPREFIX "/demos/Inventor/SceneViewer.about &"); ++ sprintf(command, PDFVIEWER " " ++ IVDEMOBINDIR "/SceneViewer.about &"); + system(command); + } + +--- inventor-2.1.5-10.orig/apps/demos/SceneViewer/SceneViewer.RUNME ++++ inventor-2.1.5-10/apps/demos/SceneViewer/SceneViewer.RUNME +@@ -1,4 +1,4 @@ + #!/bin/sh + #Tag 0x00010510 +-cd /usr/share/data/models +-/usr/demos/Inventor/SceneViewer /usr/demos/data/Inventor/jackInTheBox.iv ++cd /usr/share/inventor/data/models ++/usr/lib/inventor/SceneViewer /usr/share/inventor/data/demos/jackInTheBox.iv +--- inventor-2.1.5-10.orig/apps/demos/noodle/Interface.c++ ++++ inventor-2.1.5-10/apps/demos/noodle/Interface.c++ +@@ -399,23 +399,23 @@ Interface::createOkayCancelDialog(Widget + void + Interface::showAboutDialog() + { +- if (access(IVPREFIX "/demos/Inventor/noodle.about", R_OK) != 0) { ++ if (access(IVDEMOBINDIR"/noodle.about", R_OK) != 0) { + system("xmessage 'Sorry, could not find " +- IVPREFIX "/demos/Inventor/noodle.about' > /dev/null"); ++ IVDEMOBINDIR"/noodle.about' > /dev/null"); + return; + } + + char command[100]; +- sprintf(command, "which acroread > /dev/null"); ++ sprintf(command, "which " PDFVIEWER " > /dev/null"); + + int err = system(command); + if (err) { +- system("xmessage 'You must install acroread" ++ system("xmessage 'You must install " PDFVIEWER + " for this function to work' > /dev/null"); + return; + } + +- sprintf(command, "acroread " IVPREFIX "/demos/Inventor/noodle.about &"); ++ sprintf(command, PDFVIEWER " " IVDEMOBINDIR"/noodle.about &"); + system(command); + } + +--- inventor-2.1.5-10.orig/apps/demos/noodle/noodle.RUNME ++++ inventor-2.1.5-10/apps/demos/noodle/noodle.RUNME +@@ -1,3 +1,3 @@ + #!/bin/sh + #Tag 0x00010510 +-cd /usr/demos/data/Inventor; /usr/demos/Inventor/noodle ++cd /usr/share/inventor/data/demos; /usr/lib/inventor/noodle +--- inventor-2.1.5-10.orig/apps/demos/revo/revo.c++ ++++ inventor-2.1.5-10/apps/demos/revo/revo.c++ +@@ -78,25 +78,25 @@ extern void clearPoints(); + void + showAboutDialog(Widget, XtPointer, XtPointer) + { +- if (access(IVPREFIX "/demos/Inventor/revo.about", R_OK) != 0) ++ if (access(IVDEMOBINDIR "/revo.about", R_OK) != 0) + { + system("xmessage 'Sorry, could not find " +- IVPREFIX "/demos/Inventor/revo.about' > /dev/null"); ++ IVDEMOBINDIR "/revo.about' > /dev/null"); + return; + } + + char command[100]; +- sprintf(command, "which acroread >& /dev/null"); ++ sprintf(command, "which " PDFVIEWER " >& /dev/null"); + + int err = system(command); + if (err) + { +- system("xmessage 'You must install acroread" ++ system("xmessage 'You must install " PDFVIEWER + " for this function to work' > /dev/null"); + return; + } + +- sprintf(command, "acroread " IVPREFIX "/demos/Inventor/revo.about &"); ++ sprintf(command, PDFVIEWER " " IVDEMOBINDIR "/revo.about &"); + system(command); + } + +--- inventor-2.1.5-10.orig/apps/tools/ivview/ivview.c++ ++++ inventor-2.1.5-10/apps/tools/ivview/ivview.c++ +@@ -715,23 +715,23 @@ countUpdatesCB(void *, SoAction *action) + static void + showAboutDialog() + { +- if (access(IVPREFIX "/share/help/ivview/ivview.about", R_OK) != 0) { ++ if (access(IVHELPDIR"/ivview/ivview.about", R_OK) != 0) { + system("xmessage 'Sorry, could not find " +- IVPREFIX "/share/help/ivview/ivview.about' > /dev/null"); ++ IVHELPDIR"/ivview/ivview.about' > /dev/null"); + return; + } + + char command[100]; +- sprintf(command, "which acroread > /dev/null"); ++ sprintf(command, "which " PDFVIEWER " > /dev/null"); + + int err = system(command); + if (err) { +- system("xmessage 'You must install acroread" ++ system("xmessage 'You must install " PDFVIEWER + " for this function to work' > /dev/null"); + return; + } + +- sprintf(command, "acroread " IVPREFIX "/share/help/ivview/ivview.about &"); ++ sprintf(command, PDFVIEWER " "IVHELPDIR"/ivview/ivview.about &"); + system(command); + } + +--- inventor-2.1.5-10.orig/libSoXt/src/SoXtClipboard.c++ ++++ inventor-2.1.5-10/libSoXt/src/SoXtClipboard.c++ +@@ -658,7 +658,7 @@ SoXtClipboard::convertData( + char conversionCmd[BUFSIZE]; + const char *infile = tmpfile.getString(); + const char *outfile = tmpfile2.getString(); +- sprintf(conversionCmd, IVPREFIX "/bin/ivdowngrade -v 2.0 %s %s", infile, outfile); ++ sprintf(conversionCmd, IVBINDIR "/ivdowngrade -v 2.0 %s %s", infile, outfile); + + if (system(conversionCmd) == -1) { + #ifdef DEBUG +--- inventor-2.1.5-10.orig/libSoXt/src/SoXtComponent.c++ ++++ inventor-2.1.5-10/libSoXt/src/SoXtComponent.c++ +@@ -76,7 +76,7 @@ + + static char *helpDialogTitle = "Help Card Error Dialog"; + static char *helpCardError = "Inventor Help Cards not installed."; +-static char *helpPrgError = "acroread not installed on this system."; ++static char *helpPrgError = PDFVIEWER " not installed on this system."; + static char *thisClassName = "SoXtComponent"; + + // static members +@@ -561,7 +561,7 @@ SoXtComponent::unregisterWidget(Widget w + // card given the file name. By default the file will be searched using: + // 1) current working directory + // 2) SO_HELP_DIR environment variable +-// 3) $(IVPREFIX)/share/help/Inventor ++// 3) IVHELPDIR/Inventor + // 4) else bring a "No help card found message" + // + // Use: protected +@@ -573,7 +573,7 @@ SoXtComponent::openHelpCard(const char * + { + char pgrCmd[100]; + char cardPath[100]; +- strcpy(pgrCmd, "acroread "); ++ strcpy(pgrCmd, PDFVIEWER " "); + + #if 0 + // ??? make showcase come up single buffered on the Indigo. This should +@@ -591,7 +591,7 @@ SoXtComponent::openHelpCard(const char * + #endif + + char command[100]; +- sprintf(command, "which acroread > /dev/null"); ++ sprintf(command, "which " PDFVIEWER " > /dev/null"); + if (system(command) != 0) { + SoXt::createSimpleErrorDialog(_baseWidget, helpDialogTitle, helpPrgError); + return; +@@ -622,7 +622,7 @@ SoXtComponent::openHelpCard(const char * + } + + // else check for the default location +- strcpy(cardPath, IVPREFIX "/share/help/Inventor/"); ++ strcpy(cardPath, IVHELPDIR"/Inventor/"); + strcat(cardPath, cardName); + if ( access(cardPath, R_OK) == 0 ) { + strcat(pgrCmd, cardPath); +--- inventor-2.1.5-10.orig/libSoXt/src/mtlEdit/SoXtMtlList.c++ ++++ inventor-2.1.5-10/libSoXt/src/mtlEdit/SoXtMtlList.c++ +@@ -264,7 +264,7 @@ SoXtMaterialList::constructorCommon(cons + setClassName("SoXtMaterialList"); + if (dir != NULL) + materialDir = strdup(dir); +- else materialDir = strdup(IVPREFIX "/share/data/materials"); ++ else materialDir = strdup(IVMATERIALSDIR); + + callbackList = new SoCallbackList; + curPalette = -1; +--- inventor-2.1.5-10.orig/libSoXt/src/mtlEdit/SoXtMtlEdit.c++ ++++ inventor-2.1.5-10/libSoXt/src/mtlEdit/SoXtMtlEdit.c++ +@@ -156,7 +156,7 @@ static char *deftitles[]={ + "Material Emissive Color" + }; + +-static char *mtlDir = IVPREFIX "/share/data/materials"; ++static char *mtlDir = IVMATERIALSDIR; + + static char *slider_labels[] = { (char *)NULL, (char *)NULL, (char *)NULL, + (char *)NULL, (char *)NULL, (char *)NULL +--- inventor-2.1.5-10.orig/libFL/ang/fl.c ++++ inventor-2.1.5-10/libFL/ang/fl.c +@@ -95,7 +95,7 @@ static FLfontImpl *fontImplTable[] = { + NULL + }; + +-static char *fontPath = IVPREFIX "/share/data/fonts"; ++static char *fontPath = IVFONTPATH; + int fl_debug = FALSE; + + /* diff -Nru inventor-2.1.5-10/debian/patches/const-correctness.patch inventor-2.1.5-10/debian/patches/const-correctness.patch --- inventor-2.1.5-10/debian/patches/const-correctness.patch 1970-01-01 00:00:00.000000000 +0000 +++ inventor-2.1.5-10/debian/patches/const-correctness.patch 2011-09-25 03:15:31.000000000 +0000 @@ -0,0 +1,27 @@ +Description: Fix some const correctness +Author: Steve M. Robbins + +--- inventor-2.1.5-10.orig/lib/interaction/src/nodekits/SoInteractionKit.c++ ++++ inventor-2.1.5-10/lib/interaction/src/nodekits/SoInteractionKit.c++ +@@ -854,8 +854,8 @@ SoInteractionKit::setAnySurrogatePath( c + // (as in "childList[0].appearance") + // If so, get the string up to whichever came first. + // This will be the 'intermediary' we look for. +- char *dotPtr = strchr( partName.getString(), '.' ); +- char *brackPtr = strchr( partName.getString(), '[' ); ++ const char *dotPtr = strchr( partName.getString(), '.' ); ++ const char *brackPtr = strchr( partName.getString(), '[' ); + + if ( dotPtr != NULL || brackPtr != NULL ) { + char *nameCopy = strdup( partName.getString() ); +--- inventor-2.1.5-10.orig/lib/database/src/so/SoInput.c++ ++++ inventor-2.1.5-10/lib/database/src/so/SoInput.c++ +@@ -2810,7 +2810,7 @@ SoInput::addReference(const SbName &name + + if (addToGlobalDict) { + // Look for the first '+': +- char *firstPlus = strchr(n, '+'); ++ const char *firstPlus = strchr(n, '+'); + + if (firstPlus == NULL) { + base->setName(name); diff -Nru inventor-2.1.5-10/debian/patches/endianness.patch inventor-2.1.5-10/debian/patches/endianness.patch --- inventor-2.1.5-10/debian/patches/endianness.patch 1970-01-01 00:00:00.000000000 +0000 +++ inventor-2.1.5-10/debian/patches/endianness.patch 2011-09-25 03:15:31.000000000 +0000 @@ -0,0 +1,189 @@ +Description: Use to determine machine word order + The patch also generalizes the conditions for applying + some 64-bit hacks. +Author: Steve M. Robbins +Bug-Debian: http://bugs.debian.org/107470 + +--- inventor-2.1.5-10.orig/lib/database/include/machine.h ++++ inventor-2.1.5-10/lib/database/include/machine.h +@@ -176,6 +176,28 @@ extern int errno; /* missing from errno + #endif + + ++/* Added for Debian by Steve M. Robbins */ ++#if !defined(MACHINE_WORD_FORMAT) ++# include ++ ++# if __BYTE_ORDER == __BIG_ENDIAN ++# define MACHINE_WORD_FORMAT DGL_BIG_ENDIAN ++# elif __BYTE_ORDER == __LITTLE_ENDIAN ++# define MACHINE_WORD_FORMAT DGL_LITTLE_ENDIAN ++# else ++# error Inventor needs to be set up for your CPU type. ++# endif ++ ++# if __FLOAT_WORD_ORDER == __BIG_ENDIAN ++# define MACHINE_FLOAT_FORMAT DGL_BIG_IEEE ++# else ++# define MACHINE_FLOAT_FORMAT DGL_NON_IEEE ++# endif ++ ++#endif ++ ++ ++ + + /* + * 32/64-bit architecture dependent statements +@@ -321,12 +343,10 @@ extern float dgl_ntoh_double(); + */ + + #if MACHINE_FLOAT_FORMAT == DGL_NON_IEEE +-#if __i386__ || __ia64__ + void mem_hton_float(float *t, float *f); + void mem_ntoh_float(float *t, float *f); + void mem_hton_double(double *t, double *f); + void mem_ntoh_double(double *t, double *f); +-#endif /* __i386__ || __ia64__ */ + #define DGL_HTON_FLOAT(t,f) mem_hton_float(&t,&f) + #define DGL_NTOH_FLOAT(t,f) mem_ntoh_float(&t,&f) + #define DGL_HTON_DOUBLE(t,f) mem_hton_double(&t,&f) +@@ -350,4 +370,11 @@ void mem_ntoh_double(double *t, double * + #define SHORT(p) (*(short *)(p)) + #endif + ++/* Added for Debian by Steve M. Robbins */ ++#if (_MIPS_SZPTR == 64 || __ia64 || __x86_64 || __alpha__ || __powerpc64__) ++# define USE_64BIT_HACKS 1 ++#else ++# define USE_64BIT_HACKS 0 ++#endif ++ + #endif /* __MACHINE_H__ */ +--- inventor-2.1.5-10.orig/lib/interaction/src/draggers/SoDragger.c++ ++++ inventor-2.1.5-10/lib/interaction/src/draggers/SoDragger.c++ +@@ -52,6 +52,7 @@ + _______________________________________________________________________ + */ + ++#include + #include + + #include +@@ -686,7 +687,7 @@ SoDragger::isTempPathToThisOk() + int indexInPath = tempPathToThis->getIndex(numFmHead+1); + + int numKidsNow = children->getLength(); +-#if (_MIPS_SZPTR == 64 || __ia64) ++#if (USE_64BIT_HACKS) + int numKidsBefore = (int) ((long) (*tempPathNumKidsHack)[numFmHead]); + #else + int numKidsBefore = (int) (*tempPathNumKidsHack)[numFmHead]; +--- inventor-2.1.5-10.orig/lib/nodekits/src/upgraders/SoV1NkCatalog.c++ ++++ inventor-2.1.5-10/lib/nodekits/src/upgraders/SoV1NkCatalog.c++ +@@ -51,7 +51,7 @@ + _______________________________________________________________________ + */ + +- ++#include + #include + #include + #include +@@ -330,7 +330,7 @@ SoV1NodekitCatalog::getPartNumber( const + void *castPNum; + + if ( partNameDict.find( (unsigned long) theName.getString(), castPNum ) ) +-#if (_MIPS_SZPTR == 64 || __ia64) ++#if (USE_64BIT_HACKS) + return ( (int) ((long) castPNum) ); // System long + #else + return ( (int) castPNum ); +--- inventor-2.1.5-10.orig/lib/nodekits/src/nodekits/SoNkCatalog.c++ ++++ inventor-2.1.5-10/lib/nodekits/src/nodekits/SoNkCatalog.c++ +@@ -51,7 +51,7 @@ + _______________________________________________________________________ + */ + +- ++#include + #include + #include + #include +@@ -336,7 +336,7 @@ SoNodekitCatalog::getPartNumber( const S + void *castPNum; + + if ( partNameDict.find( (unsigned long) theName.getString(), castPNum ) ) +-#if (_MIPS_SZPTR == 64 || __ia64) ++#if (USE_64BIT_HACKS) + return ( (int) ((long) castPNum) ); // System long + #else + return ( (int) castPNum ); +--- inventor-2.1.5-10.orig/lib/database/src/sb/SbTime.c++ ++++ inventor-2.1.5-10/lib/database/src/sb/SbTime.c++ +@@ -51,6 +51,7 @@ + _______________________________________________________________________ + */ + ++#include + #include + #include + +@@ -264,7 +265,7 @@ SbTime::formatDate(const char *fmt) cons + { + char buf[200]; + +-#if (_MIPS_SZLONG == 64 || __ia64 || __APPLE__) ++#if (USE_64BIT_HACKS || __APPLE__) + int seconds; + seconds = (int) t.tv_sec; + strftime(buf, sizeof(buf), fmt, localtime((const time_t *) &seconds)); +--- inventor-2.1.5-10.orig/lib/database/src/so/SoOutput.c++ ++++ inventor-2.1.5-10/lib/database/src/so/SoOutput.c++ +@@ -1462,7 +1462,7 @@ SoOutput::findReference(const SoBase *ba + + // Generates a CC warning. Ho hum. + if (refDict->find((unsigned long) base, ref)) +-#if (_MIPS_SZPTR == 64 || __ia64) ++#if (USE_64BIT_HACKS) + referenceId = (int) ((unsigned long) ref); + #else + referenceId = (int)ref; +--- inventor-2.1.5-10.orig/lib/database/src/so/SoType.c++ ++++ inventor-2.1.5-10/lib/database/src/so/SoType.c++ +@@ -51,6 +51,7 @@ + _______________________________________________________________________ + */ + ++#include + #include + #include + #include +@@ -331,7 +332,7 @@ SoType::fromName(SbName name) + if (b == NULL) + return SoType::badType(); + +-#if (_MIPS_SZPTR == 64 || __ia64) ++#if (USE_64BIT_HACKS) + SoType result = typeData[(int) ((unsigned long) b)].type; + #else + SoType result = typeData[(int)b].type; +--- inventor-2.1.5-10.orig/libSoXt/src/SoXtRsrc.c++ ++++ inventor-2.1.5-10/libSoXt/src/SoXtRsrc.c++ +@@ -51,6 +51,7 @@ + _______________________________________________________________________ + */ + ++#include + #include + #include + #include +@@ -145,7 +146,7 @@ SoXtResource::SoXtResource(Widget widget + classList = new XrmQuark[listSize]; + for (q = 0, s = len - 1; + s >= 0; q++, s--) { +-#if (_MIPS_SZPTR == 64 || __ia64) ++#if (USE_64BIT_HACKS) + nameList[q] = (XrmQuark) ((long) nameplist[s]); + classList[q] = (XrmQuark) ((long) classplist[s]); + #else diff -Nru inventor-2.1.5-10/debian/patches/forward-declare.patch inventor-2.1.5-10/debian/patches/forward-declare.patch --- inventor-2.1.5-10/debian/patches/forward-declare.patch 1970-01-01 00:00:00.000000000 +0000 +++ inventor-2.1.5-10/debian/patches/forward-declare.patch 2011-09-25 03:15:31.000000000 +0000 @@ -0,0 +1,13 @@ +Description: Add missing forward declarations +Author: Steve M. Robbins + +--- inventor-2.1.5-10.orig/lib/database/include/Inventor/SoPath.h ++++ inventor-2.1.5-10/lib/database/include/Inventor/SoPath.h +@@ -79,6 +79,7 @@ + + class SoPathList; + class SoWriteAction; ++class SoTempPath; + + class SoPath : public SoBase { + diff -Nru inventor-2.1.5-10/debian/patches/freetype.patch inventor-2.1.5-10/debian/patches/freetype.patch --- inventor-2.1.5-10/debian/patches/freetype.patch 1970-01-01 00:00:00.000000000 +0000 +++ inventor-2.1.5-10/debian/patches/freetype.patch 2011-09-25 03:15:31.000000000 +0000 @@ -0,0 +1,87 @@ +--- inventor-2.1.5-10.orig/libFL/ang/flfreetype.h ++++ inventor-2.1.5-10/libFL/ang/flfreetype.h +@@ -1,7 +1,8 @@ + #ifndef __flfreetype_h_ + #define __flfreetype_h_ + +-#include ++#include ++#include FT_FREETYPE_H + + #ifndef __fl_h_ + #include "fl.h" +--- inventor-2.1.5-10.orig/libFL/ang/GNUmakefile ++++ inventor-2.1.5-10/libFL/ang/GNUmakefile +@@ -1,12 +1,16 @@ + IVDEPTH = ../.. + include $(IVDEPTH)/make/ivcommondefs + ++LCDEFS = $(LCXXDEFS) ++ + ARCHIVE = libFL.a + + LCINCS += -I/usr/include/freetype2 + + CFILES = fl.c flclient.c flfreetype.c + ++CFLAGS += -Wall -g ++ + all install: link all_ivbin + + link: +--- inventor-2.1.5-10.orig/libFL/ang/flfreetype.c ++++ inventor-2.1.5-10/libFL/ang/flfreetype.c +@@ -130,6 +130,8 @@ _flFTGetScalableBitmap(FLfontStruct *_fs + { + FLscalableBitmap *bit3; + ++ TRACE(("unfinished code called")); ++ + /* TODO */ + bit3 = NULL; + +@@ -202,6 +204,8 @@ _flFTGetBitmap(FLfontStruct *_fs, GLuint + bbox_height = BM_TRUNC(face->bbox.yMax - face->bbox.yMin); + + if (glyph->format == ft_glyph_format_outline) { ++ TRACE((" creating bitmap from outline glyph\n")); ++ + pitch = (width + 7) >> 3; + size = pitch * height; + pitch2 = ((width + (PIXEL_ROW_ALIGNMENT << 3) - 1) >> 5) << 2; +@@ -217,7 +221,7 @@ _flFTGetBitmap(FLfontStruct *_fs, GLuint + bit3->height = bit2.rows; + bit3->xorig = bearing_x; + bit3->yorig = height - bearing_y; +- bit3->xmove = width > 0 ? width : (bbox_width / 2.0); ++ bit3->xmove = width > 0 ? width : 10; /*(bbox_width / 2.0);*/ + bit3->ymove = 0.0; + bit3->bitmap = (GLubyte *) malloc(size2 * sizeof(GLubyte)); + +@@ -235,6 +239,7 @@ _flFTGetBitmap(FLfontStruct *_fs, GLuint + free(bit2.buffer); + } + else { ++ TRACE((" creating bitmap from non-outline glyph\n")); + bit3->width = glyph->bitmap.width; + bit3->height = glyph->bitmap.rows; + bit3->xorig = bearing_x; +@@ -244,6 +249,18 @@ _flFTGetBitmap(FLfontStruct *_fs, GLuint + bit3->bitmap = glyph->bitmap.buffer; + } + ++ /* debugging added by Steve, 2001-08-14 */ ++ TRACE((" glyph->metrics.horiBearingX = %d\n", glyph->metrics.horiBearingX)); ++ TRACE((" glyph->metrics.width = %d\n", glyph->metrics.width )); ++ TRACE((" left = %d\n", left )); ++ TRACE((" right = %d\n", right )); ++ TRACE((" width = %d\n", width )); ++ TRACE((" height = %d\n", height )); ++ TRACE((" face->bbox.xMax = %d\n", face->bbox.xMax )); ++ TRACE((" face->bbox.xMin = %d\n", face->bbox.xMin )); ++ TRACE((" bit3->xmove = %d\n", bit3->xmove )); ++ TRACE((" bbox_width = %d\n", bbox_width )); ++ + return bit3; + } + diff -Nru inventor-2.1.5-10/debian/patches/ivman.patch inventor-2.1.5-10/debian/patches/ivman.patch --- inventor-2.1.5-10/debian/patches/ivman.patch 1970-01-01 00:00:00.000000000 +0000 +++ inventor-2.1.5-10/debian/patches/ivman.patch 2011-09-25 03:15:31.000000000 +0000 @@ -0,0 +1,46 @@ +Description: build ivman cleanly +Author: Steve M. Robbins + +--- inventor-2.1.5-10.orig/doc/man/ivman/ClassDef.c++ ++++ inventor-2.1.5-10/doc/man/ivman/ClassDef.c++ +@@ -237,7 +237,7 @@ + + #define NUM_KEY_WORDS (sizeof(keywords) / sizeof(keywords[0])) + +- int i; ++ size_t i; + + if (names == NULL) { + names = new SbName[NUM_KEY_WORDS]; +--- inventor-2.1.5-10.orig/doc/man/ivman/Main.c++ ++++ inventor-2.1.5-10/doc/man/ivman/Main.c++ +@@ -89,7 +89,7 @@ + // + ///////////////////////////////////////////////////////////////////////////// + +-main(int argc, char *argv[]) ++int main(int argc, char *argv[]) + { + SbBool ok = TRUE; + int c, curArg; +--- inventor-2.1.5-10.orig/doc/man/ivman/Man.c++ ++++ inventor-2.1.5-10/doc/man/ivman/Man.c++ +@@ -806,7 +806,7 @@ + + #define NUM_OP_NAMES (sizeof(opNames) / sizeof(opNames[0])) + +- int op; ++ size_t op; + for (op = 0; op < NUM_OP_NAMES; op++) { + if (name == opNames[op][0]) { + name = opNames[op][1]; +--- inventor-2.1.5-10.orig/doc/man/ivman/Man.h ++++ inventor-2.1.5-10/doc/man/ivman/Man.h +@@ -131,6 +131,7 @@ + virtual void write(SbBool runIn) = 0; + virtual SbBool read() = 0; + virtual int getNumPreTabChars() const; ++ virtual ~Item() {} + protected: + Item(); + private: diff -Nru inventor-2.1.5-10/debian/patches/main-correctness.patch inventor-2.1.5-10/debian/patches/main-correctness.patch --- inventor-2.1.5-10/debian/patches/main-correctness.patch 1970-01-01 00:00:00.000000000 +0000 +++ inventor-2.1.5-10/debian/patches/main-correctness.patch 2011-09-25 03:15:31.000000000 +0000 @@ -0,0 +1,72 @@ +Description: Fix some const correctness +Author: Steve M. Robbins + +--- inventor-2.1.5-10.orig/apps/samples/widgets/componentTest.c++ ++++ inventor-2.1.5-10/apps/samples/widgets/componentTest.c++ +@@ -60,7 +60,7 @@ void usage(char *name) + } + + int +-main(unsigned int argc, char *argv[]) ++main(int argc, char *argv[]) + { + if (argc != 2) + usage(argv[0]); +@@ -85,4 +85,5 @@ main(unsigned int argc, char *argv[]) + XtRealizeWidget(mainWindow); + + SoXt::mainLoop(); ++ return 0; + } +--- inventor-2.1.5-10.orig/apps/demos/textomatic/textomatic.c++ ++++ inventor-2.1.5-10/apps/demos/textomatic/textomatic.c++ +@@ -548,4 +548,5 @@ main(int argc, char **argv) + + SoXt::show(w); + SoXt::mainLoop(); ++ return 0; + } +--- inventor-2.1.5-10.orig/apps/demos/SceneViewer/SceneViewer.c++ ++++ inventor-2.1.5-10/apps/demos/SceneViewer/SceneViewer.c++ +@@ -230,4 +230,5 @@ main(int argc, char **argv) + // Loop forever + // + SoXt::mainLoop(); ++ return 0; + } +--- inventor-2.1.5-10.orig/apps/demos/maze/maze.c++ ++++ inventor-2.1.5-10/apps/demos/maze/maze.c++ +@@ -1332,5 +1332,6 @@ main(int argc, char *argv[]) + + SoXt::show(mainWindow); + SoXt::mainLoop(); ++ return 0; + } + +--- inventor-2.1.5-10.orig/apps/demos/noodle/noodle.c++ ++++ inventor-2.1.5-10/apps/demos/noodle/noodle.c++ +@@ -679,5 +679,6 @@ main(int argc, char **argv) + SoXt::show(mainWindow); + + SoXt::mainLoop(); ++ return 0; + } + +--- inventor-2.1.5-10.orig/apps/demos/drop/drop.c++ ++++ inventor-2.1.5-10/apps/demos/drop/drop.c++ +@@ -93,6 +93,7 @@ main( int, char **argv ) + // Enter the Xt event loop + SoXt::show( appWindow ); + SoXt::mainLoop(); ++ return 0; + } + + +--- inventor-2.1.5-10.orig/apps/tools/ivview/ivview.c++ ++++ inventor-2.1.5-10/apps/tools/ivview/ivview.c++ +@@ -1170,4 +1170,5 @@ main(int argc, char **argv) + setBusyCursor(FALSE); + + SoXt::mainLoop(); ++ return 0; + } diff -Nru inventor-2.1.5-10/debian/patches/no-glw.patch inventor-2.1.5-10/debian/patches/no-glw.patch --- inventor-2.1.5-10/debian/patches/no-glw.patch 1970-01-01 00:00:00.000000000 +0000 +++ inventor-2.1.5-10/debian/patches/no-glw.patch 2011-11-18 17:39:57.000000000 +0000 @@ -0,0 +1,25 @@ +diff -pruN 2.1.5-10-14/apps/samples/widgets/GNUmakefile 2.1.5-10-14ubuntu3/apps/samples/widgets/GNUmakefile +--- 2.1.5-10-14/apps/samples/widgets/GNUmakefile 2000-09-18 07:51:58.000000000 +0000 ++++ 2.1.5-10-14ubuntu3/apps/samples/widgets/GNUmakefile 2011-09-04 15:50:42.000000000 +0000 +@@ -1,7 +1,7 @@ + IVDEPTH = ../../.. + include $(IVDEPTH)/make/ivcommondefs + +-PROGRAMS_EXT = libInventorWidget.a componentTest ++PROGRAMS_EXT = libInventorWidget.a + + all install $(COMMONTARGS): + for i in $(PROGRAMS_EXT); do $(MAKE) -f GNUmakefile.$$i $@; done +diff -pruN 2.1.5-10-14/apps/samples/widgets/GNUmakefile.libInventorWidget.a 2.1.5-10-14ubuntu3/apps/samples/widgets/GNUmakefile.libInventorWidget.a +--- 2.1.5-10-14/apps/samples/widgets/GNUmakefile.libInventorWidget.a 2001-09-25 00:45:26.000000000 +0000 ++++ 2.1.5-10-14ubuntu3/apps/samples/widgets/GNUmakefile.libInventorWidget.a 2011-09-04 15:50:42.000000000 +0000 +@@ -15,8 +15,7 @@ CXXFILES = \ + MyThumbWhl.c++ \ + MyFloatCBList.c++ \ + MySimpleMtlEditor.c++ \ +- MyMtlPal.c++ \ +- MyTextureEd.c++ ++ MyMtlPal.c++ + + all install: all_ivbin + diff -Nru inventor-2.1.5-10/debian/patches/series inventor-2.1.5-10/debian/patches/series --- inventor-2.1.5-10/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ inventor-2.1.5-10/debian/patches/series 2011-11-18 17:40:08.000000000 +0000 @@ -0,0 +1,14 @@ +configurability.patch +buildman.patch +buildsystem.patch +add-required-libs.patch +endianness.patch +ivman.patch +use-tcsh.patch +const-correctness.patch +main-correctness.patch +socalcparse.patch +bison-workaround.patch +forward-declare.patch +freetype.patch +no-glw.patch diff -Nru inventor-2.1.5-10/debian/patches/socalcparse.patch inventor-2.1.5-10/debian/patches/socalcparse.patch --- inventor-2.1.5-10/debian/patches/socalcparse.patch 1970-01-01 00:00:00.000000000 +0000 +++ inventor-2.1.5-10/debian/patches/socalcparse.patch 2011-09-25 03:15:31.000000000 +0000 @@ -0,0 +1,17 @@ +Description: Fix SoCalcParse.y so bison accepts it + Do not declare twice the same nonterminal with %type (bison suddenly got + picky about this). +Author: Steve M. Robbins +Bug-Debian: http://bugs.debian.org/165305 + +--- inventor-2.1.5-10.orig/lib/database/src/so/engines/SoCalcParse.y ++++ inventor-2.1.5-10/lib/database/src/so/engines/SoCalcParse.y +@@ -119,7 +119,7 @@ static struct { + %type asgn primary_expression postfix_expression + %type unary_expression + %type multiplicative_expression additive_expression +-%type additive_expression relational_expression ++%type relational_expression + %type equality_expression logical_AND_expression + %type logical_OR_expression conditional_expression + %type args diff -Nru inventor-2.1.5-10/debian/patches/use-tcsh.patch inventor-2.1.5-10/debian/patches/use-tcsh.patch --- inventor-2.1.5-10/debian/patches/use-tcsh.patch 1970-01-01 00:00:00.000000000 +0000 +++ inventor-2.1.5-10/debian/patches/use-tcsh.patch 2011-09-25 03:15:31.000000000 +0000 @@ -0,0 +1,11 @@ +Description: Use tcsh for script (workaround csh bug) +Author: Steve M. Robbins + +--- inventor-2.1.5-10.orig/doc/man/ivman/makeManDirs ++++ inventor-2.1.5-10/doc/man/ivman/makeManDirs +@@ -1,4 +1,4 @@ +-#!/bin/csh -f ++#! /usr/bin/tcsh -f + + # + # Prepares command line info to create a man page for the given class name diff -Nru inventor-2.1.5-10/debian/Patches/endianness inventor-2.1.5-10/debian/Patches/endianness --- inventor-2.1.5-10/debian/Patches/endianness 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/debian/Patches/endianness 1970-01-01 00:00:00.000000000 +0000 @@ -1,49 +0,0 @@ -Index: lib/database/include/machine.h -=================================================================== -RCS file: /home/steve/lib/cvs/debian/inventor/lib/database/include/machine.h,v -retrieving revision 1.1.1.2 -diff -u -b -B -r1.1.1.2 machine.h ---- lib/database/include/machine.h 25 Sep 2001 00:45:32 -0000 1.1.1.2 -+++ lib/database/include/machine.h 19 Feb 2002 19:11:41 -0000 -@@ -164,6 +164,28 @@ - #endif - - -+/* Added for Debian by Steve M. Robbins */ -+#if !defined(MACHINE_WORD_FORMAT) -+# include -+ -+# if __BYTE_ORDER == __BIG_ENDIAN -+# define MACHINE_WORD_FORMAT DGL_BIG_ENDIAN -+# elif __BYTE_ORDER == __LITTLE_ENDIAN -+# define MACHINE_WORD_FORMAT DGL_LITTLE_ENDIAN -+# else -+# error Inventor needs to be set up for your CPU type. -+# endif -+ -+# if __FLOAT_WORD_ORDER == __BIG_ENDIAN -+# define MACHINE_FLOAT_FORMAT DGL_BIG_IEEE -+# else -+# define MACHINE_FLOAT_FORMAT DGL_NON_IEEE -+# endif -+ -+#endif -+ -+ -+ - - /* - * 32/64-bit architecture dependent statements -@@ -309,12 +331,10 @@ - */ - - #if MACHINE_FLOAT_FORMAT == DGL_NON_IEEE --#if __i386__ || __ia64__ - void mem_hton_float(float *t, float *f); - void mem_ntoh_float(float *t, float *f); - void mem_hton_double(double *t, double *f); - void mem_ntoh_double(double *t, double *f); --#endif /* __i386__ || __ia64__ */ - #define DGL_HTON_FLOAT(t,f) mem_hton_float(&t,&f) - #define DGL_NTOH_FLOAT(t,f) mem_ntoh_float(&t,&f) - #define DGL_HTON_DOUBLE(t,f) mem_hton_double(&t,&f) diff -Nru inventor-2.1.5-10/debian/Patches/ivman.2004-06-02 inventor-2.1.5-10/debian/Patches/ivman.2004-06-02 --- inventor-2.1.5-10/debian/Patches/ivman.2004-06-02 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/debian/Patches/ivman.2004-06-02 1970-01-01 00:00:00.000000000 +0000 @@ -1,63 +0,0 @@ -Index: ivman/ClassDef.c++ -=================================================================== -RCS file: /home/steve/lib/cvs/debian/inventor/doc/man/ivman/ClassDef.c++,v -retrieving revision 1.1.1.1 -diff -u -b -B -r1.1.1.1 ClassDef.c++ ---- ivman/ClassDef.c++ 15 Aug 2000 12:56:12 -0000 1.1.1.1 -+++ ivman/ClassDef.c++ 1 Jun 2004 23:53:33 -0000 -@@ -237,7 +237,7 @@ - - #define NUM_KEY_WORDS (sizeof(keywords) / sizeof(keywords[0])) - -- int i; -+ size_t i; - - if (names == NULL) { - names = new SbName[NUM_KEY_WORDS]; -Index: ivman/Main.c++ -=================================================================== -RCS file: /home/steve/lib/cvs/debian/inventor/doc/man/ivman/Main.c++,v -retrieving revision 1.3 -diff -u -b -B -r1.3 Main.c++ ---- ivman/Main.c++ 28 Sep 2002 22:33:50 -0000 1.3 -+++ ivman/Main.c++ 1 Jun 2004 23:53:34 -0000 -@@ -89,7 +89,7 @@ - // - ///////////////////////////////////////////////////////////////////////////// - --main(int argc, char *argv[]) -+int main(int argc, char *argv[]) - { - SbBool ok = TRUE; - int c, curArg; -Index: ivman/Man.c++ -=================================================================== -RCS file: /home/steve/lib/cvs/debian/inventor/doc/man/ivman/Man.c++,v -retrieving revision 1.1.1.1 -diff -u -b -B -r1.1.1.1 Man.c++ ---- ivman/Man.c++ 14 Oct 2000 10:46:06 -0000 1.1.1.1 -+++ ivman/Man.c++ 1 Jun 2004 23:54:08 -0000 -@@ -806,7 +806,7 @@ - - #define NUM_OP_NAMES (sizeof(opNames) / sizeof(opNames[0])) - -- int op; -+ size_t op; - for (op = 0; op < NUM_OP_NAMES; op++) { - if (name == opNames[op][0]) { - name = opNames[op][1]; -Index: ivman/Man.h -=================================================================== -RCS file: /home/steve/lib/cvs/debian/inventor/doc/man/ivman/Man.h,v -retrieving revision 1.1.1.1 -diff -u -b -B -r1.1.1.1 Man.h ---- ivman/Man.h 15 Aug 2000 12:56:12 -0000 1.1.1.1 -+++ ivman/Man.h 1 Jun 2004 23:52:48 -0000 -@@ -131,6 +131,7 @@ - virtual void write(SbBool runIn) = 0; - virtual SbBool read() = 0; - virtual int getNumPreTabChars() const; -+ virtual ~Item() {} - protected: - Item(); - private: diff -Nru inventor-2.1.5-10/debian/rules inventor-2.1.5-10/debian/rules --- inventor-2.1.5-10/debian/rules 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/debian/rules 2011-09-25 03:15:32.000000000 +0000 @@ -45,6 +45,7 @@ export BUILDMAN=true endif + build: build-stamp build-stamp: dh_testdir @@ -129,10 +130,14 @@ binary-indep: build install $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common +build-indep: build + # Build architecture dependant packages using the common target. binary-arch: build install $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common +build-arch: build + # Any other binary targets build just one binary package at a time. binary-%: build install make -f debian/rules binary-common DH_OPTIONS=-p$* diff -Nru inventor-2.1.5-10/debian/source/format inventor-2.1.5-10/debian/source/format --- inventor-2.1.5-10/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ inventor-2.1.5-10/debian/source/format 2011-11-18 18:24:56.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru inventor-2.1.5-10/doc/GNUmakefile inventor-2.1.5-10/doc/GNUmakefile --- inventor-2.1.5-10/doc/GNUmakefile 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/doc/GNUmakefile 2000-11-14 02:49:52.000000000 +0000 @@ -1,11 +1,7 @@ IVDEPTH = .. include $(IVDEPTH)/make/ivcommondefs -ifdef BUILDMAN SUBDIRS = help man -else -SUBDIRS = help -endif all install: $(SUBDIRS_MAKERULE) diff -Nru inventor-2.1.5-10/doc/man/ivman/ClassDef.c++ inventor-2.1.5-10/doc/man/ivman/ClassDef.c++ --- inventor-2.1.5-10/doc/man/ivman/ClassDef.c++ 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/doc/man/ivman/ClassDef.c++ 2000-08-15 12:56:12.000000000 +0000 @@ -237,7 +237,7 @@ #define NUM_KEY_WORDS (sizeof(keywords) / sizeof(keywords[0])) - size_t i; + int i; if (names == NULL) { names = new SbName[NUM_KEY_WORDS]; diff -Nru inventor-2.1.5-10/doc/man/ivman/Main.c++ inventor-2.1.5-10/doc/man/ivman/Main.c++ --- inventor-2.1.5-10/doc/man/ivman/Main.c++ 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/doc/man/ivman/Main.c++ 2002-03-06 21:32:26.000000000 +0000 @@ -89,7 +89,7 @@ // ///////////////////////////////////////////////////////////////////////////// -int main(int argc, char *argv[]) +main(int argc, char *argv[]) { SbBool ok = TRUE; int c, curArg; diff -Nru inventor-2.1.5-10/doc/man/ivman/makeManDirs inventor-2.1.5-10/doc/man/ivman/makeManDirs --- inventor-2.1.5-10/doc/man/ivman/makeManDirs 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/doc/man/ivman/makeManDirs 2000-08-15 12:56:12.000000000 +0000 @@ -1,4 +1,4 @@ -#! /usr/bin/tcsh -f +#!/bin/csh -f # # Prepares command line info to create a man page for the given class name diff -Nru inventor-2.1.5-10/doc/man/ivman/Man.c++ inventor-2.1.5-10/doc/man/ivman/Man.c++ --- inventor-2.1.5-10/doc/man/ivman/Man.c++ 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/doc/man/ivman/Man.c++ 2000-10-14 10:46:06.000000000 +0000 @@ -806,7 +806,7 @@ #define NUM_OP_NAMES (sizeof(opNames) / sizeof(opNames[0])) - size_t op; + int op; for (op = 0; op < NUM_OP_NAMES; op++) { if (name == opNames[op][0]) { name = opNames[op][1]; diff -Nru inventor-2.1.5-10/doc/man/ivman/Man.h inventor-2.1.5-10/doc/man/ivman/Man.h --- inventor-2.1.5-10/doc/man/ivman/Man.h 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/doc/man/ivman/Man.h 2000-08-15 12:56:12.000000000 +0000 @@ -131,7 +131,6 @@ virtual void write(SbBool runIn) = 0; virtual SbBool read() = 0; virtual int getNumPreTabChars() const; - virtual ~Item() {} protected: Item(); private: diff -Nru inventor-2.1.5-10/lib/database/include/Inventor/SoPath.h inventor-2.1.5-10/lib/database/include/Inventor/SoPath.h --- inventor-2.1.5-10/lib/database/include/Inventor/SoPath.h 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/lib/database/include/Inventor/SoPath.h 2001-09-25 00:45:33.000000000 +0000 @@ -79,7 +79,6 @@ class SoPathList; class SoWriteAction; -class SoTempPath; class SoPath : public SoBase { diff -Nru inventor-2.1.5-10/lib/database/include/machine.h inventor-2.1.5-10/lib/database/include/machine.h --- inventor-2.1.5-10/lib/database/include/machine.h 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/lib/database/include/machine.h 2003-07-11 22:40:53.000000000 +0000 @@ -176,28 +176,6 @@ #endif -/* Added for Debian by Steve M. Robbins */ -#if !defined(MACHINE_WORD_FORMAT) -# include - -# if __BYTE_ORDER == __BIG_ENDIAN -# define MACHINE_WORD_FORMAT DGL_BIG_ENDIAN -# elif __BYTE_ORDER == __LITTLE_ENDIAN -# define MACHINE_WORD_FORMAT DGL_LITTLE_ENDIAN -# else -# error Inventor needs to be set up for your CPU type. -# endif - -# if __FLOAT_WORD_ORDER == __BIG_ENDIAN -# define MACHINE_FLOAT_FORMAT DGL_BIG_IEEE -# else -# define MACHINE_FLOAT_FORMAT DGL_NON_IEEE -# endif - -#endif - - - /* * 32/64-bit architecture dependent statements @@ -343,10 +321,12 @@ */ #if MACHINE_FLOAT_FORMAT == DGL_NON_IEEE +#if __i386__ || __ia64__ void mem_hton_float(float *t, float *f); void mem_ntoh_float(float *t, float *f); void mem_hton_double(double *t, double *f); void mem_ntoh_double(double *t, double *f); +#endif /* __i386__ || __ia64__ */ #define DGL_HTON_FLOAT(t,f) mem_hton_float(&t,&f) #define DGL_NTOH_FLOAT(t,f) mem_ntoh_float(&t,&f) #define DGL_HTON_DOUBLE(t,f) mem_hton_double(&t,&f) @@ -370,11 +350,4 @@ #define SHORT(p) (*(short *)(p)) #endif -/* Added for Debian by Steve M. Robbins */ -#if (_MIPS_SZPTR == 64 || __ia64 || __x86_64 || __alpha__ || __powerpc64__) -# define USE_64BIT_HACKS 1 -#else -# define USE_64BIT_HACKS 0 -#endif - #endif /* __MACHINE_H__ */ diff -Nru inventor-2.1.5-10/lib/database/src/sb/SbTime.c++ inventor-2.1.5-10/lib/database/src/sb/SbTime.c++ --- inventor-2.1.5-10/lib/database/src/sb/SbTime.c++ 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/lib/database/src/sb/SbTime.c++ 2003-07-11 22:40:53.000000000 +0000 @@ -51,7 +51,6 @@ _______________________________________________________________________ */ -#include #include #include @@ -265,7 +264,7 @@ { char buf[200]; -#if (USE_64BIT_HACKS || __APPLE__) +#if (_MIPS_SZLONG == 64 || __ia64 || __APPLE__) int seconds; seconds = (int) t.tv_sec; strftime(buf, sizeof(buf), fmt, localtime((const time_t *) &seconds)); diff -Nru inventor-2.1.5-10/lib/database/src/so/engines/GNUmakefile inventor-2.1.5-10/lib/database/src/so/engines/GNUmakefile --- inventor-2.1.5-10/lib/database/src/so/engines/GNUmakefile 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/lib/database/src/so/engines/GNUmakefile 2000-09-18 10:45:03.000000000 +0000 @@ -15,7 +15,7 @@ SoCalcParse.c++: SoCalcParse.y $(YACC) SoCalcParse.y - sed -e 's/yy/SoCalc_yy/g' -e 's/2093/12093/' < y.tab.c > SoCalcParse.c++ + sed -e 's/yy/SoCalc_yy/g' < y.tab.c > SoCalcParse.c++ LDIRT += y.tab.c SoCalcParse.c++ diff -Nru inventor-2.1.5-10/lib/database/src/so/engines/SoCalcParse.y inventor-2.1.5-10/lib/database/src/so/engines/SoCalcParse.y --- inventor-2.1.5-10/lib/database/src/so/engines/SoCalcParse.y 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/lib/database/src/so/engines/SoCalcParse.y 2003-07-11 22:40:53.000000000 +0000 @@ -119,7 +119,7 @@ %type asgn primary_expression postfix_expression %type unary_expression %type multiplicative_expression additive_expression -%type relational_expression +%type additive_expression relational_expression %type equality_expression logical_AND_expression %type logical_OR_expression conditional_expression %type args diff -Nru inventor-2.1.5-10/lib/database/src/so/SoInput.c++ inventor-2.1.5-10/lib/database/src/so/SoInput.c++ --- inventor-2.1.5-10/lib/database/src/so/SoInput.c++ 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/lib/database/src/so/SoInput.c++ 2000-10-25 23:47:47.000000000 +0000 @@ -2810,7 +2810,7 @@ if (addToGlobalDict) { // Look for the first '+': - const char *firstPlus = strchr(n, '+'); + char *firstPlus = strchr(n, '+'); if (firstPlus == NULL) { base->setName(name); diff -Nru inventor-2.1.5-10/lib/database/src/so/SoOutput.c++ inventor-2.1.5-10/lib/database/src/so/SoOutput.c++ --- inventor-2.1.5-10/lib/database/src/so/SoOutput.c++ 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/lib/database/src/so/SoOutput.c++ 2001-09-25 00:45:35.000000000 +0000 @@ -1462,7 +1462,7 @@ // Generates a CC warning. Ho hum. if (refDict->find((unsigned long) base, ref)) -#if (USE_64BIT_HACKS) +#if (_MIPS_SZPTR == 64 || __ia64) referenceId = (int) ((unsigned long) ref); #else referenceId = (int)ref; diff -Nru inventor-2.1.5-10/lib/database/src/so/SoType.c++ inventor-2.1.5-10/lib/database/src/so/SoType.c++ --- inventor-2.1.5-10/lib/database/src/so/SoType.c++ 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/lib/database/src/so/SoType.c++ 2003-07-11 22:40:53.000000000 +0000 @@ -51,7 +51,6 @@ _______________________________________________________________________ */ -#include #include #include #include @@ -332,7 +331,7 @@ if (b == NULL) return SoType::badType(); -#if (USE_64BIT_HACKS) +#if (_MIPS_SZPTR == 64 || __ia64) SoType result = typeData[(int) ((unsigned long) b)].type; #else SoType result = typeData[(int)b].type; diff -Nru inventor-2.1.5-10/lib/GNUmakefile inventor-2.1.5-10/lib/GNUmakefile --- inventor-2.1.5-10/lib/GNUmakefile 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/lib/GNUmakefile 2001-09-25 00:45:32.000000000 +0000 @@ -1,18 +1,14 @@ IVDEPTH = .. - -LIBMAJOR = 0 -LIBMINOR = 0.0 -LIBNAME = libInventor.so -DSONAME = $(LIBNAME).$(LIBMAJOR) -LIBDSO = $(LIBNAME).$(LIBMAJOR).$(LIBMINOR) - include $(IVDEPTH)/make/ivcommondefs +LIBDSO = libInventor.so + LLDDSOOPTS += -L$(IVDEPTH)/libimage -L$(FLDIR) LLDLIBS = \ -ljpeg -limage $(FLLIB) \ - -lGLU -lGL -lX11 -ldl -lm + -lX11 -lm \ + -lGLU -lGL OBJECTS = \ ./database/src/sb/projectors/SbProjectors.o \ diff -Nru inventor-2.1.5-10/lib/interaction/src/draggers/SoDragger.c++ inventor-2.1.5-10/lib/interaction/src/draggers/SoDragger.c++ --- inventor-2.1.5-10/lib/interaction/src/draggers/SoDragger.c++ 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/lib/interaction/src/draggers/SoDragger.c++ 2001-09-25 00:45:44.000000000 +0000 @@ -52,7 +52,6 @@ _______________________________________________________________________ */ -#include #include #include @@ -687,7 +686,7 @@ int indexInPath = tempPathToThis->getIndex(numFmHead+1); int numKidsNow = children->getLength(); -#if (USE_64BIT_HACKS) +#if (_MIPS_SZPTR == 64 || __ia64) int numKidsBefore = (int) ((long) (*tempPathNumKidsHack)[numFmHead]); #else int numKidsBefore = (int) (*tempPathNumKidsHack)[numFmHead]; diff -Nru inventor-2.1.5-10/lib/interaction/src/nodekits/SoInteractionKit.c++ inventor-2.1.5-10/lib/interaction/src/nodekits/SoInteractionKit.c++ --- inventor-2.1.5-10/lib/interaction/src/nodekits/SoInteractionKit.c++ 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/lib/interaction/src/nodekits/SoInteractionKit.c++ 2000-08-15 12:56:25.000000000 +0000 @@ -854,8 +854,8 @@ // (as in "childList[0].appearance") // If so, get the string up to whichever came first. // This will be the 'intermediary' we look for. - const char *dotPtr = strchr( partName.getString(), '.' ); - const char *brackPtr = strchr( partName.getString(), '[' ); + char *dotPtr = strchr( partName.getString(), '.' ); + char *brackPtr = strchr( partName.getString(), '[' ); if ( dotPtr != NULL || brackPtr != NULL ) { char *nameCopy = strdup( partName.getString() ); diff -Nru inventor-2.1.5-10/lib/nodekits/include/Inventor/nodekits/SoSubKit.h inventor-2.1.5-10/lib/nodekits/include/Inventor/nodekits/SoSubKit.h --- inventor-2.1.5-10/lib/nodekits/include/Inventor/nodekits/SoSubKit.h 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/lib/nodekits/include/Inventor/nodekits/SoSubKit.h 2000-08-15 12:56:26.000000000 +0000 @@ -192,7 +192,7 @@ // #define SO_KIT_SOURCE(className) \ - SO_NODE_SOURCE(className) \ + SO_NODE_SOURCE(className); \ SO__KIT_CATALOG_VARS(className); \ SO__KIT_CATALOG_METHODS(className) diff -Nru inventor-2.1.5-10/lib/nodekits/src/nodekits/SoNkCatalog.c++ inventor-2.1.5-10/lib/nodekits/src/nodekits/SoNkCatalog.c++ --- inventor-2.1.5-10/lib/nodekits/src/nodekits/SoNkCatalog.c++ 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/lib/nodekits/src/nodekits/SoNkCatalog.c++ 2001-09-25 00:45:46.000000000 +0000 @@ -51,7 +51,7 @@ _______________________________________________________________________ */ -#include + #include #include #include @@ -336,7 +336,7 @@ void *castPNum; if ( partNameDict.find( (unsigned long) theName.getString(), castPNum ) ) -#if (USE_64BIT_HACKS) +#if (_MIPS_SZPTR == 64 || __ia64) return ( (int) ((long) castPNum) ); // System long #else return ( (int) castPNum ); diff -Nru inventor-2.1.5-10/lib/nodekits/src/upgraders/SoV1NkCatalog.c++ inventor-2.1.5-10/lib/nodekits/src/upgraders/SoV1NkCatalog.c++ --- inventor-2.1.5-10/lib/nodekits/src/upgraders/SoV1NkCatalog.c++ 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/lib/nodekits/src/upgraders/SoV1NkCatalog.c++ 2001-09-25 00:45:47.000000000 +0000 @@ -51,7 +51,7 @@ _______________________________________________________________________ */ -#include + #include #include #include @@ -330,7 +330,7 @@ void *castPNum; if ( partNameDict.find( (unsigned long) theName.getString(), castPNum ) ) -#if (USE_64BIT_HACKS) +#if (_MIPS_SZPTR == 64 || __ia64) return ( (int) ((long) castPNum) ); // System long #else return ( (int) castPNum ); diff -Nru inventor-2.1.5-10/libFL/ang/fl.c inventor-2.1.5-10/libFL/ang/fl.c --- inventor-2.1.5-10/libFL/ang/fl.c 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/libFL/ang/fl.c 2003-07-11 22:40:53.000000000 +0000 @@ -95,7 +95,7 @@ NULL }; -static char *fontPath = IVFONTPATH; +static char *fontPath = IVPREFIX "/share/data/fonts"; int fl_debug = FALSE; /* diff -Nru inventor-2.1.5-10/libFL/ang/flfreetype.c inventor-2.1.5-10/libFL/ang/flfreetype.c --- inventor-2.1.5-10/libFL/ang/flfreetype.c 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/libFL/ang/flfreetype.c 2001-03-24 02:34:24.000000000 +0000 @@ -130,8 +130,6 @@ { FLscalableBitmap *bit3; - TRACE(("unfinished code called")); - /* TODO */ bit3 = NULL; @@ -204,8 +202,6 @@ bbox_height = BM_TRUNC(face->bbox.yMax - face->bbox.yMin); if (glyph->format == ft_glyph_format_outline) { - TRACE((" creating bitmap from outline glyph\n")); - pitch = (width + 7) >> 3; size = pitch * height; pitch2 = ((width + (PIXEL_ROW_ALIGNMENT << 3) - 1) >> 5) << 2; @@ -221,7 +217,7 @@ bit3->height = bit2.rows; bit3->xorig = bearing_x; bit3->yorig = height - bearing_y; - bit3->xmove = width > 0 ? width : 10; /*(bbox_width / 2.0);*/ + bit3->xmove = width > 0 ? width : (bbox_width / 2.0); bit3->ymove = 0.0; bit3->bitmap = (GLubyte *) malloc(size2 * sizeof(GLubyte)); @@ -239,7 +235,6 @@ free(bit2.buffer); } else { - TRACE((" creating bitmap from non-outline glyph\n")); bit3->width = glyph->bitmap.width; bit3->height = glyph->bitmap.rows; bit3->xorig = bearing_x; @@ -249,18 +244,6 @@ bit3->bitmap = glyph->bitmap.buffer; } - /* debugging added by Steve, 2001-08-14 */ - TRACE((" glyph->metrics.horiBearingX = %d\n", glyph->metrics.horiBearingX)); - TRACE((" glyph->metrics.width = %d\n", glyph->metrics.width )); - TRACE((" left = %d\n", left )); - TRACE((" right = %d\n", right )); - TRACE((" width = %d\n", width )); - TRACE((" height = %d\n", height )); - TRACE((" face->bbox.xMax = %d\n", face->bbox.xMax )); - TRACE((" face->bbox.xMin = %d\n", face->bbox.xMin )); - TRACE((" bit3->xmove = %d\n", bit3->xmove )); - TRACE((" bbox_width = %d\n", bbox_width )); - return bit3; } diff -Nru inventor-2.1.5-10/libFL/ang/flfreetype.h inventor-2.1.5-10/libFL/ang/flfreetype.h --- inventor-2.1.5-10/libFL/ang/flfreetype.h 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/libFL/ang/flfreetype.h 2001-03-24 02:34:24.000000000 +0000 @@ -1,8 +1,7 @@ #ifndef __flfreetype_h_ #define __flfreetype_h_ -#include -#include FT_FREETYPE_H +#include #ifndef __fl_h_ #include "fl.h" diff -Nru inventor-2.1.5-10/libFL/ang/GNUmakefile inventor-2.1.5-10/libFL/ang/GNUmakefile --- inventor-2.1.5-10/libFL/ang/GNUmakefile 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/libFL/ang/GNUmakefile 2001-03-24 02:34:24.000000000 +0000 @@ -1,16 +1,12 @@ IVDEPTH = ../.. include $(IVDEPTH)/make/ivcommondefs -LCDEFS = $(LCXXDEFS) - ARCHIVE = libFL.a LCINCS += -I/usr/include/freetype2 CFILES = fl.c flclient.c flfreetype.c -CFLAGS += -Wall -g - all install: link all_ivbin link: diff -Nru inventor-2.1.5-10/libSoXt/GNUmakefile inventor-2.1.5-10/libSoXt/GNUmakefile --- inventor-2.1.5-10/libSoXt/GNUmakefile 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/libSoXt/GNUmakefile 2000-10-14 10:46:08.000000000 +0000 @@ -1,13 +1,8 @@ IVDEPTH = .. - -LIBMAJOR = 0 -LIBMINOR = 0.0 -LIBNAME = libInventorXt.so -DSONAME = $(LIBNAME).$(LIBMAJOR) -LIBDSO = $(LIBNAME).$(LIBMAJOR).$(LIBMINOR) - include $(IVDEPTH)/make/ivcommondefs +LIBDSO = libInventorXt.so + LLDLIBS = \ -lXm -lXt -lXext -lXi -lX11 -lm \ -lInventor -lGLU -lGL diff -Nru inventor-2.1.5-10/libSoXt/src/mtlEdit/SoXtMtlEdit.c++ inventor-2.1.5-10/libSoXt/src/mtlEdit/SoXtMtlEdit.c++ --- inventor-2.1.5-10/libSoXt/src/mtlEdit/SoXtMtlEdit.c++ 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/libSoXt/src/mtlEdit/SoXtMtlEdit.c++ 2002-06-01 02:16:10.000000000 +0000 @@ -156,7 +156,7 @@ "Material Emissive Color" }; -static char *mtlDir = IVMATERIALSDIR; +static char *mtlDir = IVPREFIX "/share/data/materials"; static char *slider_labels[] = { (char *)NULL, (char *)NULL, (char *)NULL, (char *)NULL, (char *)NULL, (char *)NULL diff -Nru inventor-2.1.5-10/libSoXt/src/mtlEdit/SoXtMtlList.c++ inventor-2.1.5-10/libSoXt/src/mtlEdit/SoXtMtlList.c++ --- inventor-2.1.5-10/libSoXt/src/mtlEdit/SoXtMtlList.c++ 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/libSoXt/src/mtlEdit/SoXtMtlList.c++ 2002-06-01 02:16:10.000000000 +0000 @@ -264,7 +264,7 @@ setClassName("SoXtMaterialList"); if (dir != NULL) materialDir = strdup(dir); - else materialDir = strdup(IVMATERIALSDIR); + else materialDir = strdup(IVPREFIX "/share/data/materials"); callbackList = new SoCallbackList; curPalette = -1; diff -Nru inventor-2.1.5-10/libSoXt/src/SoXtClipboard.c++ inventor-2.1.5-10/libSoXt/src/SoXtClipboard.c++ --- inventor-2.1.5-10/libSoXt/src/SoXtClipboard.c++ 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/libSoXt/src/SoXtClipboard.c++ 2002-06-01 02:16:10.000000000 +0000 @@ -658,7 +658,7 @@ char conversionCmd[BUFSIZE]; const char *infile = tmpfile.getString(); const char *outfile = tmpfile2.getString(); - sprintf(conversionCmd, IVBINDIR "/ivdowngrade -v 2.0 %s %s", infile, outfile); + sprintf(conversionCmd, IVPREFIX "/bin/ivdowngrade -v 2.0 %s %s", infile, outfile); if (system(conversionCmd) == -1) { #ifdef DEBUG diff -Nru inventor-2.1.5-10/libSoXt/src/SoXtComponent.c++ inventor-2.1.5-10/libSoXt/src/SoXtComponent.c++ --- inventor-2.1.5-10/libSoXt/src/SoXtComponent.c++ 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/libSoXt/src/SoXtComponent.c++ 2002-06-01 02:16:10.000000000 +0000 @@ -76,7 +76,7 @@ static char *helpDialogTitle = "Help Card Error Dialog"; static char *helpCardError = "Inventor Help Cards not installed."; -static char *helpPrgError = PDFVIEWER " not installed on this system."; +static char *helpPrgError = "acroread not installed on this system."; static char *thisClassName = "SoXtComponent"; // static members @@ -561,7 +561,7 @@ // card given the file name. By default the file will be searched using: // 1) current working directory // 2) SO_HELP_DIR environment variable -// 3) IVHELPDIR/Inventor +// 3) $(IVPREFIX)/share/help/Inventor // 4) else bring a "No help card found message" // // Use: protected @@ -573,7 +573,7 @@ { char pgrCmd[100]; char cardPath[100]; - strcpy(pgrCmd, PDFVIEWER " "); + strcpy(pgrCmd, "acroread "); #if 0 // ??? make showcase come up single buffered on the Indigo. This should @@ -591,7 +591,7 @@ #endif char command[100]; - sprintf(command, "which " PDFVIEWER " > /dev/null"); + sprintf(command, "which acroread > /dev/null"); if (system(command) != 0) { SoXt::createSimpleErrorDialog(_baseWidget, helpDialogTitle, helpPrgError); return; @@ -622,7 +622,7 @@ } // else check for the default location - strcpy(cardPath, IVHELPDIR"/Inventor/"); + strcpy(cardPath, IVPREFIX "/share/help/Inventor/"); strcat(cardPath, cardName); if ( access(cardPath, R_OK) == 0 ) { strcat(pgrCmd, cardPath); diff -Nru inventor-2.1.5-10/libSoXt/src/SoXtRsrc.c++ inventor-2.1.5-10/libSoXt/src/SoXtRsrc.c++ --- inventor-2.1.5-10/libSoXt/src/SoXtRsrc.c++ 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/libSoXt/src/SoXtRsrc.c++ 2001-09-25 00:45:48.000000000 +0000 @@ -51,7 +51,6 @@ _______________________________________________________________________ */ -#include #include #include #include @@ -146,7 +145,7 @@ classList = new XrmQuark[listSize]; for (q = 0, s = len - 1; s >= 0; q++, s--) { -#if (USE_64BIT_HACKS) +#if (_MIPS_SZPTR == 64 || __ia64) nameList[q] = (XrmQuark) ((long) nameplist[s]); classList[q] = (XrmQuark) ((long) classplist[s]); #else diff -Nru inventor-2.1.5-10/make/ivcommondefs inventor-2.1.5-10/make/ivcommondefs --- inventor-2.1.5-10/make/ivcommondefs 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/make/ivcommondefs 2003-07-11 22:40:54.000000000 +0000 @@ -54,18 +54,10 @@ LD = /usr/bin/g++ INSTALL = /usr/bin/install -LN_S = ln -sf # MKDEPOPT = -MD -# The linker flag '-z defs' enforces symbol resolution at build time, -# with the goal of catching any missing library reference [Policy 10.2]. -# - -GLDDSOOPTS = -shared -Wl,--whole-archive -Wl,-z,defs -ifneq ($(DSONAME),) -GLDDSOOPTS += -Wl,-soname=$(DSONAME) -endif +GLDDSOOPTS = -shared -Wl,--whole-archive POST_LDDSOOPTS = -Wl,--no-whole-archive endif @@ -192,46 +184,23 @@ # IVPREFIX = /usr -_BINDIR = $(IVPREFIX)/bin -_LIBDIR = $(IVPREFIX)/lib -_HDRTOP = $(IVPREFIX)/include/Inventor -_MAN1DIR = $(IVPREFIX)/share/man/man1 -_MAN3DIR = $(IVPREFIX)/share/man/man3 -_FONTPATH = $(IVPREFIX)/share/inventor/fonts -_HELPDIR = $(IVPREFIX)/share/inventor/help -_DATADIR = $(IVPREFIX)/share/inventor/data/models -_MATERIALSDIR = $(IVPREFIX)/share/inventor/data/materials -_TEXTURESDIR = $(IVPREFIX)/share/inventor/data/textures -_DEMOBINDIR = $(IVPREFIX)/lib/inventor -_DEMODATADIR = $(IVPREFIX)/share/inventor/data/demos +LCXXOPTS += -DIVPREFIX=\"$(IVPREFIX)\" +LCOPTS += -DIVPREFIX=\"$(IVPREFIX)\" -IVBINDIR = $(IVROOT)$(_BINDIR) -IVLIBDIR = $(IVROOT)$(_LIBDIR) +IVBINDIR = $(IVROOT)/$(IVPREFIX)/bin +IVLIBDIR = $(IVROOT)/$(IVPREFIX)/lib IVDLIBDIR = $(IVLIBDIR)/InventorDebug -IVHDRTOP = $(IVROOT)$(_HDRTOP) +IVHDRTOP = $(IVROOT)/$(IVPREFIX)/include/Inventor IVHDRDIR = $(IVHDRTOP)/$(HDRSUBDIR) -IVMAN1DIR = $(IVROOT)$(_MAN1DIR) -IVMAN3DIR = $(IVROOT)$(_MAN3DIR) -IVHELPDIR = $(IVROOT)$(_HELPDIR) -IVDATADIR = $(IVROOT)$(_DATADIR) -IVMATERIALSDIR = $(IVROOT)$(_MATERIALSDIR) -IVTEXTURESDIR = $(IVROOT)$(_TEXTURESDIR) -IVDEMOBINDIR = $(IVROOT)$(_DEMOBINDIR) -IVDEMODATADIR = $(IVROOT)$(_DEMODATADIR) - -# Set "local" C++ defines to specify pathnames. -# -LCXXDEFS = -DIVBINDIR=\"$(_BINDIR)\" \ - -DIVLIBDIR=\"$(_LIBDIR)\" \ - -DIVHDRTOP=\"$(_HDRTOP)\" \ - -DIVFONTPATH=\"$(_FONTPATH)\" \ - -DIVHELPDIR=\"$(_HELPDIR)\" \ - -DIVDATADIR=\"$(_DATADIR)\" \ - -DIVMATERIALSDIR=\"$(_MATERIALSDIR)\" \ - -DIVTEXTURESDIR=\"$(_TEXTURESDIR)\" \ - -DIVDEMOBINDIR=\"$(_DEMOBINDIR)\" \ - -DIVDEMODATADIR=\"$(_DEMODATADIR)\" \ - -DPDFVIEWER=\"xpdf\" +IVMAN1DIR = $(IVROOT)/$(IVPREFIX)/man/man1 +IVMAN3DIR = $(IVROOT)/$(IVPREFIX)/man/man3 +IVHELPDIR = $(IVROOT)/$(IVPREFIX)/share/help +IVDATADIR = $(IVROOT)/$(IVPREFIX)/share/data/models +IVDEMODIR = $(IVROOT)/$(IVPREFIX)/demos +IVDEMOBINDIR = $(IVDEMODIR)/Inventor +IVDEMODATADIR = $(IVDEMODIR)/data/Inventor + + # # Locate installed Inventor libraries when linking applications. diff -Nru inventor-2.1.5-10/make/ivcommonrules inventor-2.1.5-10/make/ivcommonrules --- inventor-2.1.5-10/make/ivcommonrules 2011-11-18 18:24:53.000000000 +0000 +++ inventor-2.1.5-10/make/ivcommonrules 2003-07-11 22:40:54.000000000 +0000 @@ -23,12 +23,6 @@ $(LIBDSO): $(LARCHIVE) $(LD) $(LDDSOOPTS) $^ $(LDLIBS) $(POST_LDDSOOPTS) -o $@ -ifneq ($(LIBNAME),) - $(LN_S) $@ $(LIBNAME) -endif -ifneq ($(DSONAME),) - $(LN_S) $@ $(DSONAME) -endif $(LARCHIVE): for i in $(SUBDIRS); do $(MAKE) -C$$i all || exit 1; done @@ -38,12 +32,6 @@ install_ivlibdso: $(LIBDSO) mkdir -p $(IVLIBDIR) $(INSTALL) -m 755 $< $(IVLIBDIR) -ifneq ($(LIBNAME),) - $(LN_S) $< $(IVLIBDIR)/$(LIBNAME) -endif -ifneq ($(DSONAME),) - $(LN_S) $< $(IVLIBDIR)/$(DSONAME) -endif if [ "$(LIBTYPE)" = "debug" ]; then \ mkdir -p $(IVDLIBDIR); \ @@ -113,12 +101,22 @@ install_ivscript: mkdir -p $(IVBINDIR) $(INSTALL) -m 755 $(SCRIPT) $(IVBINDIR) + if [ "$(IVPREFIX)" != "/usr" ]; then \ + (cd $(IVBINDIR) && \ + sed -e 's#/usr#'"$(IVPREFIX)"'#g' $(SCRIPT) > tmp && \ + mv tmp $(SCRIPT)); \ + fi install_ivdemo: $(DEMO) mkdir -p $(IVDEMOBINDIR) $(IVDEMODATADIR) $(INSTALL) -m 755 $(DEMO) $(IVDEMOBINDIR) if [ -e $(DEMO).RUNME ]; then \ $(INSTALL) -m 755 $(DEMO).RUNME $(IVDEMOBINDIR); \ + if [ "$(IVPREFIX)" != "/usr" ]; then \ + (cd $(IVDEMOBINDIR) && \ + sed -e 's#/usr#'"$(IVPREFIX)"'#g' $(DEMO).RUNME > tmp && \ + mv tmp $(DEMO).RUNME); \ + fi; \ fi if [ -e $(DEMO).about ]; then \ $(INSTALL) -m 644 $(DEMO).about $(IVDEMOBINDIR); \ @@ -134,4 +132,4 @@ $(BUNDLE) TARGETS += $(LIBDSO) $(PROGRAM) $(PROGRAMS_1) $(PROGRAMS_2) $(PROGRAMS_EXT) \ - $(ARCHIVE) $(DSO) $(BUNDLE) $(LIBNAME) + $(ARCHIVE) $(DSO) $(BUNDLE)