From 450da7de80a6e28dc3f7698230a56533accb46b5 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 26 Sep 2024 21:56:10 +0000 Subject: [PATCH 01/15] updated v6.0.0 --- recipe/meta.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2b4549a..a06a7c4 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ {% set repo_name = "gz-common" %} {% set component_name = repo_name.split('-')[1] %} -{% set version = "5.6.0" %} +{% set version = "6.0.0" %} {% set major_version = version.split('.')[0] %} {% set name = repo_name + major_version %} {% set component_version = component_name + major_version %} @@ -12,7 +12,7 @@ package: source: - url: https://github.com/gazebosim/{{ repo_name }}/archive/{{ repo_name }}{{ major_version }}_{{ version }}.tar.gz - sha256: 39d02930638c5da35bbdd4925385bfe10180a8166c9c649b8ae67e083a47130e + sha256: 13eb0ea1cd756c17cf399afacaf4b704dcf9f4f20512e1a4f5504fe4a5bd1f61 patches: - librt_linkage.patch # [linux] - macro_path_binary_relocation.patch @@ -20,7 +20,7 @@ source: - 641.patch build: - number: 7 + number: 0 outputs: - name: {{ cxx_name }} @@ -113,7 +113,7 @@ about: * `{{ name }}`: Meta-package that depends on `{{ cxx_name }}`. If you need to depend at build time on the C++ package, please depend on `{{ cxx_name }}` in your recipe. - + extra: feedstock-name: {{ repo_name }} recipe-maintainers: From 04c34d15b224fe883b80c4eca1e347fac373abf1 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 26 Sep 2024 21:57:29 +0000 Subject: [PATCH 02/15] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.40.1, and conda-forge-pinning 2024.09.26.19.22.15 --- README.md | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 43132ab..48300e2 100644 --- a/README.md +++ b/README.md @@ -10,10 +10,10 @@ Package license: Apache-2.0 Summary: An audio-visual library supports processing audio and video files, a graphics library can load a variety 3D mesh file formats into a generic in-memory representation, and the core library of Gazebo Common contains functionality that spans Base64 encoding/decoding to thread pools. This feedstock builds several conda packages from the gz-common source code, these packages are: -* `libgz-common5`: Package that contains the gz-common C++ libraries. -* `gz-common5`: Meta-package that depends on `libgz-common5`. +* `libgz-common6`: Package that contains the gz-common C++ libraries. +* `gz-common6`: Meta-package that depends on `libgz-common6`. -If you need to depend at build time on the C++ package, please depend on `libgz-common5` in your recipe. +If you need to depend at build time on the C++ package, please depend on `libgz-common6` in your recipe. Current build status @@ -130,8 +130,8 @@ Current release info | Name | Downloads | Version | Platforms | | --- | --- | --- | --- | -| [![Conda Recipe](https://img.shields.io/badge/recipe-gz--common5-green.svg)](https://anaconda.org/conda-forge/gz-common5) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/gz-common5.svg)](https://anaconda.org/conda-forge/gz-common5) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/gz-common5.svg)](https://anaconda.org/conda-forge/gz-common5) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/gz-common5.svg)](https://anaconda.org/conda-forge/gz-common5) | -| [![Conda Recipe](https://img.shields.io/badge/recipe-libgz--common5-green.svg)](https://anaconda.org/conda-forge/libgz-common5) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libgz-common5.svg)](https://anaconda.org/conda-forge/libgz-common5) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libgz-common5.svg)](https://anaconda.org/conda-forge/libgz-common5) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libgz-common5.svg)](https://anaconda.org/conda-forge/libgz-common5) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-gz--common6-green.svg)](https://anaconda.org/conda-forge/gz-common6) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/gz-common6.svg)](https://anaconda.org/conda-forge/gz-common6) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/gz-common6.svg)](https://anaconda.org/conda-forge/gz-common6) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/gz-common6.svg)](https://anaconda.org/conda-forge/gz-common6) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-libgz--common6-green.svg)](https://anaconda.org/conda-forge/libgz-common6) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libgz-common6.svg)](https://anaconda.org/conda-forge/libgz-common6) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libgz-common6.svg)](https://anaconda.org/conda-forge/libgz-common6) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libgz-common6.svg)](https://anaconda.org/conda-forge/libgz-common6) | Installing gz-common ==================== @@ -143,41 +143,41 @@ conda config --add channels conda-forge conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `gz-common5, libgz-common5` can be installed with `conda`: +Once the `conda-forge` channel has been enabled, `gz-common6, libgz-common6` can be installed with `conda`: ``` -conda install gz-common5 libgz-common5 +conda install gz-common6 libgz-common6 ``` or with `mamba`: ``` -mamba install gz-common5 libgz-common5 +mamba install gz-common6 libgz-common6 ``` -It is possible to list all of the versions of `gz-common5` available on your platform with `conda`: +It is possible to list all of the versions of `gz-common6` available on your platform with `conda`: ``` -conda search gz-common5 --channel conda-forge +conda search gz-common6 --channel conda-forge ``` or with `mamba`: ``` -mamba search gz-common5 --channel conda-forge +mamba search gz-common6 --channel conda-forge ``` Alternatively, `mamba repoquery` may provide more information: ``` # Search all versions available on your platform: -mamba repoquery search gz-common5 --channel conda-forge +mamba repoquery search gz-common6 --channel conda-forge -# List packages depending on `gz-common5`: -mamba repoquery whoneeds gz-common5 --channel conda-forge +# List packages depending on `gz-common6`: +mamba repoquery whoneeds gz-common6 --channel conda-forge -# List dependencies of `gz-common5`: -mamba repoquery depends gz-common5 --channel conda-forge +# List dependencies of `gz-common6`: +mamba repoquery depends gz-common6 --channel conda-forge ``` From 223184280c67b6eac3276beb4bd9a0f9bbb2fa17 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 27 Sep 2024 14:45:52 +0200 Subject: [PATCH 03/15] Update meta.yaml --- recipe/meta.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a06a7c4..c775676 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -16,8 +16,6 @@ source: patches: - librt_linkage.patch # [linux] - macro_path_binary_relocation.patch - - apple_disable_profiler_error_test.patch - - 641.patch build: number: 0 From 9e0226596720eac7da185e1d0e737bff526d3dc6 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 27 Sep 2024 14:47:58 +0200 Subject: [PATCH 04/15] Update conda-forge.yml --- conda-forge.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conda-forge.yml b/conda-forge.yml index 2c603b9..edc79ac 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -12,3 +12,7 @@ provider: linux_aarch64: default linux_ppc64le: default test: native_and_emulated +bot: + abi_migration_branches: + - v5 + automerge: true From 278544bf2d4bf4ceeab8243bb56c20e053af96e4 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 27 Sep 2024 14:48:13 +0200 Subject: [PATCH 05/15] Delete recipe/641.patch --- recipe/641.patch | 66 ------------------------------------------------ 1 file changed, 66 deletions(-) delete mode 100644 recipe/641.patch diff --git a/recipe/641.patch b/recipe/641.patch deleted file mode 100644 index 416d90a..0000000 --- a/recipe/641.patch +++ /dev/null @@ -1,66 +0,0 @@ -From df5f9654d7c3420fd923fd0c2a88e4b72d10e261 Mon Sep 17 00:00:00 2001 -From: Ian Chen -Date: Thu, 5 Sep 2024 15:13:31 -0700 -Subject: [PATCH] Fix AssimpLoader collada texture coordinates (#634) - -Fixes UNIT_AssimpLoader_TEST with assimp 5.4.3. This should fix homebrew CI. - -This PR tweaks the way we checks for texture coordinates from assimp. Empty texture coordinate slots are now allowed as of assimp/assimp#5636. The new logic should be compatible with assimp 5.4.3 and prior versions - -Signed-off-by: Ian Chen ---- - graphics/src/AssimpLoader.cc | 20 +++++++++++++------- - 1 file changed, 13 insertions(+), 7 deletions(-) - -diff --git a/graphics/src/AssimpLoader.cc b/graphics/src/AssimpLoader.cc -index f0bcf194..52edddbd 100644 ---- a/graphics/src/AssimpLoader.cc -+++ b/graphics/src/AssimpLoader.cc -@@ -650,15 +650,14 @@ SubMesh AssimpLoader::Implementation::CreateSubMesh( - subMesh.AddVertex(vertex); - subMesh.AddNormal(normal); - // Iterate over sets of texture coordinates -- int uvIdx = 0; -- while(_assimpMesh->HasTextureCoords(uvIdx)) -+ for (unsigned int i = 0; i < AI_MAX_NUMBER_OF_TEXTURECOORDS; ++i) - { -+ if (!_assimpMesh->HasTextureCoords(i)) -+ continue; - math::Vector3d texcoords; -- texcoords.X(_assimpMesh->mTextureCoords[uvIdx][vertexIdx].x); -- texcoords.Y(_assimpMesh->mTextureCoords[uvIdx][vertexIdx].y); -- // TODO(luca) why do we need 1.0 - Y? -- subMesh.AddTexCoordBySet(texcoords.X(), 1.0 - texcoords.Y(), uvIdx); -- ++uvIdx; -+ texcoords.X(_assimpMesh->mTextureCoords[i][vertexIdx].x); -+ texcoords.Y(_assimpMesh->mTextureCoords[i][vertexIdx].y); -+ subMesh.AddTexCoordBySet(texcoords.X(), texcoords.Y(), i); - } - } - for (unsigned faceIdx = 0; faceIdx < _assimpMesh->mNumFaces; ++faceIdx) -@@ -695,6 +694,7 @@ Mesh *AssimpLoader::Load(const std::string &_filename) - aiProcess_JoinIdenticalVertices | - aiProcess_RemoveRedundantMaterials | - aiProcess_SortByPType | -+ aiProcess_FlipUVs | - #ifndef GZ_ASSIMP_PRE_5_2_0 - aiProcess_PopulateArmatureData | - #endif -@@ -756,11 +756,17 @@ Mesh *AssimpLoader::Load(const std::string &_filename) - // Recursive call to keep track of transforms, - // mesh is passed by reference and edited throughout - this->dataPtr->RecursiveCreate(scene, rootNode, rootTransform, mesh); -+ auto rootSkeleton = mesh->MeshSkeleton(); - // Add the animations - for (unsigned animIdx = 0; animIdx < scene->mNumAnimations; ++animIdx) - { - auto& anim = scene->mAnimations[animIdx]; - auto animName = ToString(anim->mName); -+ if (animName.empty()) -+ { -+ animName = "animation" + -+ std::to_string(rootSkeleton->AnimationCount() + 1); -+ } - SkeletonAnimation* skelAnim = new SkeletonAnimation(animName); - for (unsigned chanIdx = 0; chanIdx < anim->mNumChannels; ++chanIdx) - { From 5fcaff84f01fa5ae98759e43c4307c81a81a4ebf Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 27 Sep 2024 14:48:24 +0200 Subject: [PATCH 06/15] Delete recipe/apple_disable_profiler_error_test.patch --- recipe/apple_disable_profiler_error_test.patch | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 recipe/apple_disable_profiler_error_test.patch diff --git a/recipe/apple_disable_profiler_error_test.patch b/recipe/apple_disable_profiler_error_test.patch deleted file mode 100644 index b9ebbf7..0000000 --- a/recipe/apple_disable_profiler_error_test.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/profiler/src/CMakeLists.txt b/profiler/src/CMakeLists.txt -index 7ef9088f..42c38736 100644 ---- a/profiler/src/CMakeLists.txt -+++ b/profiler/src/CMakeLists.txt -@@ -20,7 +20,7 @@ set( - Profiler_Disabled_TEST.cc - ) - --if(NOT WIN32) -+if(NOT WIN32 AND NOT APPLE) - list(APPEND PROFILER_TESTS Profiler_Error_TEST.cc) - endif() - From 5fb35ac36ba413acb519b92f764e3b91d0b0d145 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 27 Sep 2024 14:51:50 +0200 Subject: [PATCH 07/15] Update for gz-common6 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c775676..8715bb6 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -36,8 +36,8 @@ outputs: - cmake - pkg-config host: - - libgz-math7 - - libgz-cmake3 + - libgz-math8 + - libgz-cmake4 - libgz-utils2 - dlfcn-win32 # [win] - libuuid # [linux] From 680e7334c12dadb279f07b5fde7b478bfe85b486 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Sun, 29 Sep 2024 14:43:46 +0200 Subject: [PATCH 08/15] Update meta.yaml --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8715bb6..79dd0c2 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -38,7 +38,7 @@ outputs: host: - libgz-math8 - libgz-cmake4 - - libgz-utils2 + - libgz-utils3 - dlfcn-win32 # [win] - libuuid # [linux] - freeimage From 14f89e76e765f9d325aa6f378728cfe8268a94dc Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Sun, 29 Sep 2024 15:15:40 +0200 Subject: [PATCH 09/15] Update meta.yaml --- recipe/meta.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 79dd0c2..505a078 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -42,9 +42,7 @@ outputs: - dlfcn-win32 # [win] - libuuid # [linux] - freeimage - - gts - tinyxml2 - - glib - ffmpeg - libgdal - assimp From 87872580e3d55c8f4d916a3000e61352ccbdd3ce Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Sun, 29 Sep 2024 15:30:33 +0200 Subject: [PATCH 10/15] Update build_cxx.sh --- recipe/build_cxx.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipe/build_cxx.sh b/recipe/build_cxx.sh index 7723fbc..33c96c3 100644 --- a/recipe/build_cxx.sh +++ b/recipe/build_cxx.sh @@ -33,5 +33,6 @@ cmake --build . --config Release --target install ${NUM_PARALLEL} if [[ "${CONDA_BUILD_CROSS_COMPILATION:-}" != "1" || "${CROSSCOMPILING_EMULATOR}" != "" ]]; then # PERFORMANCE_plugin_specialization is a performance test, let's disable it as we can't do # any expectation of the speed of the CI machines - ctest --output-on-failure -C Release -E PERFORMANCE_plugin_specialization + # SignalHandler disabled due to https://github.com/gazebosim/gz-common/issues/644#issuecomment-2381358169 + ctest --output-on-failure -C Release -E PERFORMANCE_plugin_specialization|SignalHandler fi From 924549bd443f96e021bd83579043035ae5e0b9a8 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Sun, 29 Sep 2024 15:31:50 +0200 Subject: [PATCH 11/15] Update meta.yaml --- recipe/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 505a078..7e30634 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -39,6 +39,8 @@ outputs: - libgz-math8 - libgz-cmake4 - libgz-utils3 + # Transitive dependency of libgz-utils3 + - spdlog - dlfcn-win32 # [win] - libuuid # [linux] - freeimage From d3aa764174e9100721924d1666de055a2b7bdc89 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Sun, 29 Sep 2024 15:41:20 +0200 Subject: [PATCH 12/15] Update build_cxx.sh --- recipe/build_cxx.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build_cxx.sh b/recipe/build_cxx.sh index 33c96c3..dab4a0a 100644 --- a/recipe/build_cxx.sh +++ b/recipe/build_cxx.sh @@ -34,5 +34,5 @@ if [[ "${CONDA_BUILD_CROSS_COMPILATION:-}" != "1" || "${CROSSCOMPILING_EMULATOR} # PERFORMANCE_plugin_specialization is a performance test, let's disable it as we can't do # any expectation of the speed of the CI machines # SignalHandler disabled due to https://github.com/gazebosim/gz-common/issues/644#issuecomment-2381358169 - ctest --output-on-failure -C Release -E PERFORMANCE_plugin_specialization|SignalHandler + ctest --output-on-failure -C Release -E "PERFORMANCE_plugin_specialization|SignalHandler" fi From 9a973687fabafd95ba1e9141e280d51f66e644db Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Sun, 29 Sep 2024 15:42:20 +0200 Subject: [PATCH 13/15] Update bld_cxx.bat --- recipe/bld_cxx.bat | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipe/bld_cxx.bat b/recipe/bld_cxx.bat index 7ab8342..cae1623 100644 --- a/recipe/bld_cxx.bat +++ b/recipe/bld_cxx.bat @@ -3,6 +3,7 @@ cd build cmake ^ -G "Ninja" ^ + -DBUILD_TESTING:BOOL=ON ^ -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^ -DCMAKE_BUILD_TYPE=Release ^ -DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=True ^ @@ -20,5 +21,5 @@ cmake --build . --config Release --target install if errorlevel 1 exit 1 :: Test. -ctest --output-on-failure -C Release +ctest --output-on-failure -C Release -E "PERFORMANCE_plugin_specialization|SignalHandler" if errorlevel 1 exit 1 From 65f50f355755b03e43d431f9344a4c6bd20bb0c7 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Sun, 29 Sep 2024 16:16:18 +0200 Subject: [PATCH 14/15] Update build_cxx.sh --- recipe/build_cxx.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/build_cxx.sh b/recipe/build_cxx.sh index dab4a0a..746a0ee 100644 --- a/recipe/build_cxx.sh +++ b/recipe/build_cxx.sh @@ -31,8 +31,8 @@ cmake --build . --config Release ${NUM_PARALLEL} cmake --build . --config Release --target install ${NUM_PARALLEL} if [[ "${CONDA_BUILD_CROSS_COMPILATION:-}" != "1" || "${CROSSCOMPILING_EMULATOR}" != "" ]]; then - # PERFORMANCE_plugin_specialization is a performance test, let's disable it as we can't do - # any expectation of the speed of the CI machines + # PERFORMANCE_* are performance tests, let's disable them as we can't assume + # anything related to the speed of the CI machines # SignalHandler disabled due to https://github.com/gazebosim/gz-common/issues/644#issuecomment-2381358169 - ctest --output-on-failure -C Release -E "PERFORMANCE_plugin_specialization|SignalHandler" + ctest --output-on-failure -C Release -E "PERFORMANCE_|SignalHandler" fi From d3d74e9bcb2428fc1e23003df865e5e64e09dc8c Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Sun, 29 Sep 2024 16:16:31 +0200 Subject: [PATCH 15/15] Update bld_cxx.bat --- recipe/bld_cxx.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/bld_cxx.bat b/recipe/bld_cxx.bat index cae1623..7e40d49 100644 --- a/recipe/bld_cxx.bat +++ b/recipe/bld_cxx.bat @@ -21,5 +21,5 @@ cmake --build . --config Release --target install if errorlevel 1 exit 1 :: Test. -ctest --output-on-failure -C Release -E "PERFORMANCE_plugin_specialization|SignalHandler" +ctest --output-on-failure -C Release -E "PERFORMANCE_|SignalHandler" if errorlevel 1 exit 1