From c63fa3f3ec20b481813dd7a685daa2a3b4b1a0d6 Mon Sep 17 00:00:00 2001 From: Sergey Lapin Date: Sat, 19 Jul 2025 12:22:50 +0300 Subject: [PATCH] Updates --- build-ogre.sh | 63 +++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 51 insertions(+), 12 deletions(-) diff --git a/build-ogre.sh b/build-ogre.sh index 8b1670a..fb8428a 100755 --- a/build-ogre.sh +++ b/build-ogre.sh @@ -217,13 +217,58 @@ fi rm -Rf blender-base +if [ ! -d blender-tree ]; then + cp -a blender blender-tree + cp -a blender-patches blender-tree/patches + cd blender-tree + quilt push -a + make update +# sed -e 's/set(OPENAL_HASH .*/set(OPENAL_HASH d41d8cd98f00b204e9800998ecf8427e)/g' -i build_files/build_environment/cmake/versions.cmake +# sed -e 's/set(LIBGLU_HASH .*/set(LIBGLU_HASH d41d8cd98f00b204e9800998ecf8427e)/g' -i build_files/build_environment/cmake/versions.cmake + sed -e 's@set(OPENAL_URI .*@set(OPENAL_URI https://github.com/kcat/openal-soft/archive/refs/tags/${OPENAL_VERSION}.tar.gz)@g' -i build_files/build_environment/cmake/versions.cmake + sed -e 's@set(LIBGLU_URI .*@set(LIBGLU_URI https://archive.mesa3d.org/glu/glu-${LIBGLU_VERSION}.tar.xz)@g' -i build_files/build_environment/cmake/versions.cmake + sed -e 's@set(MESA_URI .*@set(MESA_URI https://archive.mesa3d.org/older-versions/21.x/mesa-${MESA_VERSION}.tar.xz)@g' -i build_files/build_environment/cmake/versions.cmake + sed -e 's@set(FRIBIDI_URI .*@set(FRIBIDI_URI https://github.com/fribidi/fribidi/archive/refs/tags/${FRIBIDI_VERSION}.tar.gz)@g' -i build_files/build_environment/cmake/versions.cmake + sed -e 's@set(FRIBIDI_FILE .*@set(FRIBIDI_FILE fribidi-${FRIBIDI_VERSION}.tar.gz)@g' -i build_files/build_environment/cmake/versions.cmake + cd .. +fi +cd blender-tree +for d in 1 2 3 4 5 6; do +if make deps; then break; fi +make release +done +cd .. + + +#cmake -S $(pwd)/blender-tree/build_files/build_environment \ +# -B $(pwd)/blender-deps/build \ +# -DHARVEST_TARGET=$(pwd)/blender-base \ +# -DCMAKE_PREFIX_PATH=$(pwd)/blender-base \ +# -DCMAKE_INSTALL_PREFIX=$(pwd)/blender-base +#cmake -S $(pwd)/blender-deps/build_environment \ +# -B $(pwd)/blender-deps/build \ +# -DHARVEST_TARGET=$(pwd)/blender-base \ +# -DCMAKE_PREFIX_PATH=$(pwd)/blender-base \ +# -DCMAKE_INSTALL_PREFIX=$(pwd)/blender-base +#make -C $(pwd)/blender-deps/build -j8 + +#exit 0 + # blender #blender dependencies build_cmake_stuff blender-static clean release zlib "-DZLIB_BUILD_STATIC=ON -DZLIB_BUILD_SHARED=OFF -DZLIB_BUILD_MINIZIP=OFF" build_cmake_stuff blender-static clean release blender-deps/libdeflate "-DLIBDEFLATE_BUILD_SHARED_LIB=OFF" -build_cmake_stuff blender-static clean release libjpeg-turbo "" +build_cmake_stuff blender-static clean release blender-deps/xz "-DXZ_TOOL_XZDEC=OFF -DXZ_TOOL_LZMADEC=OFF -DXZ_TOOL_LZMAINFO=OFF -DXZ_TOOL_XZ=OFF -DXZ_TOOL_SCRIPTS=OFF" +build_cmake_stuff blender-static clean release libtiff "-Dtiff-tools=OFF -Dtiff-tests=OFF" +build_cmake_stuff blender-static clean release blender-deps/libwebp \ + "-DWEBP_BUILD_ANIM_UTILS=OFF -DWEBP_BUILD_CWEBP=OFF \ + -DWEBP_BUILD_DWEBP=OFF -DWEBP_BUILD_GIF2WEBP=OFF \ + -DWEBP_BUILD_IMG2WEBP=OFF -DWEBP_BUILD_VWEBP=OFF \ + -DWEBP_BUILD_WEBPINFO=OFF -DWEBP_BUILD_WEBPMUX=OFF" +sed -e 's/Libs.private: -lm/Libs.private: -lm -lsharpyuv/g' -i blender-base/lib/pkgconfig/libwebp.pc +build_cmake_stuff blender-static clean release blender-deps/jbigkit-cmake "" +build_cmake_stuff blender-static clean release libjpeg-turbo "-DENABLE_SHARED=FALSE -DWITH_TOOLS=FALSE -DWITH_TESTS=FALSE" build_cmake_stuff blender-static clean release libpng "-DPNG_SHARED=OFF" -build_cmake_stuff blender-static clean release libtiff "" build_cmake_stuff blender-static clean release pugixml "" build_ffmpeg blender clean ffmpeg build_cmake_stuff blender-static clean release assimp "-DASSIMP_BUILD_ZLIB=ON -DBUILD_SHARED_LIBS=OFF" @@ -235,14 +280,10 @@ build_cmake_stuff blender-static clean release fftw-3.3.10 "" build_cmake_stuff blender-static clean release OpenColorIO "-DOCIO_BUILD_TESTS=OFF -DOCIO_BUILD_PYTHON=OFF" build_cmake_stuff blender-static clean release OpenImageIO "-DOIIO_BUILD_TESTS=OFF -DOIIO_BUILD_DOCS=OFF -DOIIO_BUILD_TOOLS=OFF -DOpenImageIO_BUILD_MISSING_DEPS=all -DUSE_PYTHON=0" build_cmake_stuff blender-static clean release OpenColorIO "-DOCIO_BUILD_TESTS=OFF -DOCIO_BUILD_PYTHON=OFF" -if [ ! -d blender-tree ]; then - cp -a blender blender-tree - cp -a blender-patches blender-tree/patches - cd blender-tree - quilt push -a - cd .. -fi +exit 0 + +build_cmake_stuff blender-static clean release blender-deps/openpgl "-DOPENPGL_BUILD_STATIC=ON" cd blender-tree make update cd .. @@ -251,9 +292,7 @@ cd .. build_cmake_stuff blender clean debug release blender-tree \ "-DCMAKE_SKIP_RPATH=OFF \ -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DWITH_CODEC_FFMPEG=ON \ - -DWITH_CODEC_SNDFILE=ON \ - -DWITH_CPU_SSE=OFF \ + -DWITH_CODEC_FFMPEG=ON -DWITH_CODEC_SNDFILE=ON -DWITH_CPU_SSE=OFF \ -DWITH_CYCLES=ON -DWITH_CYCLES_EMBREE=OFF -DWITH_DOC_MANPAGE=OFF -DWITH_FFTW3=ON -DWITH_GAMEENGINE=ON -DWITH_IMAGE_OPENJPEG=ON \ -DWITH_INPUT_NDOF=ON -DWITH_INSTALL_PORTABLE=OFF -DWITH_MOD_OCEANSIM=ON -DWITH_OPENCOLLADA=ON -DWITH_OPENCOLORIO=ON \ -DWITH_OPENSUBDIV=ON -DWITH_OPENVDB=OFF -DWITH_PLAYER=ON -DWITH_PYTHON_INSTALL=ON -DWITH_SYSTEM_GLEW=ON \