From 604de491c87ff2319866b54edb3143bbea58bf6c Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Jul 21 2020 15:34:57 +0000 Subject: Add openshadinglanguage dependency Use cmake macros for build and install Reenable upstream patch to build on Python 3.9 for Fedora 33+ (#1843100) --- diff --git a/blender.spec b/blender.spec index 1dd5e62..00d538c 100644 --- a/blender.spec +++ b/blender.spec @@ -187,20 +187,16 @@ rm -f build_files/cmake/Modules/FindOpenJPEG.cmake # Fix all Python shebangs recursively in . pathfix.py -pni "%{__python3} %{py3_shbang_opts}" . -mkdir cmake-make - - %build -pushd cmake-make - -%cmake .. \ + +%cmake \ + -B build %ifnarch %{ix86} x86_64 -DWITH_RAYOPTIMIZATION=OFF \ %endif -DBOOST_ROOT=%{_prefix} \ -DBUILD_SHARED_LIBS=OFF \ -DCMAKE_SKIP_RPATH=ON \ - -DPYTHON_VERSION=%{python3_version} \ -DOpenGL_GL_PREFERENCE=GLVND \ %{?_without_ffmpeg:-DWITH_CODEC_FFMPEG=OFF} \ -DWITH_CYCLES=%{cyclesflag} \ @@ -208,15 +204,13 @@ pushd cmake-make -DWITH_INSTALL_PORTABLE=OFF \ -DWITH_PYTHON_INSTALL=OFF \ -DWITH_PYTHON_INSTALL_REQUESTS=OFF \ - -DWITH_PYTHON_SAFETY=ON + -DWITH_PYTHON_SAFETY=ON \ + . %cmake_build -popd - - + + %install -pushd cmake-make %cmake_install -popd # Thumbnailer