aboutsummaryrefslogtreecommitdiff
path: root/libraries/ogre
diff options
context:
space:
mode:
authorB. Watson <yalhcru@gmail.com>2022-02-14 22:50:47 -0500
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2022-02-16 08:20:05 +0700
commit52dc75ef226ec6d98d7e53c737e6af2820872876 (patch)
treea554035f188128e942ed26c021b7e9ca00d13d97 /libraries/ogre
parent82e4103f4e602d08f339dc76976abf28e391f9d2 (diff)
libraries/ogre: Fix 15.0 build.
Signed-off-by: B. Watson <yalhcru@gmail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'libraries/ogre')
-rw-r--r--libraries/ogre/ogre.SlackBuild11
-rw-r--r--libraries/ogre/ogre.info4
2 files changed, 9 insertions, 6 deletions
diff --git a/libraries/ogre/ogre.SlackBuild b/libraries/ogre/ogre.SlackBuild
index c063b67cdfa07..ce86205390d14 100644
--- a/libraries/ogre/ogre.SlackBuild
+++ b/libraries/ogre/ogre.SlackBuild
@@ -29,11 +29,16 @@
# ogre. This allows ogre to be built on a system where assimp is
# installed.
+# 20220214 bkw: Modified by SlackBuilds.org again: ogre-13.2.4 really
+# wants imgui-1.85 (not 1.86; it was failing to build with that). Also,
+# we can use assimp now, so get rid of -DOGRE_BUILD_PLUGIN_ASSIMP=FALSE.
+# It will be autodetected, the build will succeed with or without it.
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=ogre
VERSION=${VERSION:-13.2.4}
-IMGUIVER=${IMGUIVER:-1.86}
+IMGUIVER=${IMGUIVER:-1.85}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -94,8 +99,7 @@ find -L . \
mkdir build
cd build
-tar xvf $CWD/imgui-$IMGUIVER.tar.gz
- export "PATH=/opt/cmake-202x/bin:$PATH"
+ tar xvf $CWD/imgui-$IMGUIVER.tar.gz
CXXFLAGS+=' -Wno-deprecated-declarations' \
cmake -DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \
@@ -106,7 +110,6 @@ 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 \
-DOGRE_BUILD_COMPONENT_CSHARP=FALSE \
../
make
diff --git a/libraries/ogre/ogre.info b/libraries/ogre/ogre.info
index 7c57ef1cadc28..d24d94a101574 100644
--- a/libraries/ogre/ogre.info
+++ b/libraries/ogre/ogre.info
@@ -2,9 +2,9 @@ PRGNAM="ogre"
VERSION="13.2.4"
HOMEPAGE="https://www.ogre3d.org/"
DOWNLOAD="https://github.com/OGRECave/ogre/archive/v13.2.4/ogre-13.2.4.zip \
-https://github.com/ocornut/imgui/archive/v1.86/imgui-1.86.tar.gz"
+ https://github.com/ocornut/imgui/archive/v1.85/imgui-1.85.tar.gz"
MD5SUM="b540b3feaebe530370c659013c144d23 \
-82f6ab3267c1831223f6ae03c58baccc"
+ bb710a24164a8dd54369bc4282d9d3b9"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="pugixml"