[packages/openinventor] - updated to 2.1.5-10 - updated link,paths,nobash,morearchs patches - removed obsolete gcc3 patch -
qboosh
qboosh at pld-linux.org
Sun Nov 2 18:26:46 CET 2014
commit fd6f17190135b9943e8b5bde1e7f572efe714caa
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Nov 2 18:26:54 2014 +0100
- updated to 2.1.5-10
- updated link,paths,nobash,morearchs patches
- removed obsolete gcc3 patch
- added c++ patch (C++ dialect update)
openinventor-c++.patch | 34 ++++++
openinventor-gcc3.patch | 204 -----------------------------------
openinventor-link.patch | 55 ++++++----
openinventor-morearchs.patch | 28 +++--
openinventor-nobash.patch | 60 -----------
openinventor-nodisplay.patch | 11 --
openinventor-paths.patch | 245 +++++++++++++++++++++++--------------------
openinventor.spec | 132 ++++++++++++++---------
8 files changed, 296 insertions(+), 473 deletions(-)
---
diff --git a/openinventor.spec b/openinventor.spec
index 9703924..40c119b 100644
--- a/openinventor.spec
+++ b/openinventor.spec
@@ -1,40 +1,43 @@
Summary: Open Inventor 3D toolkit
Summary(pl.UTF-8): Open Inventor - toolkit 3D
Name: openinventor
-Version: 2.1.5
-%define subver 7
-Release: %{subver}.5
-License: LGPL
+%define ver 2.1.5
+%define subver 10
+Version: %{ver}.%{subver}
+Release: 1
+License: LGPL v2.1+
Group: X11/Applications/Graphics
-Source0: ftp://oss.sgi.com/projects/inventor/download/inventor-%{version}-%{subver}.src.tar.gz
-# Source0-md5: 7932d15f142c99a6c5695c0b4a9a8dac
+Source0: ftp://oss.sgi.com/projects/inventor/download/inventor-%{ver}-%{subver}.src.tar.gz
+# Source0-md5: 82208096f1e0b111160e864e239c3a51
Patch0: %{name}-glibc.patch
Patch1: %{name}-link.patch
Patch2: %{name}-install.patch
-Patch3: %{name}-nodisplay.patch
+Patch3: %{name}-c++.patch
Patch4: %{name}-paths.patch
Patch5: %{name}-nobash.patch
-Patch6: %{name}-gcc3.patch
Patch7: %{name}-dprintf.patch
Patch8: %{name}-morearchs.patch
Patch9: %{name}-freetype-includes.patch
Patch10: %{name}-bison.patch
URL: http://oss.sgi.com/projects/inventor/
BuildRequires: OpenGL-devel
-BuildRequires: XFree86-devel => 3.3.6
+BuildRequires: OpenGL-GLU-devel
BuildRequires: bison
BuildRequires: flex
BuildRequires: freetype >= 2.0.1
BuildRequires: libstdc++-devel
BuildRequires: libjpeg-devel
BuildRequires: motif-devel
-Requires: OpenGL
+BuildRequires: xorg-lib-libX11-devel
+BuildRequires: xorg-lib-libXext-devel
+BuildRequires: xorg-lib-libXi-devel
+BuildRequires: xorg-lib-libXt-devel
+BuildRequires: xorg-lib-libXp-devel
+Requires: %{name}-libs = %{version}-%{release}
Obsoletes: sgi-OpenInventor-clients
Obsoletes: sgi-OpenInventor-data
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define _noautoreqdep libGL.so.1 libGLU.so.1
-
%description
The Open Inventor 3D Toolkit is an object-oriented toolkit that
simplifies and abstracts the task of writing graphics programming into
@@ -51,16 +54,36 @@ objects in the database and thus are simple to invoke.
%description -l pl.UTF-8
Open Inventor jest zorientowanym obiektowo toolkitem 3D, który
-upraszcza zadanie programowania grafiki do zestawu łatwych do użycia
+upraszcza zadanie programowania grafiki do zestawu łatwych w użyciu
obiektów. Można używać obiektów począwszy od niskiego poziomu,
-związanego z danymi (np. kula, kamera, materiał, światło) do
-wysokiego, związanego z aplikacją (np. edytor materiałów).
+związanego z danymi (np. sfera, kamera, materiał, światło, grupa) do
+wysokiego, związanego z aplikacją (np. przeglądarka ścieżki, edytor
+materiałów). Podstawową ideą w Inventorze jest "bza danych sceny",
+definiująca obiekty, jakie mają być użyte w aplikacji. Przy użyciu
+Inventora programista tworzy, modyfikuje i komponuje te obiekty w
+hierarchiczne grafy sceny trójwymiarowej (czyli bazę danych). Wiele
+podstawowych zadań aplikacji, takich jak renderowanie, wybieranie,
+obsługa elementów oraz odczyt/zapis plików są wbudowanymi operacjami
+wszystkich obiektów w bazie danych, dzięki czemu są łatwe do
+wywołania.
+
+%package libs
+Summary: Open Inventor shared libraries
+Summary(pl.UTF-8): Biblioteki współdzielone Open Inventora
+Group: X11/Libraries
+Conflicts: openinventor < 2.1.5.10
+
+%description libs
+Open Inventor shared libraries.
+
+%description libs -l pl.UTF-8
+Biblioteki współdzielone Open Inventora.
%package devel
Summary: Open Inventor for programmers
Summary(pl.UTF-8): Open Inventor dla programistów
Group: X11/Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
Obsoletes: sgi-OpenInventor-devel
%description devel
@@ -103,94 +126,103 @@ Programy demonstrujące możliwości Open Inventora.
%patch3 -p1
%patch4 -p1
%patch5 -p1
-%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
-# use freetype-based libFL instead of precompiled x86 binary libFL.a
-rm -f libFL/src/libFL.a
-
%build
-FREETYPE=1; export FREETYPE
-
-LD_LIBRARY_PATH="`pwd`/lib:`pwd`/libSoXt"; export LD_LIBRARY_PATH
+export LD_LIBRARY_PATH="`pwd`/lib:`pwd`/libSoXt"
%{__make} \
- OPTIMIZER="%{rpmcflags} %{!?debug:-DNDEBUG}" \
- X11LIBDIR=/usr/X11R6/%{_lib} \
+ CXX="%{__cxx}" \
+ FREETYPE=1 \
IVLIBDIR="\$(IVROOT)%{_libdir}" \
+ OPTIMIZER="%{rpmcflags} %{!?debug:-DNDEBUG}" \
+ X11LIBDIR=%{_libdir} \
YACC="bison -y"
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_libdir}/InventorDSO,%{_mandir}/man7} \
+install -d $RPM_BUILD_ROOT{%{_libdir}/InventorDSO,%{_mandir}/man7,%{_datadir}/Inventor/demos/data} \
$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
%{__make} install \
IVROOT=$RPM_BUILD_ROOT \
IVLIBDIR="\$(IVROOT)%{_libdir}"
-install lib/lib*.a libSoXt/lib*.a $RPM_BUILD_ROOT%{_libdir}
install apps/nodes/*/*.so $RPM_BUILD_ROOT%{_libdir}/InventorDSO
-install apps/demos/*/*.about $RPM_BUILD_ROOT%{_datadir}/Inventor/help
+cp -p lib/lib*.a libSoXt/lib*.a $RPM_BUILD_ROOT%{_libdir}
cp -rf apps/examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-mv -f $RPM_BUILD_ROOT%{_mandir}/man{1/inventor.1,7/inventor.7}
+%{__mv} $RPM_BUILD_ROOT%{_mandir}/man{1/inventor.1,7/inventor.7}
+
+# move demos data to another dir
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/Inventor/help/{noodle,qmorf,revo,textomatic}.about \
+ $RPM_BUILD_ROOT%{_datadir}/Inventor/demos/data
# resolve conflict with gview
-mv -f $RPM_BUILD_ROOT%{_bindir}/{gview,invgview}
+%{__mv} $RPM_BUILD_ROOT%{_bindir}/{gview,ivgview}
+# too generic name
+%{__mv} $RPM_BUILD_ROOT%{_bindir}/{drop,ivdrop}
%clean
rm -rf $RPM_BUILD_ROOT
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
%files
%defattr(644,root,root,755)
-%doc KNOWN.BUGS
-%attr(755,root,root) %{_libdir}/lib*.so
-%dir %{_libdir}/InventorDSO
-%attr(755,root,root) %{_libdir}/InventorDSO/*.so
+%doc FAQ.misc KNOWN.BUGS README.FIRST
+%attr(755,root,root) %{_bindir}/SceneViewer
%attr(755,root,root) %{_bindir}/iv2toiv1
%attr(755,root,root) %{_bindir}/ivcat
%attr(755,root,root) %{_bindir}/ivdowngrade
%attr(755,root,root) %{_bindir}/ivfix
%attr(755,root,root) %{_bindir}/ivinfo
%attr(755,root,root) %{_bindir}/ivview
-%attr(755,root,root) %{_bindir}/SceneViewer
+%attr(755,root,root) %{_libdir}/InventorDSO/*.so
%dir %{_datadir}/Inventor
%dir %{_datadir}/Inventor/data
%{_datadir}/Inventor/data/models
%dir %{_datadir}/Inventor/help
-%{_datadir}/Inventor/help/*.help
+%{_datadir}/Inventor/help/SoXt*.help
%{_datadir}/Inventor/help/SceneViewer.about
%{_datadir}/Inventor/help/ivview.about
-%{_mandir}/man1/*
-%{_mandir}/man7/*
+%{_mandir}/man1/SceneViewer.1*
+%{_mandir}/man1/iv2toiv1.1*
+%{_mandir}/man1/ivcat.1*
+%{_mandir}/man1/ivdowngrade.1*
+%{_mandir}/man1/ivfix.1*
+%{_mandir}/man1/ivinfo.1*
+%{_mandir}/man1/ivview.1*
+
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libInventor.so
+%attr(755,root,root) %{_libdir}/libInventorXt.so
+%dir %{_libdir}/InventorDSO
%files devel
%defattr(644,root,root,755)
-%{_includedir}/*
-%{_mandir}/man3/*
+%{_includedir}/Inventor
+%{_mandir}/man3/Sb*.3iv*
+%{_mandir}/man3/So*.3iv*
+%{_mandir}/man7/inventor.7*
%{_examplesdir}/%{name}-%{version}
%files static
%defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libInventor.a
+%{_libdir}/libInventorXt.a
%files demos
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/drop
-%attr(755,root,root) %{_bindir}/invgview
+%attr(755,root,root) %{_bindir}/ivdrop
+%attr(755,root,root) %{_bindir}/ivgview
%attr(755,root,root) %{_bindir}/maze
%attr(755,root,root) %{_bindir}/noodle
%attr(755,root,root) %{_bindir}/qmorf
%attr(755,root,root) %{_bindir}/revo
%attr(755,root,root) %{_bindir}/textomatic
-%{_datadir}/Inventor/data/demos
-%{_datadir}/Inventor/help/noodle.about
-%{_datadir}/Inventor/help/qmorf.about
-%{_datadir}/Inventor/help/revo.about
-%{_datadir}/Inventor/help/textomatic.about
+%{_datadir}/Inventor/demos
diff --git a/openinventor-c++.patch b/openinventor-c++.patch
new file mode 100644
index 0000000..0e6f025
--- /dev/null
+++ b/openinventor-c++.patch
@@ -0,0 +1,34 @@
+--- inventor/lib/database/include/Inventor/SoPath.h.orig 2001-09-25 02:45:33.000000000 +0200
++++ inventor/lib/database/include/Inventor/SoPath.h 2014-11-02 13:00:07.363960823 +0100
+@@ -79,6 +79,7 @@
+
+ class SoPathList;
+ class SoWriteAction;
++class SoTempPath;
+
+ class SoPath : public SoBase {
+
+--- inventor/lib/database/src/so/SoInput.c++.orig 2000-10-26 01:47:47.000000000 +0200
++++ inventor/lib/database/src/so/SoInput.c++ 2014-11-02 13:02:31.810621428 +0100
+@@ -2810,7 +2810,7 @@
+
+ if (addToGlobalDict) {
+ // Look for the first '+':
+- char *firstPlus = strchr(n, '+');
++ const char *firstPlus = strchr(n, '+');
+
+ if (firstPlus == NULL) {
+ base->setName(name);
+--- inventor/lib/interaction/src/nodekits/SoInteractionKit.c++.orig 2000-08-15 14:56:25.000000000 +0200
++++ inventor/lib/interaction/src/nodekits/SoInteractionKit.c++ 2014-11-02 13:28:26.740556171 +0100
+@@ -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.
+- 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() );
diff --git a/openinventor-gcc3.patch b/openinventor-gcc3.patch
deleted file mode 100644
index a99584b..0000000
--- a/openinventor-gcc3.patch
+++ /dev/null
@@ -1,204 +0,0 @@
---- inventor/lib/database/src/sb/SbTime.c++.orig Sat Oct 14 12:46:07 2000
-+++ inventor/lib/database/src/sb/SbTime.c++ Sat Oct 12 21:47:15 2002
-@@ -67,7 +67,9 @@
- // Use: public
-
- #ifndef __sgi
--inline static int trunc(double x) { return int(x); }
-+inline static int trunci(double x) { return int(x); }
-+#else
-+#define trunci trunc
- #endif // !__sgi
-
- SbTime::SbTime(double sec)
-@@ -75,7 +77,7 @@
- ////////////////////////////////////////////////////////////////////////
- {
- if (sec >= 0) {
-- t.tv_sec = trunc(sec);
-+ t.tv_sec = trunci(sec);
- t.tv_usec = (time_t) (0.5 + (sec - t.tv_sec) * 1000000.0);
- }
- else
---- inventor/apps/samples/widgets/componentTest.c++.orig Sun Oct 29 16:04:17 2000
-+++ inventor/apps/samples/widgets/componentTest.c++ Sat Oct 12 22:59:33 2002
-@@ -59,7 +59,7 @@
- exit(0);
- }
-
--void
-+int
- main(unsigned int argc, char *argv[])
- {
- if (argc != 2)
-@@ -85,4 +85,5 @@
- XtRealizeWidget(mainWindow);
-
- SoXt::mainLoop();
-+ return 0;
- }
---- inventor/apps/tools/ivview/ivview.c++.orig Sat Oct 12 22:39:00 2002
-+++ inventor/apps/tools/ivview/ivview.c++ Sat Oct 12 23:01:44 2002
-@@ -1106,7 +1106,7 @@
-
- ///////////////////////////////////////////////////////////////////
- //
--void
-+int
- main(int argc, char **argv)
- {
- XtAppContext appContext;
-@@ -1169,4 +1169,5 @@
- setBusyCursor(FALSE);
-
- SoXt::mainLoop();
-+ return 0;
- }
---- inventor/apps/demos/SceneViewer/SceneViewer.c++.orig Sat Oct 14 12:46:05 2000
-+++ inventor/apps/demos/SceneViewer/SceneViewer.c++ Sat Oct 12 23:03:36 2002
-@@ -138,7 +138,7 @@
- }
-
-
--void main(int argc, char **argv)
-+int main(int argc, char **argv)
- {
- Widget mainWindow;
- SoSceneViewer *sv;
-@@ -230,4 +230,5 @@
- // Loop forever
- //
- SoXt::mainLoop();
-+ return 0;
- }
---- inventor/apps/demos/SceneViewer/SoSceneViewer.c++.orig Sat Oct 12 22:39:00 2002
-+++ inventor/apps/demos/SceneViewer/SoSceneViewer.c++ Sat Oct 12 23:21:27 2002
-@@ -364,6 +364,9 @@
- XtGetSubresources( getParentWidget(), &lightData[0], "intl", "Intl",
- intl_light_resources, intl_num_light_resources,
- NULL, 0 );
-+ XtGetSubresources( getParentWidget(), &Light, "intl", "Intl",
-+ intl_light_resources2, intl_num_light_resources2,
-+ NULL, 0 );
- XtGetSubresources( getParentWidget(), &pulldownData[0], "intl", "Intl",
- intl_pulldown_resources, intl_num_pulldown_resources,
- NULL, 0 );
---- inventor/apps/demos/SceneViewer/SoSceneMenu.h.orig Sun Oct 29 16:04:15 2000
-+++ inventor/apps/demos/SceneViewer/SoSceneMenu.h Sat Oct 12 23:20:55 2002
-@@ -468,23 +468,27 @@
- { "ambientLighting", NULL, XtRString, sizeof(XtRString),
- (Cardinal) SV_OFFSET(&lightData[4].name, &lightData[0]),
- XtRString, (XtPointer) "Ambient Lighting...",},
-+};
-+int intl_num_light_resources = XtNumber( intl_light_resources );
-+
-+XtResource intl_light_resources2[] = {
- { "headlight", NULL, XtRString, sizeof(XtRString),
-- (Cardinal) SV_OFFSET(&Light.headlight, &lightData[0]),
-+ (Cardinal) SV_OFFSET(&Light.headlight, &Light),
- XtRString, (XtPointer) "Headlight ",},
- { "editlight", NULL, XtRString, sizeof(XtRString),
-- (Cardinal) SV_OFFSET(&Light.editlight, &lightData[0]),
-+ (Cardinal) SV_OFFSET(&Light.editlight, &Light),
- XtRString, (XtPointer) "Edit",},
- { "directionallight", NULL, XtRString, sizeof(XtRString),
-- (Cardinal) SV_OFFSET(&Light.directionallight, &lightData[0]),
-+ (Cardinal) SV_OFFSET(&Light.directionallight, &Light),
- XtRString, (XtPointer) "Directional ",},
- { "spotlight", NULL, XtRString, sizeof(XtRString),
-- (Cardinal) SV_OFFSET(&Light.spotlight, &lightData[0]),
-+ (Cardinal) SV_OFFSET(&Light.spotlight, &Light),
- XtRString, (XtPointer) "Spot ",},
- { "pointlight", NULL, XtRString, sizeof(XtRString),
-- (Cardinal) SV_OFFSET(&Light.pointlight, &lightData[0]),
-+ (Cardinal) SV_OFFSET(&Light.pointlight, &Light),
- XtRString, (XtPointer) "Point ",},
- };
--int intl_num_light_resources = XtNumber( intl_light_resources );
-+int intl_num_light_resources2 = XtNumber( intl_light_resources2 );
-
- static SoSceneViewerMenu pulldownData[] = {
- // {name, id, subMenu, subItemCount}
---- inventor/apps/demos/drop/drop.c++.orig Sat Oct 14 12:46:05 2000
-+++ inventor/apps/demos/drop/drop.c++ Sat Oct 12 23:25:02 2002
-@@ -69,7 +69,7 @@
- |
- _______________________________________________________________________
- */
--void
-+int
- main( int, char **argv )
- {
- // Initialize Inventor and Xt
-@@ -93,6 +93,7 @@
- // Enter the Xt event loop
- SoXt::show( appWindow );
- SoXt::mainLoop();
-+ return 0;
- }
-
-
---- inventor/apps/demos/gview/gview.c++.orig Sun Oct 29 16:04:15 2000
-+++ inventor/apps/demos/gview/gview.c++ Sat Oct 12 23:26:15 2002
-@@ -392,7 +392,7 @@
- // Mainline.
- //
-
--void
-+int
- main(int argc, char **argv)
- //
- ////////////////////////////////////////////////////////////////////////
---- inventor/apps/demos/maze/maze.c++.orig Sun Oct 29 16:04:15 2000
-+++ inventor/apps/demos/maze/maze.c++ Sat Oct 12 23:27:15 2002
-@@ -1143,7 +1143,7 @@
- ra->setOverlaySceneGraph(logo);
- }
-
--void
-+int
- main(int argc, char *argv[])
- {
- Widget mainWindow;
-@@ -1332,5 +1332,6 @@
-
- SoXt::show(mainWindow);
- SoXt::mainLoop();
-+ return 0;
- }
-
---- inventor/apps/demos/noodle/noodle.c++.orig Sun Oct 29 16:04:15 2000
-+++ inventor/apps/demos/noodle/noodle.c++ Sat Oct 12 23:28:50 2002
-@@ -280,7 +280,7 @@
- interface->fileQuitEvent();
- }
-
--void
-+int
- main(int argc, char **argv)
- {
- // Parse command line arguments. This may fill in the
-@@ -680,5 +680,6 @@
- SoXt::show(mainWindow);
-
- SoXt::mainLoop();
-+ return 0;
- }
-
---- inventor/apps/demos/textomatic/textomatic.c++.orig Sat Oct 12 22:39:00 2002
-+++ inventor/apps/demos/textomatic/textomatic.c++ Sat Oct 12 23:31:42 2002
-@@ -403,7 +403,7 @@
- const int Vert2 = 60;
- Labels labels; // Global variable.
-
--void
-+int
- main(int argc, char **argv)
- {
- XtSetLanguageProc( NULL, _myXtDefaultLanguageProc, NULL );
-@@ -541,4 +541,5 @@
-
- SoXt::show(w);
- SoXt::mainLoop();
-+ return 0;
- }
diff --git a/openinventor-link.patch b/openinventor-link.patch
index 99f9531..99c9d40 100644
--- a/openinventor-link.patch
+++ b/openinventor-link.patch
@@ -9,14 +9,14 @@
LLDLIBS += $(shell [ -e $(X11LIBDIR)/libXp.so ] && echo -lXp)
---- inventor/doc/man/ivman/GNUmakefile.orig Mon Sep 18 11:11:13 2000
-+++ inventor/doc/man/ivman/GNUmakefile Fri May 25 22:31:04 2001
+--- inventor/doc/man/ivman/GNUmakefile.orig 2014-11-02 09:04:07.224555065 +0100
++++ inventor/doc/man/ivman/GNUmakefile 2014-11-02 09:06:34.431215559 +0100
@@ -5,7 +5,7 @@
CXXFILES = Main.c++ ClassDef.c++ Man.c++ Reader.c++ Writer.c++ BuildIssues.c++
--LLDLIBS = -lInventor -lInventorXt
-+LLDLIBS = -L../../../lib -lInventor -L../../../libSoXt -lInventorXt
+-LLDLIBS = -lInventor
++LLDLIBS = -L../../../lib -lInventor
all install: $(PROGRAM)
@@ -65,13 +65,13 @@
all: all_ivbin
--- inventor/apps/tools/ivview/GNUmakefile.orig Tue Nov 14 03:49:52 2000
-+++ inventor/apps/tools/ivview/GNUmakefile Mon May 28 14:41:47 2001
++++ inventor/apps/tools/ivview/GNUmakefile 2014-11-02 13:47:07.040509433 +0100
@@ -7,7 +7,7 @@
LLDOPTS += -L../../samples/widgets
-LLDLIBS = -lInventorWidget -lInventorXt -lInventor
-+LLDLIBS = -lInventorWidget -L../../../libSoXt -lInventorXt -L../../../lib -lInventor
++LLDLIBS = -lInventorWidget -L../../../libSoXt -lInventorXt -L../../../lib -lInventor -lGL -lXm -lXt -lX11
all: all_ivbin
@@ -120,90 +120,101 @@
all install: all_ivbin
--- inventor/apps/demos/SceneViewer/GNUmakefile.orig Mon Sep 18 11:40:59 2000
-+++ inventor/apps/demos/SceneViewer/GNUmakefile Mon May 28 14:48:07 2001
++++ inventor/apps/demos/SceneViewer/GNUmakefile 2014-11-02 13:56:24.263818989 +0100
@@ -8,7 +8,7 @@
LLDOPTS += -L../../samples/widgets
-LLDLIBS = -lInventorWidget -lInventor -lInventorXt
-+LLDLIBS = -lInventorWidget -L../../../lib -lInventor -L../../../libSoXt -lInventorXt
++LLDLIBS = -lInventorWidget -L../../../lib -lInventor -L../../../libSoXt -lInventorXt -lGL -lXm -lXt -lX11
all: all_ivbin
--- inventor/apps/demos/drop/GNUmakefile.orig Mon Sep 18 11:40:59 2000
-+++ inventor/apps/demos/drop/GNUmakefile Mon May 28 14:48:31 2001
++++ inventor/apps/demos/drop/GNUmakefile 2014-11-02 14:12:44.797111291 +0100
@@ -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 = -L../../../lib -lInventor -L../../../libSoXt -lInventorXt
++LLDLIBS = -L../../../lib -lInventor -L../../../libSoXt -lInventorXt -lGL -lXm -lXt -lX11
all: all_ivbin
--- inventor/apps/demos/gview/GNUmakefile.orig Sun Oct 29 16:04:15 2000
-+++ inventor/apps/demos/gview/GNUmakefile Mon May 28 14:49:04 2001
++++ inventor/apps/demos/gview/GNUmakefile 2014-11-02 14:19:19.057094717 +0100
@@ -8,7 +8,7 @@
gview.c++ DisplayGraph.c++ Error.c++ FieldEditor.c++ \
GraphIcon.c++ GraphViewer.c++ NodeCreator.c++
-LLDLIBS = -lInventor -lInventorXt
-+LLDLIBS = -L../../../lib -lInventor -L../../../libSoXt -lInventorXt
++LLDLIBS = -L../../../lib -lInventor -L../../../libSoXt -lInventorXt -lGL -lXm -lXt -lX11
all: all_ivbin
--- inventor/apps/demos/maze/GNUmakefile.orig Mon Sep 18 11:41:00 2000
-+++ inventor/apps/demos/maze/GNUmakefile Mon May 28 14:49:22 2001
++++ inventor/apps/demos/maze/GNUmakefile 2014-11-02 14:27:50.883739935 +0100
@@ -8,7 +8,7 @@
CXXFILES = maze.c++
-LLDLIBS = -lInventor -lInventorXt
-+LLDLIBS = -L../../../lib -lInventor -L../../../libSoXt -lInventorXt
++LLDLIBS = -L../../../lib -lInventor -L../../../libSoXt -lInventorXt -lGL
all: all_ivbin
--- inventor/apps/demos/noodle/GNUmakefile.orig Tue Nov 14 03:49:52 2000
-+++ inventor/apps/demos/noodle/GNUmakefile Mon May 28 14:49:58 2001
++++ inventor/apps/demos/noodle/GNUmakefile 2014-11-02 14:35:34.837053797 +0100
@@ -16,7 +16,7 @@
../../nodes/GeneralizedCylinder/NurbMaker.o \
../../nodes/GeneralizedCylinder/Triangulator.o \
../../nodes/GeneralizedCylinder/GeneralizedCylinder.o \
- -lInventor -lInventorXt
-+ -L../../../lib -lInventor -L../../../libSoXt -lInventorXt
++ -L../../../lib -lInventor -L../../../libSoXt -lInventorXt -lXm -lXt -lX11
all: all_ivbin
--- inventor/apps/demos/qmorf/GNUmakefile.orig Mon Sep 18 11:41:00 2000
-+++ inventor/apps/demos/qmorf/GNUmakefile Mon May 28 14:50:42 2001
++++ inventor/apps/demos/qmorf/GNUmakefile 2014-11-02 14:45:41.077028356 +0100
@@ -6,7 +6,7 @@
CXXFILES = QuadThing.c++ Background.c++ FlashBackground.c++
-LLDLIBS = -lInventor -lInventorXt
-+LLDLIBS = -L../../../lib -lInventor -L../../../libSoXt -lInventorXt
++LLDLIBS = -L../../../lib -lInventor -L../../../libSoXt -lInventorXt -lGL -lXm -lXt
all: all_ivbin
--- inventor/apps/demos/revo/GNUmakefile.orig Mon Sep 18 11:41:00 2000
-+++ inventor/apps/demos/revo/GNUmakefile Mon May 28 14:51:04 2001
++++ inventor/apps/demos/revo/GNUmakefile 2014-11-02 14:47:18.593690930 +0100
@@ -10,7 +10,7 @@
LLDOPTS += -L../../samples/common
-LLDLIBS = -lcommon -lInventor -lInventorXt
-+LLDLIBS = -lcommon -L../../../lib -lInventor -L../../../libSoXt -lInventorXt
++LLDLIBS = -lcommon -L../../../lib -lInventor -L../../../libSoXt -lInventorXt -lGL -lXm -lXt
all: all_ivbin
--- inventor/apps/demos/textomatic/GNUmakefile.orig Mon Sep 18 11:41:00 2000
-+++ inventor/apps/demos/textomatic/GNUmakefile Mon May 28 14:51:23 2001
++++ inventor/apps/demos/textomatic/GNUmakefile 2014-11-02 14:48:04.787022325 +0100
@@ -8,7 +8,7 @@
LLDOPTS += -L../../samples/common
-LLDLIBS = -lcommon -lInventor -lInventorXt
-+LLDLIBS = -lcommon -L../../../lib -lInventor -L../../../libSoXt -lInventorXt
++LLDLIBS = -lcommon -L../../../lib -lInventor -L../../../libSoXt -lInventorXt -lGL -lXm -lXt -lX11
all: all_ivbin
+--- inventor/apps/samples/widgets/GNUmakefile.componentTest.orig 2014-11-02 13:29:26.153887014 +0100
++++ inventor/apps/samples/widgets/GNUmakefile.componentTest 2014-11-02 13:38:47.050530228 +0100
+@@ -5,7 +5,7 @@
+
+ CXXFILES = componentTest.c++
+
+-LLDLIBS = libInventorWidget.a -L../../../lib -lInventor -L../../../libSoXt -lInventorXt -lGLw
++LLDLIBS = libInventorWidget.a -L../../../lib -lInventor -L../../../libSoXt -lInventorXt -lGLw -lGL -lXm -lXt -lX11
+
+ all install: all_ivbin
+
diff --git a/openinventor-morearchs.patch b/openinventor-morearchs.patch
index a2a6c7b..331fe39 100644
--- a/openinventor-morearchs.patch
+++ b/openinventor-morearchs.patch
@@ -1,8 +1,16 @@
---- inventor/lib/database/include/machine.h.orig Wed Oct 25 23:47:47 2000
-+++ inventor/lib/database/include/machine.h Tue Oct 29 12:58:33 2002
-@@ -150,6 +150,49 @@
+--- inventor/lib/database/include/machine.h.orig 2003-07-12 00:40:53.000000000 +0200
++++ inventor/lib/database/include/machine.h 2014-11-02 11:57:09.977452599 +0100
+@@ -143,13 +143,56 @@
+ * Linux i386/ia64 machine dependent setup
+ */
+
+-#if __i386__ || __ia64__
++#if __i386__ || __ia64__ || __x86_64__
+
+ #define MACHINE_WORD_FORMAT DGL_LITTLE_ENDIAN
+ #define MACHINE_FLOAT_FORMAT DGL_NON_IEEE
- #endif /* __i386__ */
+ #endif /* __i386__ || __ia64__ */
+/*
+ * Linux alpha machine dependent setup
@@ -49,13 +57,13 @@
+#endif
/*
- * IBM RS/6000 series machine dependent setup
-@@ -309,7 +352,7 @@
+ * Apple Darwin (Mac OS X) machine dependent setup
+@@ -321,7 +364,7 @@
*/
#if MACHINE_FLOAT_FORMAT == DGL_NON_IEEE
--#ifdef __i386__
-+#if defined(__i386__) || defined(__alpha__) || defined(__x86_64__)
+-#if __i386__ || __ia64__
++#if __i386__ || __ia64__ || __x86_64__
void mem_hton_float(float *t, float *f);
void mem_ntoh_float(float *t, float *f);
void mem_hton_double(double *t, double *f);
@@ -65,13 +73,13 @@
#endif
#else // __sgi
#ifdef DEBUG
-+#if defined(__x86_64__)
++#if defined(__x86_64__) || defined(__arch64__) || defined(__s390x__) || defined(__powerpc64__)
+ char *longestName = "/usr/lib64/InventorDSO/.so";
+#else
char *longestName = "/usr/lib/InventorDSO/.so";
+#endif
#endif // DEBUG
-+#if defined(__x86_64__)
++#if defined(__x86_64__) || defined(__arch64__) || defined(__s390x__) || defined(__powerpc64__)
+ const char *libDir = "lib64";
+#else
const char *libDir = "lib";
diff --git a/openinventor-nobash.patch b/openinventor-nobash.patch
index d23b767..9d671c6 100644
--- a/openinventor-nobash.patch
+++ b/openinventor-nobash.patch
@@ -1,39 +1,3 @@
-diff -Nur inventor.orig/apps/demos/SceneViewer/SoSceneViewer.c++ inventor/apps/demos/SceneViewer/SoSceneViewer.c++
---- inventor.orig/apps/demos/SceneViewer/SoSceneViewer.c++ Tue May 29 14:47:23 2001
-+++ inventor/apps/demos/SceneViewer/SoSceneViewer.c++ Tue May 29 14:56:55 2001
-@@ -4747,7 +4747,7 @@
- }
-
- char command[100];
-- sprintf(command, "which acroread >& /dev/null");
-+ sprintf(command, "which acroread >/dev/null 2>&1");
-
- int err = system(command);
- if (err)
-diff -Nur inventor.orig/apps/demos/noodle/Interface.c++ inventor/apps/demos/noodle/Interface.c++
---- inventor.orig/apps/demos/noodle/Interface.c++ Tue May 29 14:47:23 2001
-+++ inventor/apps/demos/noodle/Interface.c++ Tue May 29 14:56:22 2001
-@@ -406,7 +406,7 @@
- }
-
- char command[100];
-- sprintf(command, "which acroread >& /dev/null");
-+ sprintf(command, "which acroread >/dev/null 2>&1");
-
- int err = system(command);
- if (err) {
-diff -Nur inventor.orig/apps/demos/qmorf/qmorf.c++ inventor/apps/demos/qmorf/qmorf.c++
---- inventor.orig/apps/demos/qmorf/qmorf.c++ Tue May 29 14:47:23 2001
-+++ inventor/apps/demos/qmorf/qmorf.c++ Tue May 29 14:56:02 2001
-@@ -444,7 +444,7 @@
- return;
- }
- char command[100];
-- sprintf(command, "which acroread >& /dev/null");
-+ sprintf(command, "which acroread >/dev/null 2>&1");
-
- int err = system(command);
- if (err)
diff -Nur inventor.orig/apps/demos/revo/revo.c++ inventor/apps/demos/revo/revo.c++
--- inventor.orig/apps/demos/revo/revo.c++ Tue May 29 14:47:23 2001
+++ inventor/apps/demos/revo/revo.c++ Tue May 29 14:55:45 2001
@@ -46,27 +10,3 @@ diff -Nur inventor.orig/apps/demos/revo/revo.c++ inventor/apps/demos/revo/revo.c
int err = system(command);
if (err)
-diff -Nur inventor.orig/apps/demos/textomatic/textomatic.c++ inventor/apps/demos/textomatic/textomatic.c++
---- inventor.orig/apps/demos/textomatic/textomatic.c++ Tue May 29 14:47:23 2001
-+++ inventor/apps/demos/textomatic/textomatic.c++ Tue May 29 14:55:28 2001
-@@ -165,7 +165,7 @@
- }
-
- char command[100];
-- sprintf(command, "which acroread >& /dev/null");
-+ sprintf(command, "which acroread >/dev/null 2>&1");
-
- int err = system(command);
- if (err) {
-diff -Nur inventor.orig/apps/tools/ivview/ivview.c++ inventor/apps/tools/ivview/ivview.c++
---- inventor.orig/apps/tools/ivview/ivview.c++ Tue May 29 14:47:23 2001
-+++ inventor/apps/tools/ivview/ivview.c++ Tue May 29 14:55:04 2001
-@@ -721,7 +721,7 @@
- }
-
- char command[100];
-- sprintf(command, "which acroread >& /dev/null");
-+ sprintf(command, "which acroread >/dev/null 2>&1");
-
- int err = system(command);
- if (err) {
diff --git a/openinventor-nodisplay.patch b/openinventor-nodisplay.patch
deleted file mode 100644
index 813275b..0000000
--- a/openinventor-nodisplay.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- inventor/doc/man/ivman/Main.c++.orig Sat May 26 01:36:28 2001
-+++ inventor/doc/man/ivman/Main.c++ Sat May 26 01:32:51 2001
-@@ -117,7 +117,7 @@
- SoDB::init();
- SoNodeKit::init();
- SoInteraction::init();
-- SoXt::init(argv[0]);
-+/* SoXt::init(argv[0]); requires X DISPLAY */
-
- // Process each class in turn
- ClassDef *mainCd = NULL, *curCd = NULL, *cd;
diff --git a/openinventor-paths.patch b/openinventor-paths.patch
index 98d964a..b5788b8 100644
--- a/openinventor-paths.patch
+++ b/openinventor-paths.patch
@@ -1,34 +1,47 @@
---- inventor/doc/help/GNUmakefile.orig Tue Nov 14 03:49:52 2000
-+++ inventor/doc/help/GNUmakefile Mon May 28 20:52:16 2001
-@@ -5,6 +5,6 @@
+--- inventor/doc/help/GNUmakefile.orig 2014-11-02 09:16:19.687857662 +0100
++++ inventor/doc/help/GNUmakefile 2014-11-02 09:33:06.657815405 +0100
+@@ -4,7 +4,7 @@
+ all:
install:
- mkdir -p $(IVHELPDIR)/Inventor
-- $(INSTALL) -m 644 *.help $(IVHELPDIR)/Inventor
-+ $(INSTALL) -m 644 *.help $(IVHELPDIR)
+- mkdir -p $(IVHELPDIR)/Inventor
+- for h in *.help; do $(INSTALL) -m 644 $$h $(IVHELPDIR)/Inventor; done
++ mkdir -p $(IVHELPDIR)
++ for h in *.help; do $(INSTALL) -m 644 $$h $(IVHELPDIR); done
include $(IVCOMMONRULES)
---- inventor/make/ivcommondefs.orig Sat Mar 24 03:47:42 2001
-+++ inventor/make/ivcommondefs Mon May 28 20:59:35 2001
-@@ -121,13 +121,13 @@
+--- inventor/make/ivcommondefs.orig 2014-11-02 09:16:19.687857662 +0100
++++ inventor/make/ivcommondefs 2014-11-02 09:37:19.434471464 +0100
+@@ -192,13 +192,13 @@
IVDLIBDIR = $(IVLIBDIR)/InventorDebug
- IVHDRTOP = $(IVROOT)/usr/include/Inventor
+ IVHDRTOP = $(IVROOT)/$(IVPREFIX)/include/Inventor
IVHDRDIR = $(IVHDRTOP)/$(HDRSUBDIR)
--IVMAN1DIR = $(IVROOT)/usr/man/man1
--IVMAN3DIR = $(IVROOT)/usr/man/man3
--IVHELPDIR = $(IVROOT)/usr/share/help
--IVDATADIR = $(IVROOT)/usr/share/data/models
--IVDEMODIR = $(IVROOT)/usr/demos
+-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)/usr/share/man/man1
-+IVMAN3DIR = $(IVROOT)/usr/share/man/man3
-+IVHELPDIR = $(IVROOT)/usr/share/Inventor/help
-+IVDATADIR = $(IVROOT)/usr/share/Inventor/data/models
-+IVDEMODIR = $(IVROOT)/usr/share/Inventor/demos
-+IVDEMOBINDIR = $(IVROOT)/usr/bin
-+IVDEMODATADIR = $(IVROOT)/usr/share/Inventor/data/demos
++IVMAN1DIR = $(IVROOT)/$(IVPREFIX)/share/man/man1
++IVMAN3DIR = $(IVROOT)/$(IVPREFIX)/share/man/man3
++IVHELPDIR = $(IVROOT)/$(IVPREFIX)/share/Inventor/help
++IVDATADIR = $(IVROOT)/$(IVPREFIX)/share/Inventor/data/models
++IVDEMODIR = $(IVROOT)/$(IVPREFIX)/share/Inventor/demos
++IVDEMOBINDIR = $(IVBINDIR)
++IVDEMODATADIR = $(IVDEMODIR)/data
+
+
+--- inventor/make/ivcommonrules.orig 2003-07-12 00:40:54.000000000 +0200
++++ inventor/make/ivcommonrules 2014-11-02 15:50:32.616865176 +0100
+@@ -119,7 +119,7 @@
+ fi; \
+ fi
+ if [ -e $(DEMO).about ]; then \
+- $(INSTALL) -m 644 $(DEMO).about $(IVDEMOBINDIR); \
++ $(INSTALL) -m 644 $(DEMO).about $(IVHELPDIR); \
+ fi
--- inventor/lib/database/src/so/SoType.c++.orig Sat Oct 14 12:46:07 2000
@@ -45,25 +58,25 @@
sprintf(DSOFile,"/usr/%s/InventorDSO/%s.so", libDir, nameChars);
dsoHandle = sgidlopen_version(DSOFile, RTLD_LAZY, "sgi3.0", 0);
}
---- inventor/libSoXt/include/Inventor/Xt/SoXtComponent.h.orig Tue Aug 15 14:56:27 2000
-+++ inventor/libSoXt/include/Inventor/Xt/SoXtComponent.h Mon May 28 22:01:56 2001
+--- inventor/libSoXt/include/Inventor/Xt/SoXtComponent.h.orig 2014-11-02 09:16:19.694524329 +0100
++++ inventor/libSoXt/include/Inventor/Xt/SoXtComponent.h 2014-11-02 09:38:44.417801230 +0100
@@ -268,7 +268,7 @@
// name. By default the file will be searched using:
// 1) current working directory
// 2) SO_HELP_DIR environment variable
-- // 3) /usr/share/help/Inventor
-+ // 3) /usr/share/Inventor/help
+- // 3) $(IVPREFIX)/share/help/Inventor
++ // 3) $(IVPREFIX)/share/Inventor/help
// 4) else bring a no help card found dialog
//
void openHelpCard(const char *cardName);
---- inventor/libSoXt/src/SoXtComponent.c++.orig Tue Nov 14 03:49:53 2000
-+++ inventor/libSoXt/src/SoXtComponent.c++ Mon May 28 22:06:34 2001
+--- inventor/libSoXt/src/SoXtComponent.c++.orig 2014-11-02 09:16:19.694524329 +0100
++++ inventor/libSoXt/src/SoXtComponent.c++ 2014-11-02 09:39:34.901132444 +0100
@@ -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) /usr/share/help/Inventor
-+// 3) /usr/share/Inventor/help
+-// 3) $(IVPREFIX)/share/help/Inventor
++// 3) $(IVPREFIX)/share/Inventor/help
// 4) else bring a "No help card found message"
//
// Use: protected
@@ -71,41 +84,41 @@
}
// else check for the default location
-- strcpy(cardPath, "/usr/share/help/Inventor/");
-+ strcpy(cardPath, "/usr/share/Inventor/help");
+- strcpy(cardPath, IVPREFIX "/share/help/Inventor/");
++ strcpy(cardPath, IVPREFIX "/share/Inventor/help/");
strcat(cardPath, cardName);
if ( access(cardPath, R_OK) == 0 ) {
strcat(pgrCmd, cardPath);
---- inventor/libSoXt/src/mtlEdit/SoXtMtlEdit.c++.orig Tue Aug 15 14:56:28 2000
-+++ inventor/libSoXt/src/mtlEdit/SoXtMtlEdit.c++ Mon May 28 22:33:51 2001
-@@ -162,7 +162,7 @@
+--- inventor/libSoXt/src/mtlEdit/SoXtMtlEdit.c++.orig 2014-11-02 09:16:19.701190998 +0100
++++ inventor/libSoXt/src/mtlEdit/SoXtMtlEdit.c++ 2014-11-02 09:40:19.134463921 +0100
+@@ -156,7 +156,7 @@
"Material Emissive Color"
};
--static char *mtlDir = "/usr/share/data/materials";
-+static char *mtlDir = "/usr/share/Inventor/data/materials";
+-static char *mtlDir = IVPREFIX "/share/data/materials";
++static char *mtlDir = IVPREFIX "/share/Inventor/data/materials";
static char *slider_labels[] = { (char *)NULL, (char *)NULL, (char *)NULL,
(char *)NULL, (char *)NULL, (char *)NULL
---- inventor/libSoXt/src/mtlEdit/SoXtMtlList.c++.orig Sat Oct 14 12:46:09 2000
-+++ inventor/libSoXt/src/mtlEdit/SoXtMtlList.c++ Mon May 28 22:34:08 2001
+--- inventor/libSoXt/src/mtlEdit/SoXtMtlList.c++.orig 2014-11-02 09:16:20.341190969 +0100
++++ inventor/libSoXt/src/mtlEdit/SoXtMtlList.c++ 2014-11-02 09:40:35.281129910 +0100
@@ -264,7 +264,7 @@
setClassName("SoXtMaterialList");
if (dir != NULL)
materialDir = strdup(dir);
-- else materialDir = strdup("/usr/share/data/materials");
-+ else materialDir = strdup("/usr/share/Inventor/data/materials");
+- else materialDir = strdup(IVPREFIX "/share/data/materials");
++ else materialDir = strdup(IVPREFIX "/share/Inventor/data/materials");
callbackList = new SoCallbackList;
curPalette = -1;
---- inventor/libFL/ang/fl.c.orig Sat Mar 24 03:34:24 2001
-+++ inventor/libFL/ang/fl.c Mon May 28 22:51:55 2001
+--- inventor/libFL/ang/fl.c.orig 2014-11-02 09:16:20.341190969 +0100
++++ inventor/libFL/ang/fl.c 2014-11-02 09:42:05.567792788 +0100
@@ -95,7 +95,7 @@
NULL
};
--static char *fontPath = "/usr/share/data/fonts";
-+static char *fontPath = "/usr/share/Inventor/fonts";
+-static char *fontPath = IVPREFIX "/share/data/fonts";
++static char *fontPath = IVPREFIX "/share/Inventor/data/fonts";
int fl_debug = FALSE;
/*
@@ -120,26 +133,26 @@
}
METHOD addCB addCallback(
---- inventor/apps/tools/ivview/ivview.c++.orig Sat Dec 9 04:17:04 2000
-+++ inventor/apps/tools/ivview/ivview.c++ Mon May 28 23:42:34 2001
-@@ -714,9 +714,9 @@
+--- inventor/apps/tools/ivview/ivview.c++.orig 2014-11-02 09:16:20.347857632 +0100
++++ inventor/apps/tools/ivview/ivview.c++ 2014-11-02 09:42:49.531124277 +0100
+@@ -715,9 +715,9 @@
static void
showAboutDialog()
{
-- if (access("/usr/share/help/ivview/ivview.about", R_OK) != 0) {
-+ if (access("/usr/share/Inventor/help/ivview.about", R_OK) != 0) {
+- if (access(IVPREFIX "/share/help/ivview/ivview.about", R_OK) != 0) {
++ if (access(IVPREFIX "/share/Inventor/help/ivview/ivview.about", R_OK) != 0) {
system("xmessage 'Sorry, could not find "
-- "/usr/share/help/ivview/ivview.about' > /dev/null");
-+ "/usr/share/Inventor/help/ivview.about' > /dev/null");
+- IVPREFIX "/share/help/ivview/ivview.about' > /dev/null");
++ IVPREFIX "/share/Inventor/help/ivview/ivview.about' > /dev/null");
return;
}
-@@ -730,7 +730,7 @@
+@@ -731,7 +731,7 @@
return;
}
-- sprintf(command, "acroread /usr/share/help/ivview/ivview.about &");
-+ sprintf(command, "acroread /usr/share/Inventor/help/ivview.about &");
+- sprintf(command, "acroread " IVPREFIX "/share/help/ivview/ivview.about &");
++ sprintf(command, "acroread " IVPREFIX "/share/Inventor/help/ivview/ivview.about &");
system(command);
}
@@ -155,52 +168,52 @@
+ $(INSTALL) -m 644 $(PROGRAM).about $(IVHELPDIR)
include $(IVCOMMONRULES)
---- inventor/apps/demos/SceneViewer/SoSceneViewer.c++.orig Tue Nov 14 03:49:51 2000
-+++ inventor/apps/demos/SceneViewer/SoSceneViewer.c++ Mon May 28 23:58:47 2001
-@@ -4739,10 +4739,10 @@
+--- inventor/apps/demos/SceneViewer/SoSceneViewer.c++.orig 2014-11-02 09:16:20.357857637 +0100
++++ inventor/apps/demos/SceneViewer/SoSceneViewer.c++ 2014-11-02 09:54:20.107761965 +0100
+@@ -4734,10 +4734,10 @@
//
////////////////////////////////////////////////////////////////////////
{
-- if (access("/usr/demos/Inventor/SceneViewer.about", R_OK) != 0)
-+ if (access("/usr/share/Inventor/help/SceneViewer.about", R_OK) != 0)
+- if (access(IVPREFIX "/demos/Inventor/SceneViewer.about", R_OK) != 0)
++ if (access(IVPREFIX "/share/Inventor/demos/data/SceneViewer.about", R_OK) != 0)
{
system("xmessage 'Sorry, could not find "
-- "/usr/demos/Inventor/SceneViewer.about' > /dev/null");
-+ "/usr/share/Inventor/help/SceneViewer.about' > /dev/null");
+- IVPREFIX "/demos/Inventor/SceneViewer.about' > /dev/null");
++ IVPREFIX "/share/Inventor/demos/data/SceneViewer.about' > /dev/null");
return;
}
-@@ -4757,7 +4757,7 @@
- return;
+@@ -4753,7 +4753,7 @@
}
-- sprintf(command, "acroread /usr/demos/Inventor/SceneViewer.about &");
-+ sprintf(command, "acroread /usr/share/Inventor/help/SceneViewer.about &");
+ sprintf(command, "acroread "
+- IVPREFIX "/demos/Inventor/SceneViewer.about &");
++ IVPREFIX "/share/Inventor/demos/data/SceneViewer.about &");
system(command);
}
---- inventor/apps/demos/gview/DisplayGraph.c++.orig Sun Oct 29 16:04:15 2000
-+++ inventor/apps/demos/gview/DisplayGraph.c++ Tue May 29 00:06:57 2001
+--- inventor/apps/demos/gview/DisplayGraph.c++.orig 2014-11-02 10:18:30.964367742 +0100
++++ inventor/apps/demos/gview/DisplayGraph.c++ 2014-11-02 10:24:00.081020597 +0100
@@ -67,7 +67,7 @@
SbDict *DisplayGraph::iconDict;
#define ICON_FILE "gviewIcons.iv"
--#define ICON_INST_DIR "/usr/demos/data/Inventor"
-+#define ICON_INST_DIR "/usr/share/Inventor/data/demos"
+-#define ICON_INST_DIR IVPREFIX "/demos/data/Inventor"
++#define ICON_INST_DIR IVPREFIX "/share/Inventor/demos/data"
#define ICON_ENV_VAR "IV_GRAPH_DIR"
////////////////////////////////////////////////////////////////////////
---- inventor/apps/demos/noodle/Interface.c++.orig Tue Nov 14 03:49:52 2000
-+++ inventor/apps/demos/noodle/Interface.c++ Tue May 29 00:09:49 2001
+--- inventor/apps/demos/noodle/Interface.c++.orig 2014-11-02 09:16:20.364524304 +0100
++++ inventor/apps/demos/noodle/Interface.c++ 2014-11-02 10:05:25.657734032 +0100
@@ -399,9 +399,9 @@
void
Interface::showAboutDialog()
{
-- if (access("/usr/demos/Inventor/noodle.about", R_OK) != 0) {
-+ if (access("/usr/share/Inventor/help/noodle.about", R_OK) != 0) {
+- if (access(IVPREFIX "/demos/Inventor/noodle.about", R_OK) != 0) {
++ if (access(IVPREFIX "/share/Inventor/demos/data/noodle.about", R_OK) != 0) {
system("xmessage 'Sorry, could not find "
-- "/usr/demos/Inventor/noodle.about' > /dev/null");
-+ "/usr/share/Inventor/help/noodle.about' > /dev/null");
+- IVPREFIX "/demos/Inventor/noodle.about' > /dev/null");
++ IVPREFIX "/share/Inventor/demos/data/noodle.about' > /dev/null");
return;
}
@@ -208,100 +221,100 @@
return;
}
-- sprintf(command, "acroread /usr/demos/Inventor/noodle.about &");
-+ sprintf(command, "acroread /usr/share/Inventor/help/noodle.about &");
+- sprintf(command, "acroread " IVPREFIX "/demos/Inventor/noodle.about &");
++ sprintf(command, "acroread " IVPREFIX "/share/Inventor/demos/data/noodle.about &");
system(command);
}
---- inventor/apps/demos/qmorf/qmorf.c++.orig Tue Nov 14 03:49:52 2000
-+++ inventor/apps/demos/qmorf/qmorf.c++ Tue May 29 00:12:43 2001
-@@ -415,7 +415,7 @@
- fprintf(stderr, "At least two files must be given, and "
+--- inventor/apps/demos/qmorf/qmorf.c++.orig 2014-11-02 09:16:20.371190968 +0100
++++ inventor/apps/demos/qmorf/qmorf.c++ 2014-11-02 10:07:27.381062257 +0100
+@@ -414,7 +414,7 @@
"they must contain QuadMeshes (qmorf can\n");
fprintf(stderr, "only morph QuadMesh nodes).\n");
-- fprintf(stderr, "The directory /usr/share/data/models/CyberHeads "
-+ fprintf(stderr, "The directory /usr/share/Inventor/data/models/CyberHeads "
+ fprintf(stderr, "The directory "
+- IVPREFIX "/share/data/models/CyberHeads "
++ IVPREFIX "/share/Inventor/data/models/CyberHeads "
"contains good data to morph.\n");
exit(7);
-@@ -437,10 +437,10 @@
+@@ -436,10 +436,10 @@
void
showAboutDialog(Widget, XtPointer, XtPointer)
{
-- if (access("/usr/demos/Inventor/qmorf.about", R_OK) != 0)
-+ if (access("/usr/share/Inventor/help/qmorf.about", R_OK) != 0)
+- if (access(IVPREFIX "/demos/Inventor/qmorf.about", R_OK) != 0)
++ if (access(IVPREFIX "/share/Inventor/demos/data/qmorf.about", R_OK) != 0)
{
system("xmessage 'Sorry, could not find "
-- "/usr/demos/Inventor/qmorf.about' > /dev/null");
-+ "/usr/share/Inventor/help/qmorf.about' > /dev/null");
+- IVPREFIX "/demos/Inventor/qmorf.about' > /dev/null");
++ IVPREFIX "/share/Inventor/demos/data/qmorf.about' > /dev/null");
return;
}
char command[100];
-@@ -454,7 +454,7 @@
+@@ -453,7 +453,7 @@
return;
}
-- sprintf(command, "acroread /usr/demos/Inventor/qmorf.about &");
-+ sprintf(command, "acroread /usr/share/Inventor/help/qmorf.about &");
+- sprintf(command, "acroread " IVPREFIX "/demos/Inventor/qmorf.about &");
++ sprintf(command, "acroread " IVPREFIX "/share/Inventor/demos/data/qmorf.about &");
system(command);
}
---- inventor/apps/demos/revo/revo.c++.orig Tue Nov 14 03:49:52 2000
-+++ inventor/apps/demos/revo/revo.c++ Tue May 29 00:15:21 2001
-@@ -79,10 +79,10 @@
+--- inventor/apps/demos/revo/revo.c++.orig 2014-11-02 09:16:20.374524299 +0100
++++ inventor/apps/demos/revo/revo.c++ 2014-11-02 10:08:17.104393504 +0100
+@@ -78,10 +78,10 @@
void
showAboutDialog(Widget, XtPointer, XtPointer)
{
-- if (access("/usr/demos/Inventor/revo.about", R_OK) != 0)
-+ if (access("/usr/share/Inventor/help/revo.about", R_OK) != 0)
+- if (access(IVPREFIX "/demos/Inventor/revo.about", R_OK) != 0)
++ if (access(IVPREFIX "/share/Inventor/demos/data/revo.about", R_OK) != 0)
{
system("xmessage 'Sorry, could not find "
-- "/usr/demos/Inventor/revo.about' > /dev/null");
-+ "/usr/share/Inventor/help/revo.about' > /dev/null");
+- IVPREFIX "/demos/Inventor/revo.about' > /dev/null");
++ IVPREFIX "/share/Inventor/demos/data/revo.about' > /dev/null");
return;
}
-@@ -97,7 +97,7 @@
+@@ -96,7 +96,7 @@
return;
}
-- sprintf(command, "acroread /usr/demos/Inventor/revo.about &");
-+ sprintf(command, "acroread /usr/share/Inventor/help/revo.about &");
+- sprintf(command, "acroread " IVPREFIX "/demos/Inventor/revo.about &");
++ sprintf(command, "acroread " IVPREFIX "/share/Inventor/demos/data/revo.about &");
system(command);
}
---- inventor/apps/demos/textomatic/textomatic.c++.orig Tue Nov 14 03:49:52 2000
-+++ inventor/apps/demos/textomatic/textomatic.c++ Tue May 29 00:16:29 2001
-@@ -157,10 +157,10 @@
+--- inventor/apps/demos/textomatic/textomatic.c++.orig 2014-11-02 09:16:20.374524299 +0100
++++ inventor/apps/demos/textomatic/textomatic.c++ 2014-11-02 10:08:52.151058700 +0100
+@@ -160,10 +160,10 @@
void
showAboutDialog(Widget, XtPointer, XtPointer)
{
-- if (access("/usr/demos/Inventor/textomatic.about", R_OK) != 0)
-+ if (access("/usr/share/Inventor/help/textomatic.about", R_OK) != 0)
+- if (access(IVPREFIX "/demos/Inventor/textomatic.about", R_OK) != 0)
++ if (access(IVPREFIX "/share/Inventor/demos/data/textomatic.about", R_OK) != 0)
{
system("xmessage 'Sorry, could not find "
-- "/usr/demos/Inventor/textomatic.about' > /dev/null");
-+ "/usr/share/Inventor/help/textomatic.about' > /dev/null");
+- IVPREFIX "/demos/Inventor/textomatic.about' > /dev/null");
++ IVPREFIX "/share/Inventor/demos/data/textomatic.about' > /dev/null");
return;
}
-@@ -174,7 +174,7 @@
+@@ -177,7 +177,7 @@
return;
}
-- sprintf(command, "acroread /usr/demos/Inventor/textomatic.about &");
-+ sprintf(command, "acroread /usr/share/Inventor/help/textomatic.about &");
+- sprintf(command, "acroread " IVPREFIX "/demos/Inventor/textomatic.about &");
++ sprintf(command, "acroread " IVPREFIX "/share/Inventor/demos/data/textomatic.about &");
system(command);
}
---- inventor/apps/samples/widgets/MyTextureEd.c++.orig Sun Oct 29 16:04:17 2000
-+++ inventor/apps/samples/widgets/MyTextureEd.c++ Tue May 29 00:18:25 2001
+--- inventor/apps/samples/widgets/MyTextureEd.c++.orig 2014-11-02 09:16:20.381190965 +0100
++++ inventor/apps/samples/widgets/MyTextureEd.c++ 2014-11-02 10:11:13.424386104 +0100
@@ -228,7 +228,7 @@
static char *customTextureDir = ".textures";
--static char *defaultDir = "/usr/share/data/textures";
-+static char *defaultDir = "/usr/share/Inventor/data/textures";
+-static char *defaultDir = IVPREFIX "/share/data/textures";
++static char *defaultDir = IVPREFIX "/share/Inventor/data/textures";
static char *editorTitle = "Texture Editor";
static char *noFileNameStr = "<empty>";
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/openinventor.git/commitdiff/fd6f17190135b9943e8b5bde1e7f572efe714caa
More information about the pld-cvs-commit
mailing list