diff options
author | Stefan Werner <stefan.werner@tangent-animation.com> | 2018-11-07 22:44:40 +0300 |
---|---|---|
committer | Stefan Werner <stefan.werner@tangent-animation.com> | 2018-11-07 22:44:40 +0300 |
commit | 85a97449051a85538d1d8cb10c7efb83a50edf77 (patch) | |
tree | 33bf0f6ee600f732342e9552366ae7fbba48fdc9 /build_files | |
parent | 6be69a6b75f6e947a5f238c4c08c5b061117dd4b (diff) | |
parent | ee6cc1d558babde4bfd2fe1d2876136d69029bac (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files')
-rwxr-xr-x | build_files/build_environment/install_deps.sh | 227 |
1 files changed, 222 insertions, 5 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index 08e18d840fb..6ce5fd9a8fb 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -26,17 +26,17 @@ ARGS=$( \ getopt \ -o s:i:t:h \ --long source:,install:,tmp:,info:,threads:,help,show-deps,no-sudo,no-build,no-confirm,\ -with-all,with-opencollada,with-jack,\ +with-all,with-opencollada,with-jack,with-embree,\ ver-ocio:,ver-oiio:,ver-llvm:,ver-osl:,ver-osd:,ver-openvdb:,\ force-all,force-python,force-numpy,force-boost,\ force-ocio,force-openexr,force-oiio,force-llvm,force-osl,force-osd,force-openvdb,\ -force-ffmpeg,force-opencollada,force-alembic,\ +force-ffmpeg,force-opencollada,force-alembic,force-embree,\ build-all,build-python,build-numpy,build-boost,\ build-ocio,build-openexr,build-oiio,build-llvm,build-osl,build-osd,build-openvdb,\ -build-ffmpeg,build-opencollada,build-alembic,\ +build-ffmpeg,build-opencollada,build-alembic,build-embree,\ skip-python,skip-numpy,skip-boost,\ skip-ocio,skip-openexr,skip-oiio,skip-llvm,skip-osl,skip-osd,skip-openvdb,\ -skip-ffmpeg,skip-opencollada,skip-alembic \ +skip-ffmpeg,skip-opencollada,skip-alembic,skip-embree \ -- "$@" \ ) @@ -54,8 +54,9 @@ SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) # Do not install some optional, potentially conflicting libs by default... WITH_ALL=false -# Do not yet enable opencollada, use --with-opencollada (or --with-all) option to try it. +# Do not yet enable opencollada or embree, use --with-opencollada/--with-embree (or --with-all) option to try it. WITH_OPENCOLLADA=false +WITH_EMBREE=false THREADS=$(nproc) @@ -67,6 +68,7 @@ or use --source/--install options, if you want to use other paths! Number of threads for building: \$THREADS (automatically detected, use --threads=<nbr> to override it). Full install: \$WITH_ALL (use --with-all option to enable it). Building OpenCOLLADA: \$WITH_OPENCOLLADA (use --with-opencollada option to enable it). +Building Embree: \$WITH_EMBREE (use --with-embree option to enable it). Example: Full install without OpenCOLLADA: --with-all --skip-opencollada @@ -113,6 +115,9 @@ ARGUMENTS_INFO="\"COMMAND LINE ARGUMENTS: --with-opencollada Build and install the OpenCOLLADA libraries. + --with-embree + Build and install the Embree libraries. + --with-jack Install the jack libraries. @@ -177,6 +182,9 @@ ARGUMENTS_INFO="\"COMMAND LINE ARGUMENTS: --build-opencollada Force the build of OpenCOLLADA. + --build-embree + Force the build of Embree. + --build-ffmpeg Force the build of FFMpeg. @@ -229,6 +237,9 @@ ARGUMENTS_INFO="\"COMMAND LINE ARGUMENTS: --force-opencollada Force the rebuild of OpenCOLLADA. + --force-embree + Force the rebuild of Embree. + --force-ffmpeg Force the rebuild of FFMpeg. @@ -274,6 +285,9 @@ ARGUMENTS_INFO="\"COMMAND LINE ARGUMENTS: --skip-opencollada Unconditionally skip OpenCOLLADA installation/building. + --skip-Embree + Unconditionally skip Embree installation/building. + --skip-ffmpeg Unconditionally skip FFMpeg installation/building.\"" @@ -369,6 +383,12 @@ OPENCOLLADA_FORCE_BUILD=false OPENCOLLADA_FORCE_REBUILD=false OPENCOLLADA_SKIP=false + +EMBREE_VERSION="3.2.4" +EMBREE_FORCE_BUILD=false +EMBREE_FORCE_REBUILD=false +EMBREE_SKIP=false + FFMPEG_VERSION="4.0.2" FFMPEG_VERSION_MIN="2.8.4" FFMPEG_FORCE_BUILD=false @@ -502,6 +522,9 @@ while true; do --with-opencollada) WITH_OPENCOLLADA=true; shift; continue ;; + --with-embree) + WITH_EMBREE=true; shift; continue + ;; --with-jack) WITH_JACK=true; shift; continue; ;; @@ -547,6 +570,7 @@ while true; do OSD_FORCE_BUILD=true OPENVDB_FORCE_BUILD=true OPENCOLLADA_FORCE_BUILD=true + EMBREE_FORCE_BUILD=true FFMPEG_FORCE_BUILD=true ALEMBIC_FORCE_BUILD=true shift; continue @@ -588,6 +612,9 @@ while true; do --build-opencollada) OPENCOLLADA_FORCE_BUILD=true; shift; continue ;; + --build-embree) + EMBREE_FORCE_BUILD=true; shift; continue + ;; --build-ffmpeg) FFMPEG_FORCE_BUILD=true; shift; continue ;; @@ -606,6 +633,7 @@ while true; do OSD_FORCE_REBUILD=true OPENVDB_FORCE_REBUILD=true OPENCOLLADA_FORCE_REBUILD=true + EMBREE_FORCE_REBUILD=true FFMPEG_FORCE_REBUILD=true ALEMBIC_FORCE_REBUILD=true shift; continue @@ -645,6 +673,9 @@ while true; do --force-opencollada) OPENCOLLADA_FORCE_REBUILD=true; shift; continue ;; + --force-embree) + EMBREE_FORCE_REBUILD=true; shift; continue + ;; --force-ffmpeg) FFMPEG_FORCE_REBUILD=true; shift; continue ;; @@ -684,6 +715,9 @@ while true; do --skip-opencollada) OPENCOLLADA_SKIP=true; shift; continue ;; + --skip-embree) + EMBREE_SKIP=true; shift; continue + ;; --skip-ffmpeg) FFMPEG_SKIP=true; shift; continue ;; @@ -708,6 +742,9 @@ done if [ "$WITH_ALL" = true -a "$OPENCOLLADA_SKIP" = false ]; then WITH_OPENCOLLADA=true fi +if [ "$WITH_ALL" = true -a "$EMBREE_SKIP" = false ]; then + WITH_EMBREE=true +fi if [ "$WITH_ALL" = true ]; then WITH_JACK=true fi @@ -796,6 +833,13 @@ OPENCOLLADA_SOURCE=( "https://github.com/KhronosGroup/OpenCOLLADA/archive/v${OPE #~ OPENCOLLADA_REPO_UID="e937c3897b86fc0da53cde97257f5156" #~ OPENCOLLADA_REPO_BRANCH="master" +EMBREE_USE_REPO=false +EMBREE_SOURCE=( "https://github.com/embree/embree/archive/v${EMBREE_VERSION}.tar.gz" ) +#~ EMBREE_SOURCE_REPO=( "https://github.com/embree/embree.git" ) +#~ EMBREE_REPO_UID="4a12bfed63c90e85b6eab98b8cdd8dd2a3ba5809" +#~ EMBREE_REPO_BRANCH="master" + + FFMPEG_SOURCE=( "http://ffmpeg.org/releases/ffmpeg-$FFMPEG_VERSION.tar.bz2" ) # C++11 is required now @@ -836,6 +880,7 @@ You may also want to build them yourself (optional ones are [between brackets]): * [OpenSubDiv $OSD_VERSION_MIN] (from $OSD_SOURCE_REPO, branch $OSD_SOURCE_REPO_BRANCH, commit $OSD_SOURCE_REPO_UID). * [OpenVDB $OPENVDB_VERSION_MIN] (from $OPENVDB_SOURCE), [Blosc $OPENVDB_BLOSC_VERSION] (from $OPENVDB_BLOSC_SOURCE). * [OpenCollada $OPENCOLLADA_VERSION] (from $OPENCOLLADA_SOURCE). + * [Embree $EMBREE_VERSION] (from $EMBREE_SOURCE). * [Alembic $ALEMBIC_VERSION] (from $ALEMBIC_SOURCE).\"" if [ "$DO_SHOW_DEPS" = true ]; then @@ -2411,6 +2456,101 @@ compile_OpenCOLLADA() { fi } +#### Build Embree #### +_init_embree() { + _src=$SRC/embree-$EMBREE_VERSION + _git=true + _inst=$INST/embree-$EMBREE_VERSION + _inst_shortcut=$INST/embree +} + +clean_Embree() { + _init_embree + _clean +} + +compile_Embree() { + if [ "$NO_BUILD" = true ]; then + WARNING "--no-build enabled, Embree will not be compiled!" + return + fi + + # To be changed each time we make edits that would modify the compiled results! + embree_magic=9 + _init_embree + + # Clean install if needed! + magic_compile_check embree-$EMBREE_VERSION $embree_magic + if [ $? -eq 1 -o "$EMBREE_FORCE_REBUILD" = true ]; then + clean_Embree + fi + + if [ ! -d $_inst ]; then + INFO "Building Embree-$EMBREE_VERSION" + + prepare_opt + + if [ ! -d $_src ]; then + mkdir -p $SRC + if [ "EMBREE_USE_REPO" = true ]; then + git clone $EMBREE_SOURCE_REPO $_src + else + download EMBREE_SOURCE[@] "$_src.tar.gz" + INFO "Unpacking Embree-$EMBREE_VERSION" + tar -C $SRC -xf $_src.tar.gz + fi + fi + + cd $_src + + if [ "$EMBREE_USE_REPO" = true ]; then + git pull origin $EMBREE_REPO_BRANCH + + # Stick to same rev as windows' libs... + git checkout $EMBREE_REPO_UID + git reset --hard + fi + + # Always refresh the whole build! + if [ -d build ]; then + rm -rf build + fi + mkdir build + cd build + + cmake_d="-D CMAKE_BUILD_TYPE=Release" + cmake_d="$cmake_d -D CMAKE_INSTALL_PREFIX=$_inst" + cmake_d="$cmake_d -D EMBREE_ISPC_SUPPORT=OFF" + cmake_d="$cmake_d -D EMBREE_TUTORIALS=OFF" + cmake_d="$cmake_d -D EMBREE_STATIC_LIB=ON" + cmake_d="$cmake_d -D EMBREE_RAY_MASK=ON" + cmake_d="$cmake_d -D EMBREE_FILTER_FUNCTION=ON" + cmake_d="$cmake_d -D EMBREE_BACKFACE_CULLING=OFF" + cmake_d="$cmake_d -D EMBREE_TASKING_SYSTEM=INTERNAL" + cmake_d="$cmake_d -D EMBREE_MAX_ISA=AVX2" + + cmake $cmake_d ../ + + make -j$THREADS && make install + make clean + + if [ -d $_inst ]; then + _create_inst_shortcut + else + ERROR "Embree-$EMBREE_VERSION failed to compile, exiting" + exit 1 + fi + + magic_compile_set embree-$EMBREE_VERSION $embree_magic + + cd $CWD + INFO "Done compiling Embree-$EMBREE_VERSION!" + else + INFO "Own Embree-$EMBREE_VERSION is up to date, nothing to do!" + INFO "If you want to force rebuild of this lib, use the --force-embree option." + fi +} + #### Build FFMPEG #### _init_ffmpeg() { _src=$SRC/ffmpeg-$FFMPEG_VERSION @@ -2978,6 +3118,23 @@ install_DEB() { fi fi + if [ "$WITH_EMBREE" = true ]; then + _do_compile_embree=false + PRINT "" + if [ "$EMBREE_SKIP" = true ]; then + WARNING "Skipping Embree installation, as requested..." + elif [ "$EMBREE_FORCE_BUILD" = true ]; then + INFO "Forced Embree building, as requested..." + _do_compile_embree=true + else + # No package currently! + _do_compile_embree=true + fi + + if [ "$_do_compile_embree" = true ]; then + compile_Embree + fi + fi PRINT "" if [ "$FFMPEG_SKIP" = true ]; then @@ -3525,6 +3682,23 @@ install_RPM() { fi fi + if [ "$WITH_EMBREE" = true ]; then + PRINT "" + _do_compile_embree=false + if [ "$OPENCOLLADA_SKIP" = true ]; then + WARNING "Skipping Embree installation, as requested..." + elif [ "$EMBREE_FORCE_BUILD" = true ]; then + INFO "Forced Embree building, as requested..." + _do_compile_embree=true + else + # No package... + _do_compile_embree=true + fi + + if [ "$_do_compile_embree" = true ]; then + compile_Embree + fi + fi PRINT "" if [ "$FFMPEG_SKIP" = true ]; then @@ -3955,6 +4129,28 @@ install_ARCH() { fi fi + if [ "$WITH_EMBREE" = true ]; then + PRINT "" + _do_compile_embree=false + if [ "$EMBREE_SKIP" = true ]; then + WARNING "Skipping Embree installation, as requested..." + elif [ "$EMBREE_FORCE_BUILD" = true ]; then + INFO "Forced Embree building, as requested..." + _do_compile_embree=true + else + check_package_ARCH embree + if [ $? -eq 0 ]; then + install_packages_ARCH embree + clean_Embree + else + _do_compile_embree=true + fi + fi + + if [ "$_do_compile_embree" = true ]; then + compile_Embree + fi + fi PRINT "" if [ "$FFMPEG_SKIP" = true ]; then @@ -4126,6 +4322,21 @@ install_OTHER() { fi fi + if [ "$WITH_EMBREE" = true ]; then + _do_compile_embree=false + PRINT "" + if [ "$EMBREE_SKIP" = true ]; then + WARNING "Skipping Embree installation, as requested..." + elif [ "$EMBREE_FORCE_BUILD" = true ]; then + INFO "Forced Embree building, as requested..." + _do_compile_embree=true + fi + + if [ "$_do_compile_embree" = true ]; then + PRINT "" + compile_Embree + fi + fi PRINT "" if [ "$FFMPEG_SKIP" = true ]; then @@ -4321,6 +4532,12 @@ print_info() { _buildargs="$_buildargs $_1" fi + if [ "$WITH_EMBREE" = true ]; then + _1="-D WITH_CYCLES_EMBREE=ON" + PRINT " $_1" + _buildargs="$_buildargs $_1" + fi + if [ "$WITH_JACK" = true ]; then _1="-D WITH_JACK=ON" _2="-D WITH_JACK_DYNLOAD=ON" |