From ea7ea91943d1735df0ea0b4ad8315cb9d790f78b Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 2 Apr 2021 03:39:06 +0000 Subject: [PATCH 01/15] updated v11.4.0 --- recipe/meta.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5fac6027..20080bee 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "gazebo" %} -{% set version = "11.3.0" %} +{% set version = "11.4.0" %} package: name: {{ name }} @@ -7,7 +7,7 @@ package: source: - url: https://github.com/osrf/{{ name }}/archive/{{ name }}{{ version.split('.')[0] }}_{{ version }}.tar.gz - sha256: b3c14fc1a123be2992b880efa11d362d3d06c77d8c9624a14c487357ec7623f1 + sha256: 7ea73e73115a27092ed502351c00ef43413ffc0cf53970a49605dabf5b3c0c62 patches: - fix_build.patch # [unix] - use-external-libs-config.patch @@ -17,7 +17,7 @@ source: - disable-openal.patch build: - number: 11 + number: 0 skip: false run_exports: - {{ pin_subpackage('gazebo', max_pin='x') }} @@ -58,7 +58,7 @@ requirements: - libignition-cmake2 - libignition-math6 - libignition-transport8 - - libignition-common3 + - libignition-common3 - libignition-fuel-tools4 - qt - ogre 1.10.* From d43a674584d25b4b27ca299654162f3eb11ad949 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 2 Apr 2021 03:39:14 +0000 Subject: [PATCH 02/15] MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.9.0, and conda-forge-pinning 2021.04.01.12.45.45 --- .ci_support/win_64_.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index e8a62efb..bdd15b3a 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -29,5 +29,3 @@ qt: - '5.12' target_platform: - win-64 -tbb_devel: -- '2020' From 39fc6b24b87340307d7d3b485d680692e14ff51d Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Fri, 2 Apr 2021 15:46:04 +1000 Subject: [PATCH 03/15] Delete 2906.patch --- recipe/2906.patch | 36 ------------------------------------ 1 file changed, 36 deletions(-) delete mode 100644 recipe/2906.patch diff --git a/recipe/2906.patch b/recipe/2906.patch deleted file mode 100644 index 5a86ad14..00000000 --- a/recipe/2906.patch +++ /dev/null @@ -1,36 +0,0 @@ -From d05c6a0782bf02651a8e1d971fc42601a6adfb15 Mon Sep 17 00:00:00 2001 -From: Silvio Traversaro -Date: Sat, 12 Dec 2020 15:57:49 +0100 -Subject: [PATCH] Fix find_package(gazebo) on Windows - -Fix https://github.com/osrf/gazebo/issues/2905 ---- - CMakeLists.txt | 15 +++++++++++++-- - 1 file changed, 13 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 84489b6f9f..277aac87e1 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -434,8 +434,19 @@ else (build_errors) - # Order is important, if A depends on B, please add B after A. - # The list should have at the very end the libraries - # without internal interdependencies -- set(PKG_LIBRARIES -- gazebo -+ -+ # The gazebo library on Windows is called libgazebo to avoid -+ # conflicts with the gazebo executable -+ if(NOT WIN32) -+ set(PKG_LIBRARIES -+ gazebo -+ ) -+ else() -+ set(PKG_LIBRARIES -+ libgazebo -+ ) -+ endif() -+ set(PKG_LIBRARIES ${PKG_LIBRARIES} - gazebo_client - gazebo_gui - gazebo_sensors From 588c5d1455f004567bd0f6a2e3e5a4913edfdd48 Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Fri, 2 Apr 2021 15:46:14 +1000 Subject: [PATCH 04/15] Update meta.yaml --- recipe/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 20080bee..09fda8fc 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -13,7 +13,6 @@ source: - use-external-libs-config.patch - normalize-ogre-path.patch - cmake_129_workaround.patch # [unix] - - 2906.patch - disable-openal.patch build: From a3329f7f8f4b8ad836a5366558bcfefd26684229 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 2 Apr 2021 12:06:12 +0200 Subject: [PATCH 05/15] Update build.sh --- recipe/build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index 8199cfe9..11a67531 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -8,7 +8,8 @@ cmake .. \ -DCMAKE_INSTALL_PREFIX=$PREFIX \ -DCMAKE_INSTALL_LIBDIR=lib \ -DBoost_NO_BOOST_CMAKE=OFF \ - -DBoost_DEBUG=OFF + -DBoost_DEBUG=OFF \ + -DHAVE_OPENAL:BOOL=OFF cmake --build . --config $BUILD_TYPE -- -j$CPU_COUNT cmake --build . --config $BUILD_TYPE --target install From 26d39669ddfa24d0cf2197b4afa6029943ec656e Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 2 Apr 2021 12:06:37 +0200 Subject: [PATCH 06/15] Update bld.bat --- recipe/bld.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/bld.bat b/recipe/bld.bat index 0e5cae1d..a7b2eece 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -17,6 +17,7 @@ cmake ^ -DTBB_INCLUDEDIR=%LIBRARY_PREFIX%\include ^ -DTBB_LIBRARY_DIR=%LIBRARY_PREFIX%\lib ^ -DUSE_EXTERNAL_TINY_PROCESS_LIBRARY=ON ^ + -DHAVE_OPENAL:BOOL=OFF ^ %SRC_DIR% if errorlevel 1 exit 1 From 1201a06cca4e560cdf876b87daa355dbc77af48d Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 2 Apr 2021 12:07:03 +0200 Subject: [PATCH 07/15] Update meta.yaml --- recipe/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 09fda8fc..110295e4 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -13,7 +13,6 @@ source: - use-external-libs-config.patch - normalize-ogre-path.patch - cmake_129_workaround.patch # [unix] - - disable-openal.patch build: number: 0 From ec5001de004d9f8bafd9bece680c2bc9e9702de4 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 2 Apr 2021 12:07:12 +0200 Subject: [PATCH 08/15] Delete link_openal.patch --- recipe/link_openal.patch | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 recipe/link_openal.patch diff --git a/recipe/link_openal.patch b/recipe/link_openal.patch deleted file mode 100644 index 6f08d112..00000000 --- a/recipe/link_openal.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 075c13de5c5553f6290c1a53a39d9165fc8cfd76 Mon Sep 17 00:00:00 2001 -From: Silvio Traversaro -Date: Tue, 2 Mar 2021 19:13:27 +0100 -Subject: [PATCH] Fix missing link to OpenAL in gazebo_util library - ---- - gazebo/util/CMakeLists.txt | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/gazebo/util/CMakeLists.txt b/gazebo/util/CMakeLists.txt -index 2c69f2b250..5831fc1aab 100644 ---- a/gazebo/util/CMakeLists.txt -+++ b/gazebo/util/CMakeLists.txt -@@ -85,6 +85,10 @@ target_link_libraries(gazebo_util - ${IGNITION-MSGS_LIBRARIES} - ) - -+if (HAVE_OPENAL) -+ target_link_libraries(gazebo_util ${OPENAL_LIBRARY}) -+endif() -+ - # define if tinxml2 major version >= 6 - # https://github.com/ignitionrobotics/ign-common/issues/28 - if (NOT tinyxml2_VERSION VERSION_LESS "6.0.0") - From 11f080299c8731697a562b8162713496c0b96e90 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 2 Apr 2021 12:07:22 +0200 Subject: [PATCH 09/15] Delete disable-openal.patch --- recipe/disable-openal.patch | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 recipe/disable-openal.patch diff --git a/recipe/disable-openal.patch b/recipe/disable-openal.patch deleted file mode 100644 index fd43378e..00000000 --- a/recipe/disable-openal.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake -index 3d87f4305d..ee4978c4db 100644 ---- a/cmake/SearchForStuff.cmake -+++ b/cmake/SearchForStuff.cmake -@@ -71,13 +71,14 @@ else () - endif () - - ######################################## --include (FindOpenAL) --if (NOT OPENAL_FOUND) -- BUILD_WARNING ("OpenAL not found, audio support will be disabled.") -- set (HAVE_OPENAL OFF CACHE BOOL "HAVE OpenAL" FORCE) --else () -- set (HAVE_OPENAL ON CACHE BOOL "HAVE OpenAL" FORCE) --endif () -+# include (FindOpenAL) -+# if (NOT OPENAL_FOUND) -+# BUILD_WARNING ("OpenAL not found, audio support will be disabled.") -+# set (HAVE_OPENAL OFF CACHE BOOL "HAVE OpenAL" FORCE) -+# else () -+# set (HAVE_OPENAL ON CACHE BOOL "HAVE OpenAL" FORCE) -+# endif () -+set (HAVE_OPENAL OFF CACHE BOOL "HAVE OpenAL" FORCE) - - ######################################## - find_package(HDF5 COMPONENTS C CXX) From 32108a65e16535ad2695b983c50ed124b334153c Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 2 Apr 2021 12:08:06 +0200 Subject: [PATCH 10/15] Delete cmake_129_workaround.patch --- recipe/cmake_129_workaround.patch | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100644 recipe/cmake_129_workaround.patch diff --git a/recipe/cmake_129_workaround.patch b/recipe/cmake_129_workaround.patch deleted file mode 100644 index 6a33ea3b..00000000 --- a/recipe/cmake_129_workaround.patch +++ /dev/null @@ -1,29 +0,0 @@ -From dfea6a5a16660177af31884c5ffa13d2009bbd5a Mon Sep 17 00:00:00 2001 -From: Silvio Traversaro -Date: Sun, 29 Nov 2020 19:24:43 +0100 -Subject: [PATCH] Do not overwrite default linker flags - ---- - cmake/DefaultCFlags.cmake | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/cmake/DefaultCFlags.cmake b/cmake/DefaultCFlags.cmake -index ca02ba295d..a6a11b5fd8 100644 ---- a/cmake/DefaultCFlags.cmake -+++ b/cmake/DefaultCFlags.cmake -@@ -37,10 +37,10 @@ endif() - - ##################################### - # Set all the global build flags --set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}") --set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}") --set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}") --set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}") -+set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}") -+set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}") -+set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}") -+set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}") - - # Compiler-specific C++11 activation. - if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") - From 949461d193301c1facc66e12d26354752ad80ceb Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 2 Apr 2021 12:08:25 +0200 Subject: [PATCH 11/15] Update meta.yaml --- recipe/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 110295e4..3e0da521 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,7 +12,6 @@ source: - fix_build.patch # [unix] - use-external-libs-config.patch - normalize-ogre-path.patch - - cmake_129_workaround.patch # [unix] build: number: 0 From 340a484adbbb56d37ccdece312465b8cf1256ab7 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 2 Apr 2021 12:12:01 +0200 Subject: [PATCH 12/15] Update fix_build.patch --- recipe/fix_build.patch | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/recipe/fix_build.patch b/recipe/fix_build.patch index df05583f..ff1e2e12 100644 --- a/recipe/fix_build.patch +++ b/recipe/fix_build.patch @@ -1,16 +1,3 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7322874cdc..4fc5c596c1 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -283,7 +283,7 @@ endif() - - # Visual Studio enables c++11 support by default - if (NOT MSVC) -- set(UNFILTERED_FLAGS "-std=c++11") -+ set(UNFILTERED_FLAGS "-std=c++17") - endif() - - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${VALID_CXX_FLAGS} ${UNFILTERED_FLAGS}") diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake index 2b79fd4be3..d55e8ce8e3 100644 --- a/cmake/SearchForStuff.cmake @@ -79,15 +66,3 @@ index 4fa403cfde..b571840557 100644 if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" AND "${CMAKE_SYSTEM_NAME}" MATCHES "Darwin") -diff --git a/plugins/rest_web/RestApi.cc b/plugins/rest_web/RestApi.cc -index 06790ae3b5..0f5cd85a90 100644 ---- a/plugins/rest_web/RestApi.cc -+++ b/plugins/rest_web/RestApi.cc -@@ -18,7 +18,7 @@ - #include - #include - #include --#include -+#include - - #include "RestApi.hh" From e3fc71a4e23879cc7e9206910fe5e31ad1970bd9 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 2 Apr 2021 12:15:31 +0200 Subject: [PATCH 13/15] Update fix_boost_include.patch --- recipe/fix_boost_include.patch | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/recipe/fix_boost_include.patch b/recipe/fix_boost_include.patch index 807e1dba..3d9ec1b1 100644 --- a/recipe/fix_boost_include.patch +++ b/recipe/fix_boost_include.patch @@ -1,24 +1,3 @@ -diff --git a/plugins/SimpleTrackedVehiclePlugin.cc b/plugins/SimpleTrackedVehiclePlugin.cc -index f7890c0ed0..33bb9cf0ba 100644 ---- a/plugins/SimpleTrackedVehiclePlugin.cc -+++ b/plugins/SimpleTrackedVehiclePlugin.cc -@@ -29,6 +29,7 @@ - - #include "plugins/SimpleTrackedVehiclePlugin.hh" - -+#if BOOST_VERSION < 107300 - namespace std { - template - class hash> { -@@ -37,6 +38,7 @@ class hash> { - } - }; - } -+#endif - - namespace gazebo - { - diff --git a/gazebo/gui/ConfigWidget.cc b/gazebo/gui/ConfigWidget.cc index 5fd736adfc..9128404852 100644 --- a/gazebo/gui/ConfigWidget.cc From addc372aa3c02a690278699a197de6ae0c5caa4b Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Fri, 2 Apr 2021 20:16:08 +1000 Subject: [PATCH 14/15] Delete fix_boost_include.patch --- recipe/fix_boost_include.patch | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 recipe/fix_boost_include.patch diff --git a/recipe/fix_boost_include.patch b/recipe/fix_boost_include.patch deleted file mode 100644 index 3d9ec1b1..00000000 --- a/recipe/fix_boost_include.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/gazebo/gui/ConfigWidget.cc b/gazebo/gui/ConfigWidget.cc -index 5fd736adfc..9128404852 100644 ---- a/gazebo/gui/ConfigWidget.cc -+++ b/gazebo/gui/ConfigWidget.cc -@@ -15,6 +15,8 @@ - * - */ - -+#include -+ - #include - #include - #include - From 253709c462cb6b7cebf18b4280cd7643071f1fe7 Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Fri, 2 Apr 2021 20:17:04 +1000 Subject: [PATCH 15/15] Delete qwt-fix.patch --- recipe/qwt-fix.patch | 45 -------------------------------------------- 1 file changed, 45 deletions(-) delete mode 100644 recipe/qwt-fix.patch diff --git a/recipe/qwt-fix.patch b/recipe/qwt-fix.patch deleted file mode 100644 index 9927c1aa..00000000 --- a/recipe/qwt-fix.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- gazebo/gui/plot/qwt_gazebo.h -+++ gazebo/gui/plot/qwt_gazebo.h -@@ -23,24 +23,24 @@ - #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wfloat-equal" - --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include - - #pragma clang diagnostic pop -