2024-05-08 11:54:36 +00:00
|
|
|
Index: Coin-3.1.3/bin/coin-config
|
|
|
|
|
===================================================================
|
|
|
|
|
--- Coin-3.1.3.orig/bin/coin-config
|
|
|
|
|
+++ Coin-3.1.3/bin/coin-config
|
|
|
|
|
@@ -76,14 +76,14 @@ do
|
2016-10-27 13:59:31 +00:00
|
|
|
esac
|
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
-if test -f $prefix/share/Coin/conf/coin-$alternate.cfg; then
|
|
|
|
|
- configfile="$prefix/share/Coin/conf/coin-$alternate.cfg"
|
2019-02-04 14:58:55 +00:00
|
|
|
+if test -f $prefix/share/Coin60/conf/coin-$alternate.cfg; then
|
|
|
|
|
+ configfile="$prefix/share/Coin60/conf/coin-$alternate.cfg"
|
2016-10-27 13:59:31 +00:00
|
|
|
. $configfile
|
|
|
|
|
-elif test -f $prefix/share/Coin/conf/coin-default.cfg; then
|
|
|
|
|
- configfile="$prefix/share/Coin/conf/coin-default.cfg"
|
2019-02-04 14:58:55 +00:00
|
|
|
+elif test -f $prefix/share/Coin60/conf/coin-default.cfg; then
|
|
|
|
|
+ configfile="$prefix/share/Coin60/conf/coin-default.cfg"
|
2016-10-27 13:59:31 +00:00
|
|
|
. $configfile
|
|
|
|
|
else
|
|
|
|
|
- echo >&2 "$me: no default Coin config available in $prefix/share/Coin/conf/"
|
2019-02-04 14:58:55 +00:00
|
|
|
+ echo >&2 "$me: no default Coin config available in $prefix/share/Coin60/conf/"
|
2016-10-27 13:59:31 +00:00
|
|
|
exit 1
|
|
|
|
|
fi
|
|
|
|
|
|
2024-05-08 11:54:36 +00:00
|
|
|
Index: Coin-3.1.3/data/shaders/vsm/Makefile.am
|
|
|
|
|
===================================================================
|
|
|
|
|
--- Coin-3.1.3.orig/data/shaders/vsm/Makefile.am
|
|
|
|
|
+++ Coin-3.1.3/data/shaders/vsm/Makefile.am
|
|
|
|
|
@@ -13,7 +13,7 @@ DISTCLEANFILES = \
|
2016-10-27 13:59:31 +00:00
|
|
|
if MAC_FRAMEWORK
|
|
|
|
|
shadersvsmdatadir = $(MAC_FRAMEWORK_PREFIX)/$(MAC_FRAMEWORK_NAME).framework/Versions/$(MAC_FRAMEWORK_VERSION)/Resources/shaders/vsm
|
|
|
|
|
else
|
|
|
|
|
-shadersvsmdatadir = $(datadir)/Coin/shaders/vsm
|
2019-02-04 14:58:55 +00:00
|
|
|
+shadersvsmdatadir = $(datadir)/Coin60/shaders/vsm
|
2016-10-27 13:59:31 +00:00
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
dist_shadersvsmdata_DATA = \
|
2024-05-08 11:54:36 +00:00
|
|
|
Index: Coin-3.1.3/data/shaders/lights/Makefile.am
|
|
|
|
|
===================================================================
|
|
|
|
|
--- Coin-3.1.3.orig/data/shaders/lights/Makefile.am
|
|
|
|
|
+++ Coin-3.1.3/data/shaders/lights/Makefile.am
|
|
|
|
|
@@ -16,7 +16,7 @@ DISTCLEANFILES = \
|
2016-10-27 13:59:31 +00:00
|
|
|
if MAC_FRAMEWORK
|
|
|
|
|
shaderslightsdatadir = $(MAC_FRAMEWORK_PREFIX)/$(MAC_FRAMEWORK_NAME).framework/Versions/$(MAC_FRAMEWORK_VERSION)/Resources/shaders/lights
|
|
|
|
|
else
|
|
|
|
|
-shaderslightsdatadir = $(datadir)/Coin/shaders/lights
|
2019-02-04 14:58:55 +00:00
|
|
|
+shaderslightsdatadir = $(datadir)/Coin60/shaders/lights
|
2016-10-27 13:59:31 +00:00
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
dist_shaderslightsdata_DATA = \
|
2024-05-08 11:54:36 +00:00
|
|
|
Index: Coin-3.1.3/data/scxml/navigation/Makefile.am
|
|
|
|
|
===================================================================
|
|
|
|
|
--- Coin-3.1.3.orig/data/scxml/navigation/Makefile.am
|
|
|
|
|
+++ Coin-3.1.3/data/scxml/navigation/Makefile.am
|
2016-10-27 13:59:31 +00:00
|
|
|
@@ -6,7 +6,7 @@
|
|
|
|
|
if MAC_FRAMEWORK
|
|
|
|
|
scxmldefdatadir = $(MAC_FRAMEWORK_PREFIX)/$(MAC_FRAMEWORK_NAME).framework/Versions/$(MAC_FRAMEWORK_VERSION)/Resources/scxml/navigation
|
|
|
|
|
else
|
|
|
|
|
-scxmldefdatadir = $(datadir)/Coin/scxml/navigation
|
2019-02-04 14:58:55 +00:00
|
|
|
+scxmldefdatadir = $(datadir)/Coin60/scxml/navigation
|
2016-10-27 13:59:31 +00:00
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
dist_scxmldefdata_DATA = \
|
2024-05-08 11:54:36 +00:00
|
|
|
Index: Coin-3.1.3/Makefile.am
|
|
|
|
|
===================================================================
|
|
|
|
|
--- Coin-3.1.3.orig/Makefile.am
|
|
|
|
|
+++ Coin-3.1.3/Makefile.am
|
|
|
|
|
@@ -53,7 +53,7 @@ if BUILD_LIBRARY
|
2016-10-27 13:59:31 +00:00
|
|
|
m4datadir = $(datadir)/aclocal
|
|
|
|
|
dist_m4data_DATA = cfg/coin.m4
|
|
|
|
|
|
|
|
|
|
-cfgdatadir = $(datadir)/Coin/conf
|
2019-02-04 14:58:55 +00:00
|
|
|
+cfgdatadir = $(datadir)/Coin60/conf
|
2016-10-27 13:59:31 +00:00
|
|
|
cfgdata_DATA = coin-@CONFIG@.cfg
|
|
|
|
|
|
|
|
|
|
if MAC_FRAMEWORK
|
2024-05-08 11:54:36 +00:00
|
|
|
Index: Coin-3.1.3/Makefile.in
|
|
|
|
|
===================================================================
|
|
|
|
|
--- Coin-3.1.3.orig/Makefile.in
|
|
|
|
|
+++ Coin-3.1.3/Makefile.in
|
|
|
|
|
@@ -1426,7 +1426,7 @@ DISTCLEANFILES = \
|
2016-10-27 13:59:31 +00:00
|
|
|
|
|
|
|
|
@BUILD_LIBRARY_TRUE@m4datadir = $(datadir)/aclocal
|
|
|
|
|
@BUILD_LIBRARY_TRUE@dist_m4data_DATA = cfg/coin.m4
|
|
|
|
|
-@BUILD_LIBRARY_TRUE@cfgdatadir = $(datadir)/Coin/conf
|
2019-02-04 14:58:55 +00:00
|
|
|
+@BUILD_LIBRARY_TRUE@cfgdatadir = $(datadir)/Coin60/conf
|
2016-10-27 13:59:31 +00:00
|
|
|
@BUILD_LIBRARY_TRUE@cfgdata_DATA = coin-@CONFIG@.cfg
|
|
|
|
|
@BUILD_LIBRARY_TRUE@@MAC_FRAMEWORK_TRUE@frameworkdatadir = $(MAC_FRAMEWORK_PREFIX)/$(MAC_FRAMEWORK_NAME).framework/Versions/$(MAC_FRAMEWORK_VERSION)/Resources
|
|
|
|
|
@BUILD_LIBRARY_TRUE@@MAC_FRAMEWORK_TRUE@frameworkdata_DATA = Info.plist version.plist
|
2024-05-08 11:54:36 +00:00
|
|
|
Index: Coin-3.1.3/data/draggerDefaults/Makefile.in
|
|
|
|
|
===================================================================
|
|
|
|
|
--- Coin-3.1.3.orig/data/draggerDefaults/Makefile.in
|
|
|
|
|
+++ Coin-3.1.3/data/draggerDefaults/Makefile.in
|
|
|
|
|
@@ -358,7 +358,7 @@ DISTCLEANFILES = \
|
2016-10-27 13:59:31 +00:00
|
|
|
$(BUILT_SOURCES) \
|
|
|
|
|
iv2h.sh
|
|
|
|
|
|
|
|
|
|
-@MAC_FRAMEWORK_FALSE@draggerdefdatadir = $(datadir)/Coin/draggerDefaults
|
2019-02-04 14:58:55 +00:00
|
|
|
+@MAC_FRAMEWORK_FALSE@draggerdefdatadir = $(datadir)/Coin60/draggerDefaults
|
2016-10-27 13:59:31 +00:00
|
|
|
@MAC_FRAMEWORK_TRUE@draggerdefdatadir = $(MAC_FRAMEWORK_PREFIX)/$(MAC_FRAMEWORK_NAME).framework/Versions/$(MAC_FRAMEWORK_VERSION)/Resources/draggerDefaults
|
|
|
|
|
dist_draggerdefdata_DATA = \
|
|
|
|
|
translate1Dragger.iv \
|
2024-05-08 11:54:36 +00:00
|
|
|
Index: Coin-3.1.3/data/scxml/navigation/Makefile.in
|
|
|
|
|
===================================================================
|
|
|
|
|
--- Coin-3.1.3.orig/data/scxml/navigation/Makefile.in
|
|
|
|
|
+++ Coin-3.1.3/data/scxml/navigation/Makefile.in
|
|
|
|
|
@@ -331,7 +331,7 @@ target_alias = @target_alias@
|
2016-10-27 13:59:31 +00:00
|
|
|
target_cpu = @target_cpu@
|
|
|
|
|
target_os = @target_os@
|
|
|
|
|
target_vendor = @target_vendor@
|
|
|
|
|
-@MAC_FRAMEWORK_FALSE@scxmldefdatadir = $(datadir)/Coin/scxml/navigation
|
2019-02-04 14:58:55 +00:00
|
|
|
+@MAC_FRAMEWORK_FALSE@scxmldefdatadir = $(datadir)/Coin60/scxml/navigation
|
2016-10-27 13:59:31 +00:00
|
|
|
@MAC_FRAMEWORK_TRUE@scxmldefdatadir = $(MAC_FRAMEWORK_PREFIX)/$(MAC_FRAMEWORK_NAME).framework/Versions/$(MAC_FRAMEWORK_VERSION)/Resources/scxml/navigation
|
|
|
|
|
dist_scxmldefdata_DATA = \
|
2019-02-04 14:58:55 +00:00
|
|
|
examiner.xml
|
2024-05-08 11:54:36 +00:00
|
|
|
Index: Coin-3.1.3/data/shaders/lights/Makefile.in
|
|
|
|
|
===================================================================
|
|
|
|
|
--- Coin-3.1.3.orig/data/shaders/lights/Makefile.in
|
|
|
|
|
+++ Coin-3.1.3/data/shaders/lights/Makefile.in
|
|
|
|
|
@@ -341,7 +341,7 @@ DISTCLEANFILES = \
|
2016-10-27 13:59:31 +00:00
|
|
|
$(BUILT_SOURCES) \
|
|
|
|
|
glsl2h.sh
|
|
|
|
|
|
|
|
|
|
-@MAC_FRAMEWORK_FALSE@shaderslightsdatadir = $(datadir)/Coin/shaders/lights
|
2019-02-04 14:58:55 +00:00
|
|
|
+@MAC_FRAMEWORK_FALSE@shaderslightsdatadir = $(datadir)/Coin60/shaders/lights
|
2016-10-27 13:59:31 +00:00
|
|
|
@MAC_FRAMEWORK_TRUE@shaderslightsdatadir = $(MAC_FRAMEWORK_PREFIX)/$(MAC_FRAMEWORK_NAME).framework/Versions/$(MAC_FRAMEWORK_VERSION)/Resources/shaders/lights
|
|
|
|
|
dist_shaderslightsdata_DATA = \
|
|
|
|
|
PointLight.glsl \
|
2024-05-08 11:54:36 +00:00
|
|
|
Index: Coin-3.1.3/data/shaders/vsm/Makefile.in
|
|
|
|
|
===================================================================
|
|
|
|
|
--- Coin-3.1.3.orig/data/shaders/vsm/Makefile.in
|
|
|
|
|
+++ Coin-3.1.3/data/shaders/vsm/Makefile.in
|
|
|
|
|
@@ -338,7 +338,7 @@ DISTCLEANFILES = \
|
2016-10-27 13:59:31 +00:00
|
|
|
$(BUILT_SOURCES) \
|
|
|
|
|
glsl2h.sh
|
|
|
|
|
|
|
|
|
|
-@MAC_FRAMEWORK_FALSE@shadersvsmdatadir = $(datadir)/Coin/shaders/vsm
|
2019-02-04 14:58:55 +00:00
|
|
|
+@MAC_FRAMEWORK_FALSE@shadersvsmdatadir = $(datadir)/Coin60/shaders/vsm
|
2016-10-27 13:59:31 +00:00
|
|
|
@MAC_FRAMEWORK_TRUE@shadersvsmdatadir = $(MAC_FRAMEWORK_PREFIX)/$(MAC_FRAMEWORK_NAME).framework/Versions/$(MAC_FRAMEWORK_VERSION)/Resources/shaders/vsm
|
|
|
|
|
dist_shadersvsmdata_DATA = \
|
|
|
|
|
VsmLookup.glsl
|
2024-05-08 11:54:36 +00:00
|
|
|
Index: Coin-3.1.3/src/misc/CoinResources.cpp
|
|
|
|
|
===================================================================
|
|
|
|
|
--- Coin-3.1.3.orig/src/misc/CoinResources.cpp
|
|
|
|
|
+++ Coin-3.1.3/src/misc/CoinResources.cpp
|
|
|
|
|
@@ -192,7 +192,7 @@ CoinResources::get(const char * resloc,
|
|
|
|
|
handle->filenotfound = TRUE;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
- filename.sprintf("%s/share/Coin/%s", coindirenv, resloc + 5);
|
|
|
|
|
+ filename.sprintf("%s/share/Coin60/%s", coindirenv, resloc + 5);
|
|
|
|
|
#endif // !COIN_MACOSX_FRAMEWORK
|
|
|
|
|
if (COIN_DEBUG && 0) {
|
|
|
|
|
SoDebugError::postInfo("CoinResources::get", "trying to load '%s'.",
|