summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author B. Watson2021-02-15 20:47:20 +0100
committer Willy Sudiarto Raharjo2021-02-20 18:05:07 +0100
commit9ebcc29e15ba02ea7a4eaf7acd74796ed3ea1b4b (patch)
tree1058ce65f7c461864ac3dca097359034ce2de0be
parent9b948dd5af9bd63ee1da8e6ba96cd940114f7fca (diff)
downloadslackbuilds-9ebcc29e15ba02ea7a4eaf7acd74796ed3ea1b4b.tar.gz
libraries/ogre: Fix build if assimp present.
Signed-off-by: B. Watson <yalhcru@gmail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--libraries/ogre/README2
-rw-r--r--libraries/ogre/ogre.SlackBuild6
2 files changed, 6 insertions, 2 deletions
diff --git a/libraries/ogre/README b/libraries/ogre/README
index aa9b86f9ef..651c87caf3 100644
--- a/libraries/ogre/README
+++ b/libraries/ogre/README
@@ -35,5 +35,3 @@ zziplib, FreeImage, tbb, cppunit, ois, nvidia-cg-toolkit
Optional dependencies NOT (yet) available at SlackBuilds.org:
opengles, POCO
-
-NOTE: This will not build if assimp is installed.
diff --git a/libraries/ogre/ogre.SlackBuild b/libraries/ogre/ogre.SlackBuild
index 277ea64fb4..294590f265 100644
--- a/libraries/ogre/ogre.SlackBuild
+++ b/libraries/ogre/ogre.SlackBuild
@@ -24,6 +24,11 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 20210215 bkw: modified by SlackBuilds.org: force-disable the assimp
+# plugin. Our assimp is too old (or too new?) for this version of
+# ogre. This allows ogre to be built on a system where assimp is
+# installed.
+
PRGNAM=ogre
VERSION=${VERSION:-1.12.9}
IMGUIVER=${IMGUIVER:-1.77}
@@ -91,6 +96,7 @@ tar xvf $CWD/imgui-$IMGUIVER.tar.gz
-DOGRE_BUILD_DEPENDENCIES=FALSE \
-DOGRE_BUILD_PLUGIN_FREEIMAGE=TRUE \
-DOGRE_INSTALL_SAMPLES_SOURCE=$OGRE_INSTALL_SAMPLES_SOURCE \
+ -DOGRE_BUILD_PLUGIN_ASSIMP=FALSE \
../
make
make install DESTDIR=$PKG