From 0624cc74d2d482d40b972f3077d0e9558b9143ae Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 18 May 2023 18:55:23 +0000 Subject: [PATCH 1/8] updated v7_7.4.0 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6dd0bf5..cbd5c8e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ {% set component_name = "rendering" %} {% set repo_name = "gz-" + component_name %} -{% set version = "7_7.3.1" %} +{% set version = "7_7.4.0" %} {% set major_version = version.split('_')[0] %} {% set version_package = version.split('_')[1] %} {% set name = repo_name + major_version %} @@ -13,7 +13,7 @@ package: source: - url: https://github.com/gazebosim/{{ repo_name }}/archive/{{ repo_name }}{{ version }}.tar.gz - sha256: 9a9da62f77c21f7a0b695e929bf9108ac3d88e1747b474eba26c9c5121ae5a99 + sha256: 93c6ee6fcf31ab344a6d9c93d0a7147a4dedb4ff77c92d0e053bc1d762085581 build: number: 0 From c0232bc92e6994c4fd03d7b3591743b9e0f08795 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 18 May 2023 18:55:53 +0000 Subject: [PATCH 2/8] MNT: Re-rendered with conda-build 3.24.0, conda-smithy 3.23.1, and conda-forge-pinning 2023.05.17.15.05.36 --- .ci_support/linux_64_OGRE_VERSION1.10.yaml | 4 ++-- .ci_support/linux_64_OGRE_VERSION1.12.yaml | 4 ++-- .ci_support/linux_aarch64_OGRE_VERSION1.10.yaml | 4 ++-- .ci_support/linux_aarch64_OGRE_VERSION1.12.yaml | 4 ++-- .ci_support/linux_ppc64le_OGRE_VERSION1.10.yaml | 4 ++-- .ci_support/linux_ppc64le_OGRE_VERSION1.12.yaml | 4 ++-- .ci_support/osx_64_OGRE_VERSION1.10.yaml | 4 ++-- .ci_support/osx_64_OGRE_VERSION1.12.yaml | 4 ++-- .ci_support/osx_arm64_OGRE_VERSION1.10.yaml | 4 ++-- .ci_support/osx_arm64_OGRE_VERSION1.12.yaml | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.ci_support/linux_64_OGRE_VERSION1.10.yaml b/.ci_support/linux_64_OGRE_VERSION1.10.yaml index 3ab4e21..f8db353 100644 --- a/.ci_support/linux_64_OGRE_VERSION1.10.yaml +++ b/.ci_support/linux_64_OGRE_VERSION1.10.yaml @@ -3,7 +3,7 @@ OGRE_VERSION: c_compiler: - gcc c_compiler_version: -- '11' +- '12' cdt_name: - cos7 channel_sources: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 target_platform: diff --git a/.ci_support/linux_64_OGRE_VERSION1.12.yaml b/.ci_support/linux_64_OGRE_VERSION1.12.yaml index fa6779f..fe8fdd2 100644 --- a/.ci_support/linux_64_OGRE_VERSION1.12.yaml +++ b/.ci_support/linux_64_OGRE_VERSION1.12.yaml @@ -3,7 +3,7 @@ OGRE_VERSION: c_compiler: - gcc c_compiler_version: -- '11' +- '12' cdt_name: - cos7 channel_sources: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 target_platform: diff --git a/.ci_support/linux_aarch64_OGRE_VERSION1.10.yaml b/.ci_support/linux_aarch64_OGRE_VERSION1.10.yaml index 39d82ad..1f89ed3 100644 --- a/.ci_support/linux_aarch64_OGRE_VERSION1.10.yaml +++ b/.ci_support/linux_aarch64_OGRE_VERSION1.10.yaml @@ -5,7 +5,7 @@ OGRE_VERSION: c_compiler: - gcc c_compiler_version: -- '11' +- '12' cdt_arch: - aarch64 cdt_name: @@ -17,7 +17,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 target_platform: diff --git a/.ci_support/linux_aarch64_OGRE_VERSION1.12.yaml b/.ci_support/linux_aarch64_OGRE_VERSION1.12.yaml index 3476de2..6b17b77 100644 --- a/.ci_support/linux_aarch64_OGRE_VERSION1.12.yaml +++ b/.ci_support/linux_aarch64_OGRE_VERSION1.12.yaml @@ -5,7 +5,7 @@ OGRE_VERSION: c_compiler: - gcc c_compiler_version: -- '11' +- '12' cdt_arch: - aarch64 cdt_name: @@ -17,7 +17,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 target_platform: diff --git a/.ci_support/linux_ppc64le_OGRE_VERSION1.10.yaml b/.ci_support/linux_ppc64le_OGRE_VERSION1.10.yaml index abe0cff..848f358 100644 --- a/.ci_support/linux_ppc64le_OGRE_VERSION1.10.yaml +++ b/.ci_support/linux_ppc64le_OGRE_VERSION1.10.yaml @@ -3,7 +3,7 @@ OGRE_VERSION: c_compiler: - gcc c_compiler_version: -- '11' +- '12' cdt_name: - cos7 channel_sources: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 target_platform: diff --git a/.ci_support/linux_ppc64le_OGRE_VERSION1.12.yaml b/.ci_support/linux_ppc64le_OGRE_VERSION1.12.yaml index 548d950..dcfd99e 100644 --- a/.ci_support/linux_ppc64le_OGRE_VERSION1.12.yaml +++ b/.ci_support/linux_ppc64le_OGRE_VERSION1.12.yaml @@ -3,7 +3,7 @@ OGRE_VERSION: c_compiler: - gcc c_compiler_version: -- '11' +- '12' cdt_name: - cos7 channel_sources: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 target_platform: diff --git a/.ci_support/osx_64_OGRE_VERSION1.10.yaml b/.ci_support/osx_64_OGRE_VERSION1.10.yaml index 01f80ed..9eeb47c 100644 --- a/.ci_support/osx_64_OGRE_VERSION1.10.yaml +++ b/.ci_support/osx_64_OGRE_VERSION1.10.yaml @@ -5,7 +5,7 @@ OGRE_VERSION: c_compiler: - clang c_compiler_version: -- '14' +- '15' channel_sources: - conda-forge channel_targets: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' macos_machine: - x86_64-apple-darwin13.4.0 target_platform: diff --git a/.ci_support/osx_64_OGRE_VERSION1.12.yaml b/.ci_support/osx_64_OGRE_VERSION1.12.yaml index e668b59..43d7e21 100644 --- a/.ci_support/osx_64_OGRE_VERSION1.12.yaml +++ b/.ci_support/osx_64_OGRE_VERSION1.12.yaml @@ -5,7 +5,7 @@ OGRE_VERSION: c_compiler: - clang c_compiler_version: -- '14' +- '15' channel_sources: - conda-forge channel_targets: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' macos_machine: - x86_64-apple-darwin13.4.0 target_platform: diff --git a/.ci_support/osx_arm64_OGRE_VERSION1.10.yaml b/.ci_support/osx_arm64_OGRE_VERSION1.10.yaml index 2e15c14..e458e72 100644 --- a/.ci_support/osx_arm64_OGRE_VERSION1.10.yaml +++ b/.ci_support/osx_arm64_OGRE_VERSION1.10.yaml @@ -5,7 +5,7 @@ OGRE_VERSION: c_compiler: - clang c_compiler_version: -- '14' +- '15' channel_sources: - conda-forge channel_targets: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' macos_machine: - arm64-apple-darwin20.0.0 target_platform: diff --git a/.ci_support/osx_arm64_OGRE_VERSION1.12.yaml b/.ci_support/osx_arm64_OGRE_VERSION1.12.yaml index 2924c2a..4ef81f1 100644 --- a/.ci_support/osx_arm64_OGRE_VERSION1.12.yaml +++ b/.ci_support/osx_arm64_OGRE_VERSION1.12.yaml @@ -5,7 +5,7 @@ OGRE_VERSION: c_compiler: - clang c_compiler_version: -- '14' +- '15' channel_sources: - conda-forge channel_targets: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' macos_machine: - arm64-apple-darwin20.0.0 target_platform: From 7ddf9273fe076f3ac6c14b0465e2da40ec33559e Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 19 May 2023 09:28:26 +0200 Subject: [PATCH 3/8] Update build_cxx.sh --- recipe/build_cxx.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/build_cxx.sh b/recipe/build_cxx.sh index dfb30dd..de3f624 100644 --- a/recipe/build_cxx.sh +++ b/recipe/build_cxx.sh @@ -22,6 +22,7 @@ cmake ${CMAKE_ARGS} -GNinja .. \ -DFREEIMAGE_RUNS:BOOL=ON \ -DFREEIMAGE_RUNS__TRYRUN_OUTPUT:STRING="" \ -DFREEIMAGE_COMPILES:BOOL=ON \ + -DGZ_ENABLE_RELOCATABLE_INSTALL:BOOL=ON \ -DSKIP_optix:BOOL=ON cmake --build . --config Release From 97b85b92f62bc823afedc67c4b51e6511535ef25 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 19 May 2023 09:37:15 +0200 Subject: [PATCH 4/8] Update bld_cxx.bat --- recipe/bld_cxx.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/bld_cxx.bat b/recipe/bld_cxx.bat index 9b77d24..3aa6a3c 100644 --- a/recipe/bld_cxx.bat +++ b/recipe/bld_cxx.bat @@ -7,6 +7,7 @@ cmake ^ -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^ -DCMAKE_BUILD_TYPE=Release ^ -DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=True ^ + -DGZ_ENABLE_RELOCATABLE_INSTALL:BOOL=ON ^ -DSKIP_optix:BOOL=ON ^ %SRC_DIR% if errorlevel 1 exit 1 From 4dc02b17a733c5ed0b229e867ff7f9d96063d340 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 19 May 2023 09:41:53 +0200 Subject: [PATCH 5/8] Update activate.bat --- recipe/activate.bat | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipe/activate.bat b/recipe/activate.bat index 457bd4b..db41108 100644 --- a/recipe/activate.bat +++ b/recipe/activate.bat @@ -1,5 +1,3 @@ @echo off -set GZ_RENDERING_PLUGIN_PATH=%CONDA_PREFIX%\Library\lib\gz-rendering-6\engine-plugins set OGRE_RESOURCE_PATH=%CONDA_PREFIX%\Library\bin set OGRE2_RESOURCE_PATH=%CONDA_PREFIX%\Library\bin\OGRE-Next -set GZ_RENDERING_RESOURCE_PATH=%CONDA_PREFIX%\Library\share\gz\gz-rendering6 From 42b08bf956b01c397d43542e46253b697f687be3 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 19 May 2023 09:42:03 +0200 Subject: [PATCH 6/8] Update activate.sh --- recipe/activate.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/activate.sh b/recipe/activate.sh index 6f83480..78425b4 100644 --- a/recipe/activate.sh +++ b/recipe/activate.sh @@ -1,3 +1,2 @@ export OGRE_RESOURCE_PATH=$CONDA_PREFIX/lib/OGRE export OGRE2_RESOURCE_PATH=$CONDA_PREFIX/lib/OGRE-Next -export GZ_RENDERING_RESOURCE_PATH=$CONDA_PREFIX/share/gz/gz-rendering6 From 91046bc59b7f922d7bf928c68ad582a6091895cf Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 19 May 2023 09:42:16 +0200 Subject: [PATCH 7/8] Update deactivate.bat --- recipe/deactivate.bat | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipe/deactivate.bat b/recipe/deactivate.bat index d67af97..15f4014 100644 --- a/recipe/deactivate.bat +++ b/recipe/deactivate.bat @@ -1,4 +1,2 @@ -@set GZ_RENDERING_PLUGIN_PATH= @set OGRE_RESOURCE_PATH= @set OGRE2_RESOURCE_PATH= -@set GZ_RENDERING_RESOURCE_PATH= From e3fdb69d99ec3ae9fad8ff9576a2f02250452f10 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 19 May 2023 09:42:24 +0200 Subject: [PATCH 8/8] Update deactivate.sh --- recipe/deactivate.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/deactivate.sh b/recipe/deactivate.sh index bd44510..b51b49f 100644 --- a/recipe/deactivate.sh +++ b/recipe/deactivate.sh @@ -1,3 +1,2 @@ unset OGRE_RESOURCE_PATH unset OGRE2_RESOURCE_PATH -unset GZ_RENDERING_RESOURCE_PATH