Merge pull request #35 from howetuft/update

Bug fixing (exr crash) + llvm-openmp for MacOS (to restore 14.x compatibility)

Author: howetuft

conan-local-recipes/recipes/imguifiledialog/all/conanfile.py

@@ -27,7 +27,7 @@ class ImguiFileDialogConan(ConanFile):
         "fPIC": True,
         "use_std_filesystem": True,
     }
-    requires = "imgui/[1.92.5]"  # Must be same version as in main conanfile.py
+    requires = "imgui/[>=1.0 <2.0]"  # Must be same version as in main conanfile.py
 
 
     def config_options(self):

conan-profiles/conan-profile-Linux-X64

@@ -29,7 +29,7 @@ tools.build:cflags+=["-fsanitize=address", "-fno-omit-frame-pointer"]
 tools.build:cxxflags+=["-fsanitize=address", "-fno-omit-frame-pointer"]
 
 tools.build:sharedlinkflags=["-fsanitize=address"]
-tools.cmake.cmaketoolchain:extra_variables={ 'COMPILER_RT_BUILD_SHARED_ASAN':'ON' }
+tools.cmake.cmaketoolchain:extra_variables={ 'COMPILER_RT_BUILD_SHARED_ASAN':'ON', 'CMAKE_BUILD_PARALLEL_LEVEL':'' }
 openvdb/*:tools.cmake.cmaketoolchain:extra_variables={ 'COMPILER_RT_BUILD_SHARED_ASAN':'ON', 'USE_CCACHE':'OFF' }
 
 {% else -%}

conan-profiles/conan-profile-common

@@ -3,7 +3,6 @@ build_type={{ os.getenv("DEPS_BUILD_TYPE", "Release") }}
 
 # For tools, we'll always use release version
 # (directly downloaded from cache)
-b2/*:build_type=Release
 cmake/*:build_type=Release
 meson/*:build_type=Release
 pkgconf/*:build_type=Release
@@ -13,6 +12,8 @@ bison/*:build_type=Release
 flex/*:build_type=Release
 winflexbison/*:build_type=Release
 doxygen/*:build_type=Release
+m4/*:build_type=Release
+b2/*:build_type=Release
 
 [conf]
 tools.system.package_manager:mode=install
@@ -29,6 +30,7 @@ yasm/*
 [options]
 oidn/*:shared=True
 opensubdiv/*:with_tbb=True
+opensubdiv/*:with_opengl=False
 spdlog/*:header_only=True
 spdlog/*:use_std_fmt=True
 nvrtc/*:shared=True

conanfile.py

@@ -17,22 +17,22 @@
 EMBREE_VERSION = "4.4.0"
 FMT_VERSION = "12.1.0"
 GLFW_VERSION = "3.4"
-IMATH_VERSION = "3.2.1"
-IMGUI_VERSION = "1.92.5"
+IMATH_VERSION = "3.2.2"
+IMGUI_VERSION = "1.92.7"
 IMGUIFILEDIALOG_VERSION = "0.6.7"
 LIBDEFLATE_VERSION = "1.25"
 LIBTIFF_VERSION = "4.7.1"
 LLVM_OPENMP_VERSION = "20.1.6"
-MINIZIP_VERSION = "4.0.7"
+MINIZIP_VERSION = "4.1.0"
 NINJA_VERSION = "1.13.2"
 NLOHMANN_JSON_VERSION = "3.12.0"
 NVRTC_VERSION = "12.8.93"
 OCIO_VERSION = "2.5.1"
-OIIO_VERSION = "3.1.10.0"
+OIIO_VERSION = "3.1.12.0"
 OIDN_VERSION = "2.3.3"
 ONETBB_VERSION = "2022.3.0"
-OPENEXR_VERSION = "3.4.4"
-OPENJPH_VERSION = "0.25.3"
+OPENEXR_VERSION = "3.4.10"
+OPENJPH_VERSION = "0.27.0"
 OPENSUBDIV_VERSION = "3.7.0"
 OPENVDB_VERSION = "12.1.1"
 PYBIND11_VERSION = "3.0.1"
@@ -163,6 +163,8 @@ def build_requirements(self):
         self.tool_requires("meson/[*]")
         self.tool_requires("pkgconf/[*]")
         self.tool_requires("yasm/[*]")
+        self.tool_requires("m4/[*]")
+        self.tool_requires("b2/[*]")
 
     def generate(self):
         tc = CMakeToolchain(self)

run-conan.sh

@@ -21,7 +21,7 @@ CONAN_PROFILE=conan-profile-${RUNNER_OS}-${RUNNER_ARCH}
 # gradually happen and finally break the build.
 # To the contrary, you may need to upgrade this commit when you want to upgrade
 # a given dependency.
-CONAN_COMMIT=d60a35f00bf85fd1abf2df0877878f54404e3df0
+CONAN_COMMIT=500fc1507de61f99c2fc3e2711a2636e9a949feb
 
 # Debug utility (install a specific package)
 function debug() {
@@ -33,7 +33,7 @@ function debug() {
     --build="*"
 }
 
-# Script starts here
+# THIS SCRIPT STARTS HERE
 
 # 0. Initialize: set globals and install conan and ninja
 set -exo pipefail
@@ -77,9 +77,9 @@ if [ ! -d "conan-center-index" ]; then
   #git remote add "upstream" git@github.com:conan-io/conan-center-index.git
   #git fetch upstream pull/29758/head:giflib
   #git cherry-pick 0e95d1b1e8380d72df48c7c48efe14f39239826a
-  git config --global user.name "LuxCoreDeps"
-  git config --global user.email "luxcoredeps@luxcore.com"
-  curl -L https://github.com/conan-io/conan-center-index/pull/29758.patch | git am
+  #git config --global user.name "LuxCoreDeps"
+  #git config --global user.email "luxcoredeps@luxcore.com"
+  #curl -L https://github.com/conan-io/conan-center-index/pull/29758.patch | git am
 
   cd ..
 fi
@@ -120,7 +120,9 @@ echo "::group::CIBW_BEFORE_BUILD: Install tool requirements"
 # We specify conancenter as a remote, thus allowing to use precompiled
 # binaries.
 # For pkgconf and meson, we have to manually target the right version
-build_deps=(b2/[*] cmake/[*] m4/[*] pkgconf/2.1.0 meson/1.2.2 yasm/[*])
+# b2 is required to be built from source (therefore not in the below list, for
+# libc compatibility
+build_deps=(cmake/[*] m4/[*] pkgconf/2.1.0 meson/1.2.2 yasm/[*])
 if [[ $RUNNER_OS == "Windows" ]]; then
   build_deps+=(msys2/[*])
 fi
@@ -129,8 +131,7 @@ for d in "${build_deps[@]}"; do
     --tool-requires=${d} \
     --profile:all=$CONAN_PROFILE \
     --build=missing \
-    --remote=conancenter \
-    --build=b2/*
+    --remote=conancenter
 done
 echo "::endgroup::"
 
@@ -175,7 +176,11 @@ echo "::endgroup::"
 
 # 8. Save result
 echo "::group::Saving dependencies in ${cache_dir}"
-conan cache clean "*"  # Clean non essential files
+if [[ -n "$CI" ]]; then
+  # Clean non essential files, but only for CI, as we consider that non-CI
+  # builds are debugging builds and should be provided maximal data
+  conan cache clean "*"
+fi
 conan remove -c -vverbose "*/*#!latest"  # Keep only latest version of each package
 # Save only dependencies of current target (otherwise cache gets bloated)
 conan graph info \

utils/local-CI-build.sh utils/CI-local-build.shutils/local-CI-build.sh renamed to utils/CI-local-build.sh

@@ -4,10 +4,13 @@ echo "Cleaning Conan intermediary files"
 
 files=(
   "conanbuildenv-release-x86_64.sh" \
+  "conanbuildenv-debug-x86_64.sh" \
   "conanbuild.sh" \
   "conanrunenv-release-x86_64.sh" \
+  "conanrunenv-debug-x86_64.sh" \
   "conanrun.sh" \
   "deactivate_conanbuildenv-release-x86_64.sh" \
+  "deactivate_conanbuildenv-debug-x86_64.sh" \
   "deactivate_conanbuild.sh" \
   "deactivate_conanrun.sh" \
   "graph.json" \

utils/clean-conan-files.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+# Tip: to clean before running, you can issue a `conan remove "*" -c`
+# Warning: this command will totally erase your cache
+# You may also want to clean /tmp/conan-cache, to avoid reinjection of previous
+# builds in the current one
+
+# Specialized for Linux, but could be changed
+export RUNNER_OS=Linux
+export RUNNER_ARCH=X64
+
+
+export LUXDEPS_VERSION=test
+export GCC_VERSION=14   # Note: even for gcc > 14
+export WORKSPACE=.
+export CXX_VERSION=20
+export CMAKE_POLICY_VERSION_MINIMUM=3.25
+export DEPS_BUILD_TYPE=Debug  # Or Release/RelWithDebInfo/MinSizeRel, as needed
+export cache_dir
+
+# Run conan
+export CMAKE_BUILD_PARALLEL_LEVEL=
+source run-conan.sh 2>&1 | tee /tmp/run-conan.log
+
+# Zip file
+cd /tmp/conan-cache
+zip -1 luxcoredeps.zip conan-cache-save.tgz build-info.json