pbslacks V0.70-20211112

Date : 12 novembre 2021
Auteur : Pierre Brochard (pierre.brochard.1982@m4x.org)
Copyright et droits d'auteurs : Pierre Brochard

builds/sbo/Blender/Blender.SlackBuild

@@ -86,6 +86,7 @@ cd $TMP
 rm -rf $SRCNAM-$VERSION
 tar xvf $CWD/$SRCNAM-$VERSION.tar.xz
 cd $SRCNAM-$VERSION
+
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -94,7 +95,8 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # For Python 3.9
-cat $CWD/blender-python3.9-pb.patch|patch -p1
+cat $CWD/patches/blender-python3.9-pb.patch|patch -p1 || exit 1
+cat $CWD/patches/0007-BPY_thread_save_crashes_against_Py3.9.patch|patch -p1 || exit 1
 #cat $CWD/cuda.patch|patch -p1
 
 mkdir -p build
@@ -127,7 +129,7 @@ cd build
     -DWITH_SDL:BOOL=ON \
     -DWITH_SDL_DYNLOAD:BOOL=ON \
     -DCMAKE_BUILD_TYPE=Release \
-    $cuda \
+    $cuda
 
   make
   make install DESTDIR=$PKG

builds/sbo/Blender/patches/0007-BPY_thread_save_crashes_against_Py3.9.patch

@@ -0,0 +1,31 @@
+From: Campbell Burton <ideasman42@gmail.com>
+Date: Wed, 9 Dec 2020 14:59:13 +0100
+Subject: BPY_thread_save_crashes_against_Py3.9
+
+---
+ source/blender/python/generic/bpy_threads.c | 11 ++++-------
+ 1 file changed, 4 insertions(+), 7 deletions(-)
+
+diff --git a/source/blender/python/generic/bpy_threads.c b/source/blender/python/generic/bpy_threads.c
+index 1aa36a0..bd707f7 100644
+--- a/source/blender/python/generic/bpy_threads.c
++++ b/source/blender/python/generic/bpy_threads.c
+@@ -29,14 +29,11 @@
+ /* analogue of PyEval_SaveThread() */
+ BPy_ThreadStatePtr BPY_thread_save(void)
+ {
+-  PyThreadState *tstate = PyThreadState_Swap(NULL);
+-  /* note: tstate can be NULL when quitting Blender */
+-
+-  if (tstate && PyEval_ThreadsInitialized()) {
+-    PyEval_ReleaseLock();
++  /* The thread-state can be NULL when quitting Blender. */
++  if (_PyThreadState_UncheckedGet()) {
++    return (BPy_ThreadStatePtr)PyEval_SaveThread();
+   }
+-
+-  return (BPy_ThreadStatePtr)tstate;
++  return NULL;
+ }
+
+ /* analogue of PyEval_RestoreThread() */

builds/sbo/OpenSubdiv/OpenSubdiv.SlackBuild

@@ -0,0 +1,114 @@
+#!/bin/sh
+
+# Slackware build script for Opensubdiv
+
+# Copyright 2019 J. "MUFTI" Scheurich Stuttgart/Germany
+# Copyright 2021 Christoph Willing  Brisbane/Australia
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Modified by Pierre Brochard : pierre.brochard.1982@m4x.org
+
+PRGNAM=OpenSubdiv
+SRCNAM=OpenSubDiv
+VERSION=${VERSION:-3.4.3}
+SRCVER=$(echo $VERSION | tr . _)
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+    case "$( uname -m )" in
+	i?86) ARCH=i586 ;;
+	arm*) ARCH=arm ;;
+	*) ARCH=$( uname -m ) ;;
+    esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+    SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+    LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+    SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+    LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+    SLKCFLAGS="-O2 -fPIC"
+    LIBDIRSUFFIX="64"
+else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+fi
+
+set -e
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$SRCVER
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $PRGNAM-$SRCVER
+
+chown -R root:root .
+find -L . \
+     \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+     -o -perm 511 \) -exec chmod 755 {} \; -o \
+     \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+     -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+cat $CWD/cuda-min.patch | patch -p0 || exit 1
+
+if [ -d /usr/lib$LIBDIRSUFFIX/nvidia-bumblebee/cuda/include ] ;then 
+    export CUDA_TOOLKIT_ROOT_DIR=/usr/lib$LIBDIRSUFFIX/nvidia-bumblebee/cuda
+    export PATH=/usr/lib$LIBDIRSUFFIX/nvidia-bumblebee/cuda/bin${PATH:+:$PATH}
+fi
+
+mkdir -p build
+cd build
+cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_LIBDIR_BASE=lib${LIBDIRSUFFIX} \
+    -DCMAKE_DOCDIR_BASE=doc/$PRGNAM-$VERSION \
+    -DCUDA_TOOLKIT_ROOT_DIR=$CUDA_TOOLKIT_ROOT_DIR \
+    -DCUDA_HOST_COMPILER=$CUDA_TOOLKIT_ROOT_DIR/bin/gcc \
+    -DCMAKE_BUILD_TYPE=Release ..
+
+make
+make install DESTDIR=$PKG
+cd ..
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \
+    grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -rf documentation/* $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+# Can't have tutorials directory in /usr/bin
+mv $PKG/usr/bin/tutorials $PKG/usr/doc/$PRGNAM-$VERSION/
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}

builds/sbo/OpenSubdiv/OpenSubdiv.info

@@ -0,0 +1,10 @@
+PRGNAM="OpenSubdiv"
+VERSION="3.4.3"
+HOMEPAGE="http://graphics.pixar.com/opensubdiv"
+DOWNLOAD="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v3_4_3/OpenSubDiv-3.4.3.tar.gz"
+MD5SUM="7bbfa275d021fb829e521df749160edb"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Christoph Willing"
+EMAIL="chris.willing@linux.com"

builds/sbo/OpenSubdiv/README

@@ -0,0 +1,8 @@
+OpenSubdiv is a set of open source libraries that implement high performance 
+subdivision surface (subdiv) evaluation on massively parallel CPU and 
+GPU architectures. This code path is optimized for drawing deforming surfaces 
+with static topology at interactive framerates.
+
+Additional utility is available in OpenSubdiv when the following SBo packages
+are installed and detected at build time:
+    tbb cudatoolkit opencl-headers glfw docutils

builds/sbo/OpenSubdiv/cuda-min.patch

@@ -0,0 +1,19 @@
+--- CMakeLists.txt.old	2021-11-13 15:17:58.115009663 +0100
++++ CMakeLists.txt	2021-11-13 15:19:23.084576553 +0100
+@@ -574,11 +574,15 @@
+         list( APPEND CUDA_NVCC_FLAGS -Xcompiler -fPIC )
+         if (NOT DEFINED OSD_CUDA_NVCC_FLAGS)
+             if (CUDA_VERSION_MAJOR LESS 6)
+                 set( OSD_CUDA_NVCC_FLAGS --gpu-architecture compute_11 )
+             else()
+-                set( OSD_CUDA_NVCC_FLAGS --gpu-architecture compute_20 )
++                if (CUDA_VERSION_MAJOR LESS 10)
++                    set( OSD_CUDA_NVCC_FLAGS --gpu-architecture compute_20 )
++                else()
++                    set( OSD_CUDA_NVCC_FLAGS --gpu-architecture compute_30 )
++                endif()
+             endif()
+         endif()
+     endif()
+
+     if (DEFINED OSD_CUDA_NVCC_FLAGS)

builds/sbo/OpenSubdiv/slack-desc

@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+OpenSubdiv: OpenSubdiv (The OpenSubdiv Library)
+OpenSubdiv:
+OpenSubdiv: OpenSubdiv is a set of open source libraries that implement high
+OpenSubdiv: performance subdivision surface (subdiv) evaluation on massively
+OpenSubdiv: parallel CPU and GPU architectures. This code path is optimized
+OpenSubdiv: for drawing deforming surfaces with static topology at interactive
+OpenSubdiv: framerates.
+OpenSubdiv:
+OpenSubdiv:
+OpenSubdiv: Project URL: http://graphics.pixar.com/opensubdiv/
+OpenSubdiv:

pbaspiresources

@@ -38,7 +38,7 @@ fi
 	cd openshot
 	for i in zeromq protobuf libopenshot-audio libopenshot openshot_qt lxml \
 			inkscape opencolorio pybind11 openimageio numpy3 tbb \
-			Blender ;do
+			OpenSubdiv Blender ;do
 	    xgetsbosrc "$i"
 	done
 	xlocalsrcpac gstreamer0 "gstreamer-0.10.36.tar.xz"

pbcompilepost

@@ -197,8 +197,8 @@ if [ $ISOPENSHOT -eq 1 ] ;then
     for i in gstreamer0 gst-plugins-base0 python2-mlt \
 			python2-libcaca python2-libwebp python-pillow6 \
 			zeromq protobuf libopenshot-audio libopenshot \
-			openshot_qt lxml inkscape pybind11 \
-			openimageio opencolorio numpy3 tbb Blender openshot ;do
+			openshot_qt lxml inkscape pybind11 openimageio \
+			opencolorio numpy3 tbb OpenSubdiv Blender openshot ;do
 	xmakepac packages/openshot $i
     done
     xhookopenshot