From 3347b5ac8c0d61ef75a56ad58ce9fd85569c82bb Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 14 Apr 2023 10:26:58 +0000 Subject: [PATCH 1/7] updated v7_7.3.1 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 889c9fc..307baaa 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.0" %} +{% set version = "7_7.3.1" %} {% 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: ef654d3c25c4dcf8f0111f864339884c1aa5a71f7424fc1980285f640277f44a + sha256: 9a9da62f77c21f7a0b695e929bf9108ac3d88e1747b474eba26c9c5121ae5a99 build: number: 0 From 8adf954b48cb6210ab3d5d37dec4578d6e1a44c3 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Sat, 15 Apr 2023 12:45:09 +0200 Subject: [PATCH 2/7] Try to pin cmake to 3.25 --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 307baaa..e78aa71 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -30,7 +30,7 @@ outputs: - {{ compiler('cxx') }} - {{ compiler('c') }} - ninja - - cmake + - cmake 3.25.* - pkg-config # x11 - {{ cdt('mesa-libgl-devel') }} # [unix and not (osx and arm64)] From 9c5180013595dd1a9c17a985fef016c215c7f2d9 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Sun, 16 Apr 2023 13:01:20 +0200 Subject: [PATCH 3/7] Update meta.yaml --- recipe/meta.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e78aa71..c14d56c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -30,11 +30,12 @@ outputs: - {{ compiler('cxx') }} - {{ compiler('c') }} - ninja - - cmake 3.25.* + - cmake - pkg-config # x11 - {{ cdt('mesa-libgl-devel') }} # [unix and not (osx and arm64)] - {{ cdt('mesa-dri-drivers') }} # [unix and not (osx and arm64)] + - {{ cdt('libglvnd-devel') }} # [linux] - {{ cdt('libselinux') }} # [linux] - {{ cdt('libxdamage') }} # [linux] - {{ cdt('libxxf86vm') }} # [linux] From 126ad4e760e944adfad2bf39289e009a0774335e Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Sun, 16 Apr 2023 13:18:43 +0200 Subject: [PATCH 4/7] Update meta.yaml --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c14d56c..662c5d9 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -33,6 +33,7 @@ outputs: - cmake - pkg-config # x11 + - sysroot_linux-64 2.17 # [linux64] - {{ cdt('mesa-libgl-devel') }} # [unix and not (osx and arm64)] - {{ cdt('mesa-dri-drivers') }} # [unix and not (osx and arm64)] - {{ cdt('libglvnd-devel') }} # [linux] From a11dd39a1db31d75c6ce6a0b5d9085c9ac71cd6a Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Sun, 16 Apr 2023 13:19:13 +0200 Subject: [PATCH 5/7] Update conda-forge.yml --- conda-forge.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conda-forge.yml b/conda-forge.yml index 8491c9d..7eb6fe4 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -12,3 +12,5 @@ provider: linux_aarch64: default linux_ppc64le: default test: native_and_emulated +os_version: + linux_64: cos7 From 3afec2b734cc29a1f32f2fc8224b12a2060833ad Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Sun, 16 Apr 2023 11:21:45 +0000 Subject: [PATCH 6/7] MNT: Re-rendered with conda-build 3.24.0, conda-smithy 3.23.1, and conda-forge-pinning 2023.04.15.08.59.11 --- .ci_support/linux_64_OGRE_VERSION1.10.yaml | 2 +- .ci_support/linux_64_OGRE_VERSION1.12.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci_support/linux_64_OGRE_VERSION1.10.yaml b/.ci_support/linux_64_OGRE_VERSION1.10.yaml index b7d70ef..3ab4e21 100644 --- a/.ci_support/linux_64_OGRE_VERSION1.10.yaml +++ b/.ci_support/linux_64_OGRE_VERSION1.10.yaml @@ -5,7 +5,7 @@ c_compiler: c_compiler_version: - '11' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/linux_64_OGRE_VERSION1.12.yaml b/.ci_support/linux_64_OGRE_VERSION1.12.yaml index 338138a..fa6779f 100644 --- a/.ci_support/linux_64_OGRE_VERSION1.12.yaml +++ b/.ci_support/linux_64_OGRE_VERSION1.12.yaml @@ -5,7 +5,7 @@ c_compiler: c_compiler_version: - '11' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: From bbd8da4c5507bcd1fe772f4b67fdc1f3107d21c9 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Sun, 16 Apr 2023 14:23:25 +0200 Subject: [PATCH 7/7] Update meta.yaml --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 662c5d9..6dd0bf5 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -36,6 +36,7 @@ outputs: - sysroot_linux-64 2.17 # [linux64] - {{ cdt('mesa-libgl-devel') }} # [unix and not (osx and arm64)] - {{ cdt('mesa-dri-drivers') }} # [unix and not (osx and arm64)] + - {{ cdt('mesa-libegl-devel') }} # [linux] - {{ cdt('libglvnd-devel') }} # [linux] - {{ cdt('libselinux') }} # [linux] - {{ cdt('libxdamage') }} # [linux]