summaryrefslogtreecommitdiffstats
path: root/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild
diff options
context:
space:
mode:
author Christoph Willing2023-06-02 04:33:27 +0200
committer Willy Sudiarto Raharjo2023-06-03 05:38:29 +0200
commit711f58791363051e07db912c6f15be5781a2557c (patch)
tree85b66bef794cb036371117ccdcca2fde8e096b49 /libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild
parent62875008414ac218517c5b569137c5b048cd21dc (diff)
downloadslackbuilds-711f58791363051e07db912c6f15be5781a2557c.tar.gz
libraries/OpenSceneGraph: Ignore OpenCASCADE
Signed-off-by: Christoph Willing <chris.willing@linux.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild')
-rw-r--r--libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild21
1 files changed, 4 insertions, 17 deletions
diff --git a/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild b/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild
index 6edeaadf7f..bcf21cc5d8 100644
--- a/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild
+++ b/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild
@@ -4,7 +4,7 @@
# Written by Aleksandar Samardzic <asamardzic@gmail.com>
# Maintained by Jordan Evans <jordanevans19@gmail.com>
-# Maintained 2018-2021 by Christoph Willing <chris.willing@linux.com>
+# Maintained 2018-2023 by Christoph Willing <chris.willing@linux.com>
cd $(dirname $0) ; CWD=$(pwd)
@@ -48,12 +48,6 @@ else
LIBDIRSUFFIX=""
fi
-# Support OpenCASCADE, if installed
-occ=""
-# Not supported until version 3.5.6
-#ls -l /var/log/packages/OpenCASCADE* 2>/dev/null 1>/dev/null
-#[ $? -eq 0 ] && occ="-DOPENCASCADE_INCLUDE_DIR=/opt/OpenCASCADE/inc -DOPENCASCADE_LIBRARY_TYPE=Shared"
-
set -e
rm -rf $PKG
@@ -69,15 +63,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
-# 20220215 bkw: asio is an optional, auto-detected dependency. Our
-# version of asio is either too new or too old for this. Note
-# that this is Asio (the network library for C++), not
-# ASIO (the Windows low-latency audio API) nor wineasio, nor
-# /usr/include/boost/asio.hpp, whatever that even is. I don't see a
-# way to disable asio support via a cmake variable, so it has to be
-# surgery. Applying this patch disables the RestHttpDevice plugin,
-# hope that's OK.
-patch -p1 < $CWD/disable_asio.diff
+# If installed, ignore asio & OpenCASCADE
+# whose current versions at SBo cause build failure
+patch -p0 < $CWD/no-asio-occ.diff
mkdir -p build
cd build
@@ -87,7 +75,6 @@ cd build
-DCMAKE_INSTALL_PREFIX=/usr \
-DLIB_POSTFIX=$LIBDIRSUFFIX \
-DCMAKE_BUILD_TYPE=Release \
- $occ \
-DBUILD_OSG_EXAMPLES=ON \
make