Merge pull request #7 from regro-cf-autotick-bot/7_7.4.0_hca16a0

gz-rendering v7_7.4.0
conda-forge · May 19, 2023 · 98b04d6 · 98b04d6
2 parents fdea150 + e3fdb69
commit 98b04d6
Show file tree

Hide file tree

Showing 17 changed files with 24 additions and 28 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -5,15 +5,15 @@ OGRE_VERSION:
 c_compiler:
 - clang
 c_compiler_version:
-- '14'
+- '15'
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 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
@@ -5,15 +5,15 @@ OGRE_VERSION:
 c_compiler:
 - clang
 c_compiler_version:
-- '14'
+- '15'
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 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
@@ -5,15 +5,15 @@ OGRE_VERSION:
 c_compiler:
 - clang
 c_compiler_version:
-- '14'
+- '15'
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 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
@@ -5,15 +5,15 @@ OGRE_VERSION:
 c_compiler:
 - clang
 c_compiler_version:
-- '14'
+- '15'
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '14'
+- '15'
 macos_machine:
 - arm64-apple-darwin20.0.0
 target_platform:

diff --git 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
diff --git 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
diff --git 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

diff --git 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

diff --git 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=
diff --git 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
diff --git 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