From 5039aec6ed5c70e78f8b15c905c5a6572df6fd10 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 27 Sep 2024 01:35:43 +0000 Subject: [PATCH 1/6] updated v9.0.0 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8c5bc1d..b5ed757 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 = "8.2.0" %} +{% set version = "9.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: d7782709d393841e5263a085ef3d0727bd249d5d430dc1f149d15acaa1c03efd + sha256: 3eb56a495c61e9274e24421f54ee074b01745c8d02f8f0e877aa346d562a3d32 build: number: 0 From ffbf1741289889cdc23c74cbc74fc45d69222892 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 27 Sep 2024 01:36:40 +0000 Subject: [PATCH 2/6] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.40.1, and conda-forge-pinning 2024.09.27.00.47.16 --- .scripts/build_steps.sh | 2 ++ .scripts/run_win_build.bat | 4 ++-- README.md | 26 +++++++++++++------------- build-locally.py | 5 ++++- 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index ba4b251..856f469 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -43,6 +43,8 @@ setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" source run_conda_forge_build_setup + + # make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 65650bf..a45c34f 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -24,7 +24,7 @@ set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" :: Provision the necessary dependencies to build the recipe later echo Installing dependencies -mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes +mamba.exe install pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes if !errorlevel! neq 0 exit /b !errorlevel! :: Set basic configuration @@ -48,7 +48,7 @@ if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( ) if NOT [%flow_run_id%] == [] ( - set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" ) call :end_group diff --git a/README.md b/README.md index 4134284..4ab87d7 100644 --- a/README.md +++ b/README.md @@ -81,8 +81,8 @@ Current release info | Name | Downloads | Version | Platforms | | --- | --- | --- | --- | -| [![Conda Recipe](https://img.shields.io/badge/recipe-gz--rendering8-green.svg)](https://anaconda.org/conda-forge/gz-rendering8) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/gz-rendering8.svg)](https://anaconda.org/conda-forge/gz-rendering8) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/gz-rendering8.svg)](https://anaconda.org/conda-forge/gz-rendering8) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/gz-rendering8.svg)](https://anaconda.org/conda-forge/gz-rendering8) | -| [![Conda Recipe](https://img.shields.io/badge/recipe-libgz--rendering8-green.svg)](https://anaconda.org/conda-forge/libgz-rendering8) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libgz-rendering8.svg)](https://anaconda.org/conda-forge/libgz-rendering8) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libgz-rendering8.svg)](https://anaconda.org/conda-forge/libgz-rendering8) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libgz-rendering8.svg)](https://anaconda.org/conda-forge/libgz-rendering8) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-gz--rendering9-green.svg)](https://anaconda.org/conda-forge/gz-rendering9) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/gz-rendering9.svg)](https://anaconda.org/conda-forge/gz-rendering9) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/gz-rendering9.svg)](https://anaconda.org/conda-forge/gz-rendering9) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/gz-rendering9.svg)](https://anaconda.org/conda-forge/gz-rendering9) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-libgz--rendering9-green.svg)](https://anaconda.org/conda-forge/libgz-rendering9) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libgz-rendering9.svg)](https://anaconda.org/conda-forge/libgz-rendering9) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libgz-rendering9.svg)](https://anaconda.org/conda-forge/libgz-rendering9) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libgz-rendering9.svg)](https://anaconda.org/conda-forge/libgz-rendering9) | Installing gz-rendering ======================= @@ -94,41 +94,41 @@ conda config --add channels conda-forge conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `gz-rendering8, libgz-rendering8` can be installed with `conda`: +Once the `conda-forge` channel has been enabled, `gz-rendering9, libgz-rendering9` can be installed with `conda`: ``` -conda install gz-rendering8 libgz-rendering8 +conda install gz-rendering9 libgz-rendering9 ``` or with `mamba`: ``` -mamba install gz-rendering8 libgz-rendering8 +mamba install gz-rendering9 libgz-rendering9 ``` -It is possible to list all of the versions of `gz-rendering8` available on your platform with `conda`: +It is possible to list all of the versions of `gz-rendering9` available on your platform with `conda`: ``` -conda search gz-rendering8 --channel conda-forge +conda search gz-rendering9 --channel conda-forge ``` or with `mamba`: ``` -mamba search gz-rendering8 --channel conda-forge +mamba search gz-rendering9 --channel conda-forge ``` Alternatively, `mamba repoquery` may provide more information: ``` # Search all versions available on your platform: -mamba repoquery search gz-rendering8 --channel conda-forge +mamba repoquery search gz-rendering9 --channel conda-forge -# List packages depending on `gz-rendering8`: -mamba repoquery whoneeds gz-rendering8 --channel conda-forge +# List packages depending on `gz-rendering9`: +mamba repoquery whoneeds gz-rendering9 --channel conda-forge -# List dependencies of `gz-rendering8`: -mamba repoquery depends gz-rendering8 --channel conda-forge +# List dependencies of `gz-rendering9`: +mamba repoquery depends gz-rendering9 --channel conda-forge ``` diff --git a/build-locally.py b/build-locally.py index d78427b..6788aea 100755 --- a/build-locally.py +++ b/build-locally.py @@ -1,8 +1,11 @@ -#!/usr/bin/env python3 +#!/bin/sh +"""exec" "python3" "$0" "$@" #""" # fmt: off # fmt: on # # This file has been generated by conda-smithy in order to build the recipe # locally. # +# The line above this comment is a bash / sh / zsh guard +# to stop people from running it with the wrong interpreter import glob import os import platform From 7c4814ec25d0bdb2233d09f5d797a7d18cc8da86 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 27 Sep 2024 13:35:08 +0200 Subject: [PATCH 3/6] Add v8 to abi_migration_branches --- conda-forge.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda-forge.yml b/conda-forge.yml index 61d38b6..4cafaa6 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,6 +1,7 @@ bot: abi_migration_branches: - 'v7' + - 'v8' automerge: true build_platform: osx_arm64: osx_64 From 3f7d592af211641bc24d8da601f9b1bc0d63bd43 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 27 Sep 2024 13:36:11 +0200 Subject: [PATCH 4/6] Update for gz-rendering9 --- recipe/meta.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b5ed757..fbcbb26 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -47,10 +47,10 @@ outputs: - xorg-libx11 # [unix] - xorg-libxext # [unix] - libglu # [linux] - - libgz-math7 - - libgz-common5 - - libgz-plugin2 - - libgz-utils2 + - libgz-math8 + - libgz-common6 + - libgz-plugin3 + - libgz-utils3 - ogre-next - ogre 1.10.* run: From 64a34a223a241e416532c317cea59348af1fa1d1 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Sun, 29 Sep 2024 21:03:26 +0200 Subject: [PATCH 5/6] Create 1071.patch --- recipe/1071.patch | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 recipe/1071.patch diff --git a/recipe/1071.patch b/recipe/1071.patch new file mode 100644 index 0000000..1e0e54b --- /dev/null +++ b/recipe/1071.patch @@ -0,0 +1,28 @@ +From a3074544bd88627ac0060ce8d895eabc89bbe197 Mon Sep 17 00:00:00 2001 +From: Silvio Traversaro +Date: Sun, 29 Sep 2024 20:58:27 +0200 +Subject: [PATCH] Fix installation with GZ_ENABLE_RELOCATABLE_INSTALL=ON + +By adding the missing DL dependency + +Signed-off-by: Silvio Traversaro +--- + CMakeLists.txt | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 96ce89131..bf7aa7098 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -154,6 +154,11 @@ set(GZ_RENDERING_ENGINE_RELATIVE_INSTALL_DIR + set(GZ_RENDERING_ENGINE_INSTALL_DIR + ${CMAKE_INSTALL_PREFIX}/${GZ_RENDERING_ENGINE_RELATIVE_INSTALL_DIR}) + ++#-------------------------------------- ++# Find DL if doing relocatable installation ++if (GZ_ENABLE_RELOCATABLE_INSTALL) ++ gz_find_package(DL REQUIRED) ++endif() + + #-------------------------------------- + # Find dependencies that we ignore for Visual Studio From 2ac5b15d60fe16d0cb0a728e894189ba25f9f199 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Sun, 29 Sep 2024 21:04:20 +0200 Subject: [PATCH 6/6] Add missing dlfcn-win32 dependency on Windows --- recipe/meta.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index fbcbb26..b8e9216 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -13,6 +13,8 @@ package: source: - url: https://github.com/gazebosim/{{ repo_name }}/archive/{{ repo_name }}{{ major_version }}_{{ version }}.tar.gz sha256: 3eb56a495c61e9274e24421f54ee074b01745c8d02f8f0e877aa346d562a3d32 + patches: + - 1071.patch build: number: 0 @@ -44,6 +46,7 @@ outputs: - {{ cdt('libxext') }} # [linux] - {{ cdt('libxau') }} # [linux] host: + - dlfcn-win32 # [win] - xorg-libx11 # [unix] - xorg-libxext # [unix] - libglu # [linux]