From f07bcf63c2bfffccaa2b94f08ace8917c23202f2 Mon Sep 17 00:00:00 2001 From: Christoph Willing Date: Wed, 1 Nov 2023 21:51:55 +1000 Subject: graphics/OpenSubdiv: Fixes for glfw3, tbb Signed-off-by: Christoph Willing Signed-off-by: Willy Sudiarto Raharjo --- graphics/OpenSubdiv/OpenSubdiv.SlackBuild | 7 ++++++- graphics/OpenSubdiv/OpenSubdiv.info | 6 ++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/graphics/OpenSubdiv/OpenSubdiv.SlackBuild b/graphics/OpenSubdiv/OpenSubdiv.SlackBuild index 5aa08c104593..d59b4eb3ae09 100644 --- a/graphics/OpenSubdiv/OpenSubdiv.SlackBuild +++ b/graphics/OpenSubdiv/OpenSubdiv.SlackBuild @@ -32,7 +32,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=OpenSubdiv VERSION=${VERSION:-3.6.0} SRCVER=$(echo $VERSION | tr . _) -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -76,6 +76,10 @@ tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz cd $PRGNAM-$SRCVER sed -i -e '/${OPENGL_gl_LIBRARY}/a${OPENGL_glx_LIBRARY}' CMakeLists.txt patch -p0 < $CWD/CUDA-compatibility.patch +if test -e /usr/include/tbb ; then cp $CWD/FindTBB.cmake cmake/ ; fi + +# Silence CL_TARGET_OPENCL_VERSION pragmas +sed -i -e '/opencl.h/i#define CL_TARGET_OPENCL_VERSION 300' opensubdiv/osd/opencl.h chown -R root:root . find -L . \ @@ -96,6 +100,7 @@ cd build -DCMAKE_LIBDIR_BASE=lib${LIBDIRSUFFIX} \ -DCMAKE_DOCDIR_BASE=doc/$PRGNAM-$VERSION \ -DNO_CLEW=ON \ + -DNO_EXAMPLES=ON \ $cuda \ -DCMAKE_BUILD_TYPE=Release .. diff --git a/graphics/OpenSubdiv/OpenSubdiv.info b/graphics/OpenSubdiv/OpenSubdiv.info index da54c3d82867..2e2054533870 100644 --- a/graphics/OpenSubdiv/OpenSubdiv.info +++ b/graphics/OpenSubdiv/OpenSubdiv.info @@ -1,8 +1,10 @@ PRGNAM="OpenSubdiv" VERSION="3.6.0" HOMEPAGE="http://graphics.pixar.com/opensubdiv" -DOWNLOAD="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v3_6_0/OpenSubdiv-3_6_0.tar.gz" -MD5SUM="cd03aaf8890bc0b8550eef62029cabe7" +DOWNLOAD="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v3_6_0/OpenSubdiv-3_6_0.tar.gz \ + https://raw.githubusercontent.com/NVIDIA/thrust/9f1cddc62b1bebbaeb8d07d4476c285be5aa0adc/thrust/cmake/FindTBB.cmake" +MD5SUM="cd03aaf8890bc0b8550eef62029cabe7 \ + f50337da9c4279f8383d216e12191762" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -- cgit v1.2.3